diff --git a/frontend/src/lib/components/ItemPicker.svelte b/frontend/src/lib/components/ItemPicker.svelte
index a82deb5e85..d0b6511cdc 100644
--- a/frontend/src/lib/components/ItemPicker.svelte
+++ b/frontend/src/lib/components/ItemPicker.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
-	import { Drawer, Skeleton } from './common'
+	import { Button, Drawer, Skeleton } from './common'
 	import DrawerContent from './common/drawer/DrawerContent.svelte'
+	import NoItemFound from './home/NoItemFound.svelte'
 	import IconedResourceType from './IconedResourceType.svelte'
 	import SearchItems from './SearchItems.svelte'
 
@@ -14,7 +15,6 @@
 	/** Displayed if the load function returns no items. */
 	export let noItemMessage = 'There are no items in the list'
 	/** Displayed if the search returns no items. */
-	export let emptySearchMessage = 'No items found'
 	export let buttons: Record<string, (x: string) => void> = {}
 
 	let loading = false
@@ -49,7 +49,7 @@
 
 <Drawer bind:this={drawer} size="600px">
 	<DrawerContent title="Search a {itemName}" on:close={drawer.closeDrawer}>
-		<div>
+		<div class="w-full">
 			<div class="w-12/12 pb-4">
 				<input
 					type="text"
@@ -67,72 +67,78 @@
 					{@html noItemMessage}
 				</div>
 			{:else if filteredItems?.length}
-				<ul class="divide-y divide-gray-200">
+				<div class="border rounded-md divide-y divide-gray-200 w-full">
 					{#each filteredItems as obj}
-						<li class="flex flex-row w-full">
-							<button
-								class="py-4 px-1 gap-1 flex flex-row grow border  border-gray-300 border-opacity-0 
-									hover:bg-white hover:border-opacity-100 text-black"
-								on:click={() => {
-									if (closeOnClick) {
-										drawer.closeDrawer()
-									}
-									pickCallback(obj['path'], obj[extraField])
-								}}
-							>
-								{#if `app` in obj}
-									<div class="mr-2 text-sm text-left truncate w-24">
-										<IconedResourceType after={true} silent={false} name={obj['app']} />
-									</div>
-								{/if}
-								{#if `resource_type` in obj}
-									<div class="mr-2 truncate text-left w-24 text-sm">
-										<IconedResourceType after={true} name={obj['resource_type']} />
-									</div>
-								{/if}
-								<div class="flex flex-col">
-									{#if obj.marked}
-										<div class="text-sm font-semibold">
-											{@html obj.marked}
+						<div
+							class="hover:bg-gray-50 w-full inline-flex items-center p-4 gap-4 first-of-type:!border-t-0 
+						first-of-type:rounded-t-md last-of-type:rounded-b-md"
+						>
+							<div class="inline-flex items-center grow">
+								<button
+									class="py-2 px-1 gap-1 flex grow border-gray-300 border-opacity-0
+									 text-black"
+									on:click={() => {
+										if (closeOnClick) {
+											drawer.closeDrawer()
+										}
+										pickCallback(obj['path'], obj[extraField])
+									}}
+								>
+									{#if `app` in obj}
+										<div class="mr-2 text-sm text-left center-center  w-30">
+											<IconedResourceType after={true} silent={false} name={obj['app']} />
 										</div>
-									{:else}
-										<div class="text-sm font-semibold flex flex-col">
-											<span class="mr-2 text-left">{obj[extraField] ?? ''}</span>
-											{#if extraField != 'path'}
-												<span class="font-normal text-xs text-left italic overflow-hidden"
-													>{obj['path'] ?? ''}</span
+									{/if}
+									{#if `resource_type` in obj}
+										<div class="mr-2  text-left w-30  center-center  text-sm">
+											<IconedResourceType after={true} name={obj['resource_type']} />
+										</div>
+									{/if}
+									<div class="flex grow flex-col break-all overflow-hidden">
+										{#if obj.marked}
+											<div class="text-sm font-semibold text-left">
+												{@html obj.marked}
+											</div>
+										{:else}
+											<div class="text-sm font-semibold flex flex-col">
+												<span class="mr-2 text-left">{obj[extraField] ?? ''}</span>
+												{#if extraField != 'path'}
+													<span class="font-normal text-xs text-left italic"
+														>{obj['path'] ?? ''}</span
+													>
+												{/if}
+											</div>
+											{#if extraField != 'description'}
+												<div class="text-xs font-light italic text-left"
+													>{obj['description'] ?? ''}</div
 												>
 											{/if}
-										</div>
-										{#if extraField != 'description'}
-											<div class="text-xs font-light italic text-left"
-												>{obj['description'] ?? ''}</div
-											>
 										{/if}
-									{/if}
-								</div>
-							</button>
+									</div>
+								</button>
+							</div>
 							{#if buttons}
-								<div class="flex flex-row">
+								<div class="flex flex-row items-center">
 									{#each Object.entries(buttons) as [name, button]}
-										<button
-											class="py-4 px-1 gap-1 flex flex-row grow  text-black"
-											on:click={() => {
-												button(obj['path'] ?? '')
-											}}
-										>
-											{name}
-										</button>
+										<div>
+											<Button
+												size="sm"
+												variant="border"
+												on:click={() => {
+													button(obj['path'] ?? '')
+												}}
+											>
+												{name}
+											</Button>
+										</div>
 									{/each}
 								</div>
 							{/if}
-						</li>
+						</div>
 					{/each}
-				</ul>
-			{:else}
-				<div class="text-center text-sm text-gray-600 mt-2">
-					{@html emptySearchMessage}
 				</div>
+			{:else}
+				<NoItemFound />
 			{/if}
 		</div>
 		<svelte:fragment slot="actions">
diff --git a/frontend/src/routes/(root)/(logged)/resources/+page.svelte b/frontend/src/routes/(root)/(logged)/resources/+page.svelte
index e808fe593f..153a5aa068 100644
--- a/frontend/src/routes/(root)/(logged)/resources/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/resources/+page.svelte
@@ -342,7 +342,7 @@
 								<tr>
 									<td>
 										<a
-											class="break-words"
+											class="break-all"
 											href="#{path}"
 											on:click={() => resourceEditor?.initEdit?.(path)}
 											>{#if marked}{@html marked}{:else}{path}{/if}</a
diff --git a/frontend/src/routes/(root)/(logged)/variables/+page.svelte b/frontend/src/routes/(root)/(logged)/variables/+page.svelte
index d949424477..e301a4027d 100644
--- a/frontend/src/routes/(root)/(logged)/variables/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/variables/+page.svelte
@@ -165,7 +165,7 @@
 							<tr>
 								<td
 									><a
-										class="break-words"
+										class="break-all"
 										id="edit-{path}"
 										on:click={() => variableEditor.editVariable(path)}
 										href="#{path}"