diff --git a/src/lib/wizards/functions/createGit.svelte b/src/lib/wizards/functions/createGit.svelte
index d19806be3..f6307df41 100644
--- a/src/lib/wizards/functions/createGit.svelte
+++ b/src/lib/wizards/functions/createGit.svelte
@@ -32,7 +32,7 @@
                 undefined,
                 $createFunction.entrypoint,
                 $createFunction.commands || undefined,
-                undefined, //TODO: SCOPES!!!
+                undefined,
                 $installation.$id,
                 $repository.id,
                 $choices.branch,
diff --git a/src/lib/wizards/functions/createTemplate.svelte b/src/lib/wizards/functions/createTemplate.svelte
index bb5e74295..11580051f 100644
--- a/src/lib/wizards/functions/createTemplate.svelte
+++ b/src/lib/wizards/functions/createTemplate.svelte
@@ -49,7 +49,7 @@
                 undefined,
                 runtimeDetail.entrypoint,
                 runtimeDetail.commands || undefined,
-                undefined, //TODO: scopes
+                undefined,
                 $installation.$id,
                 $repository.id,
                 $choices.branch,
diff --git a/src/routes/console/project-[project]/functions/+page.svelte b/src/routes/console/project-[project]/functions/+page.svelte
index 2a86c9150..7f45d8302 100644
--- a/src/routes/console/project-[project]/functions/+page.svelte
+++ b/src/routes/console/project-[project]/functions/+page.svelte
@@ -3,10 +3,16 @@
     import { page } from '$app/stores';
     import { tooltip } from '$lib/actions/tooltip';
     import { registerCommands, updateCommandGroupRanks } from '$lib/commandCenter';
-    import { CardContainer, Empty, GridItem1, Id, PaginationWithLimit } from '$lib/components';
+    import {
+        CardContainer,
+        Empty,
+        GridItem1,
+        Id,
+        PaginationWithLimit,
+        SvgIcon
+    } from '$lib/components';
     import { toLocaleDateTime } from '$lib/helpers/date';
     import { Container, ContainerHeader } from '$lib/layout';
-    import { app } from '$lib/stores/app';
     import { isServiceLimited } from '$lib/stores/billing';
     import { marketplace } from '$lib/stores/marketplace.js';
     import { organization } from '$lib/stores/organization';
@@ -90,11 +96,7 @@
                     <svelte:fragment slot="title">
                         <div class="u-flex u-gap-16 u-cross-center">
                             <div class="avatar is-medium">
-                                <img
-                                    src={`${base}/icons/${$app.themeInUse}/color/${
-                                        func.runtime.split('-')[0]
-                                    }.svg`}
-                                    alt="technology" />
+                                <SvgIcon name={func.runtime.split('-')[0]}></SvgIcon>
                             </div>
                             <span class="text">{func.name}</span>
                         </div>
diff --git a/src/routes/console/project-[project]/functions/function-[function]/deploymentCard.svelte b/src/routes/console/project-[project]/functions/function-[function]/deploymentCard.svelte
index de5952319..693da5950 100644
--- a/src/routes/console/project-[project]/functions/function-[function]/deploymentCard.svelte
+++ b/src/routes/console/project-[project]/functions/function-[function]/deploymentCard.svelte
@@ -1,8 +1,5 @@
 <script lang="ts">
-    import { base } from '$app/paths';
-
-    import { CardGrid, Id } from '$lib/components';
-    import { app } from '$lib/stores/app';
+    import { CardGrid, Id, SvgIcon } from '$lib/components';
     import type { Models } from '@appwrite.io/console';
     import { func, proxyRuleList } from './store';
     import { Pill } from '$lib/elements';
@@ -19,9 +16,7 @@
 <CardGrid>
     <div class="u-flex u-cross-start u-gap-16">
         <div class="avatar is-medium" aria-hidden="true">
-            <img
-                src={`${base}/icons/${$app.themeInUse}/color/${$func.runtime.split('-')[0]}.svg`}
-                alt="technology" />
+            <SvgIcon name={$func.runtime.split('-')[0]}></SvgIcon>
         </div>
         <div class="u-grid-equal-row-size u-gap-4 u-line-height-1">
             <p><b>Deployment ID</b></p>