diff --git a/web/src/components/atomic/Icon.vue b/web/src/components/atomic/Icon.vue
index 8901d6f32..8cf885f69 100644
--- a/web/src/components/atomic/Icon.vue
+++ b/web/src/components/atomic/Icon.vue
@@ -27,6 +27,7 @@
   <SvgIcon v-else-if="name === 'org'" :path="mdiAccountGroupOutline" size="1.3rem" />
   <SvgIcon v-else-if="name === 'cron'" :path="mdiCalendarClockOutline" size="1.3rem" />
   <SvgIcon v-else-if="name === 'toolbox'" :path="mdiToolboxOutline" size="1.3rem" />
+  <SvgIcon v-else-if="name === 'puzzle'" :path="mdiPuzzleOutline" size="1.3rem" />
   <SvgIcon
     v-else-if="name === 'status-failure' || name === 'status-error' || name === 'status-killed'"
     type="mdi"
@@ -155,6 +156,7 @@ import {
   mdiPlayOutline,
   mdiPlus,
   mdiPower,
+  mdiPuzzleOutline,
   mdiRadioboxBlank,
   mdiRadioboxIndeterminateVariant,
   mdiShieldKeyOutline,
@@ -242,6 +244,7 @@ export type IconNames =
   | 'org'
   | 'cron'
   | 'toolbox'
+  | 'puzzle'
   | 'forge'
   | 'fullscreen'
   | 'exit-fullscreen'
diff --git a/web/src/views/repo/settings/Extensions.vue b/web/src/views/repo/settings/Extensions.vue
index bcf8a9265..945d8666f 100644
--- a/web/src/views/repo/settings/Extensions.vue
+++ b/web/src/views/repo/settings/Extensions.vue
@@ -1,27 +1,18 @@
 <template>
-  <Settings :title="$t('extensions')" :description="$t('extensions_description')" docs-url="docs/usage/registries">
-    <div class="mb-4 flex flex-row items-center border-b pb-4 dark:border-gray-600">
-      <h1 class="text-color ml-2 text-xl">{{ $t('extensions') }}</h1>
-    </div>
+  <Settings :title="$t('extensions')" :description="$t('extensions_description')" docs-url="docs/usage/extensions">
+    <form @submit.prevent="saveExtensions">
+      <InputField :label="$t('extensions_signatures_public_key')">
+        <pre class="code-box">{{ signaturePublicKey }}</pre>
+        <template #description>
+          {{ $t('extensions_signatures_public_key_description') }}
+        </template>
+      </InputField>
+      <InputField :label="$t('config_extension_endpoint')" docs-url="docs/usage/extensions/configuration-extension">
+        <TextField v-model="extensions.config_extension_endpoint" :placeholder="$t('extension_endpoint_placeholder')" />
+      </InputField>
 
-    <div class="flex flex-col">
-      <span class="text-color font-bold">{{ $t('extensions_signatures_public_key') }}</span>
-      <span class="text-color">{{ $t('extensions_signatures_public_key_description') }}</span>
-      <pre class="code-box">{{ signaturePublicKey }}</pre>
-    </div>
-
-    <div class="mt-4 flex flex-col border-t-1 dark:border-gray-600">
-      <form @submit.prevent="saveExtensions">
-        <InputField :label="$t('config_extension_endpoint')" docs-url="docs/usage/extensions/configuration-extension">
-          <TextField
-            v-model="extensions.config_extension_endpoint"
-            :placeholder="$t('extension_endpoint_placeholder')"
-          />
-        </InputField>
-
-        <Button :is-loading="isSaving" color="green" type="submit" :text="$t('save')" />
-      </form>
-    </div>
+      <Button :is-loading="isSaving" color="green" type="submit" :text="$t('save')" />
+    </form>
   </Settings>
 </template>
 
diff --git a/web/src/views/repo/settings/RepoSettings.vue b/web/src/views/repo/settings/RepoSettings.vue
index 3f567b862..2fc4b3a1b 100644
--- a/web/src/views/repo/settings/RepoSettings.vue
+++ b/web/src/views/repo/settings/RepoSettings.vue
@@ -20,8 +20,8 @@
     <Tab icon="secret" :to="{ name: 'repo-settings-secrets' }" :title="$t('secrets.secrets')" />
     <Tab icon="docker" :to="{ name: 'repo-settings-registries' }" :title="$t('registries.registries')" />
     <Tab icon="cron" :to="{ name: 'repo-settings-crons' }" :title="$t('repo.settings.crons.crons')" />
-    <Tab icon="toolbox" :to="{ name: 'repo-extensions' }" :title="$t('extensions')" />
     <Tab icon="tag" :to="{ name: 'repo-settings-badge' }" :title="$t('repo.settings.badge.badge')" />
+    <Tab icon="puzzle" :to="{ name: 'repo-settings-extensions' }" :title="$t('extensions')" />
     <Tab icon="toolbox" :to="{ name: 'repo-settings-actions' }" :title="$t('repo.settings.actions.actions')" />
 
     <router-view />