diff --git a/apps/client/src/lib/components/DeleteIcon.svelte b/apps/client/src/lib/components/icons/Delete.svelte
similarity index 100%
rename from apps/client/src/lib/components/DeleteIcon.svelte
rename to apps/client/src/lib/components/icons/Delete.svelte
diff --git a/apps/client/src/lib/components/icons/applications/ApplicationIcons.svelte b/apps/client/src/lib/components/icons/applications/ApplicationIcons.svelte
index 387653c87..5e4f83e94 100644
--- a/apps/client/src/lib/components/icons/applications/ApplicationIcons.svelte
+++ b/apps/client/src/lib/components/icons/applications/ApplicationIcons.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import * as Icons from '$lib/components/svg/applications';
+	import * as Icons from '$lib/components/icons/applications';
 	export let application: any;
 	export let isAbsolute = true;
 </script>
diff --git a/apps/client/src/lib/components/icons/databases/DatabaseIcons.svelte b/apps/client/src/lib/components/icons/databases/DatabaseIcons.svelte
index 4a00860af..a9ebf475b 100644
--- a/apps/client/src/lib/components/icons/databases/DatabaseIcons.svelte
+++ b/apps/client/src/lib/components/icons/databases/DatabaseIcons.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import * as Icons from '$lib/components/svg/databases';
+	import * as Icons from '$lib/components/icons/databases';
 	export let type: any;
 	export let isAbsolute = false;
 </script>
diff --git a/apps/client/src/lib/components/icons/index.ts b/apps/client/src/lib/components/icons/index.ts
index 88f83c5c9..7ccdd45c4 100644
--- a/apps/client/src/lib/components/icons/index.ts
+++ b/apps/client/src/lib/components/icons/index.ts
@@ -1,4 +1,5 @@
 export { default as RemoteLink } from './RemoteLink.svelte';
+export { default as Delete } from './Delete.svelte';
 export * as Applications from './applications';
 export * as Sources from './sources';
 export * as Destinations from './destinations';
diff --git a/apps/client/src/routes/+page.svelte b/apps/client/src/routes/+page.svelte
index 153634080..b26c9c4f1 100644
--- a/apps/client/src/routes/+page.svelte
+++ b/apps/client/src/routes/+page.svelte
@@ -7,11 +7,10 @@
 
 	import { asyncSleep, errorNotification, getRndInteger } from '$lib/common';
 	import { appSession, search, trpc } from '$lib/store';
-	import ApplicationsIcons from '$lib/components/svg/applications/ApplicationIcons.svelte';
-	import DatabaseIcons from '$lib/components/svg/databases/DatabaseIcons.svelte';
-	import ServiceIcons from '$lib/components/svg/services/ServiceIcons.svelte';
-	import DeleteIcon from '$lib/components/DeleteIcon.svelte';
-	
+	import ApplicationsIcons from '$lib/components/icons/applications/ApplicationIcons.svelte';
+	import DatabaseIcons from '$lib/components/icons/databases/DatabaseIcons.svelte';
+	import ServiceIcons from '$lib/components/icons/services/ServiceIcons.svelte';
+	import * as Icons from '$lib/components/icons';
 	import NewResource from './_components/NewResource.svelte';
 
 	const {
@@ -769,7 +768,7 @@
 										<button
 											class="icons hover:bg-green-500"
 											on:click|stopPropagation|preventDefault={() =>
-												deleteApplication(application.id)}><DeleteIcon /></button
+												deleteApplication(application.id)}><Icons.Delete /></button
 										>
 									</div>
 								</div>
@@ -882,7 +881,7 @@
 									<button
 										class="icons hover:bg-green-500"
 										on:click|stopPropagation|preventDefault={() =>
-											deleteApplication(application.id)}><DeleteIcon /></button
+											deleteApplication(application.id)}><Icons.Delete /></button
 									>
 								</div>
 							</div>
@@ -977,7 +976,7 @@
 											<button
 												class="icons hover:bg-pink-500"
 												on:click|stopPropagation|preventDefault={() => deleteService(service.id)}
-												><DeleteIcon /></button
+												><Icons.Delete /></button
 											>
 										</div>
 									</div>
@@ -1063,7 +1062,7 @@
 										<button
 											class="icons hover:bg-pink-500"
 											on:click|stopPropagation|preventDefault={() => deleteService(service.id)}
-											><DeleteIcon /></button
+											><Icons.Delete /></button
 										>
 									</div>
 								</div>
@@ -1159,7 +1158,7 @@
 											<button
 												class="icons hover:bg-databases-100"
 												on:click|stopPropagation|preventDefault={() => deleteDatabase(database.id)}
-												><DeleteIcon /></button
+												><Icons.Delete /></button
 											>
 										</div>
 									</div>
@@ -1245,7 +1244,7 @@
 										<button
 											class="icons hover:bg-databases"
 											on:click|stopPropagation|preventDefault={() => deleteDatabase(database.id)}
-											><DeleteIcon /></button
+											><Icons.Delete /></button
 										>
 									</div>
 								</div>