diff --git a/packages/frontend-2/components/project/page/LatestItems.vue b/packages/frontend-2/components/project/page/LatestItems.vue
index 8dc1f0a5aa..105ca21f74 100644
--- a/packages/frontend-2/components/project/page/LatestItems.vue
+++ b/packages/frontend-2/components/project/page/LatestItems.vue
@@ -25,7 +25,7 @@
       <slot v-if="!hideFilters" name="filters">
         <div class="flex space-x-4 items-center grow justify-end flex-wrap">
           <slot name="filters" />
-          <LayoutGridListToggle v-model="gridOrList" v-tippy="'Swap Grid/Card View'" />
+          <LayoutGridListToggle v-model="gridOrList" />
         </div>
       </slot>
     </div>
diff --git a/packages/frontend-2/components/project/page/discussions/Header.vue b/packages/frontend-2/components/project/page/discussions/Header.vue
index ed1bf441af..6f6a4c1682 100644
--- a/packages/frontend-2/components/project/page/discussions/Header.vue
+++ b/packages/frontend-2/components/project/page/discussions/Header.vue
@@ -9,11 +9,7 @@
           :value="true"
           label="Include resolved"
         />
-        <LayoutGridListToggle
-          v-model="finalGridOrList"
-          v-tippy="'Swap Grid/Card View'"
-          class="shrink-0"
-        />
+        <LayoutGridListToggle v-model="finalGridOrList" class="shrink-0" />
       </div>
     </div>
   </div>
diff --git a/packages/frontend-2/components/project/page/latest-items/Models.vue b/packages/frontend-2/components/project/page/latest-items/Models.vue
index 525580d98e..a76351571e 100644
--- a/packages/frontend-2/components/project/page/latest-items/Models.vue
+++ b/packages/frontend-2/components/project/page/latest-items/Models.vue
@@ -49,10 +49,7 @@
               @change="($event) => updateSearchImmediately($event.value)"
               @update:model-value="updateDebouncedSearch"
             ></FormTextInput>
-            <LayoutGridListToggle
-              v-model="gridOrList"
-              v-tippy="'Swap Grid/Card View'"
-            />
+            <LayoutGridListToggle v-model="gridOrList" />
           </div>
           <div class="flex items-center space-x-2">
             <FormButton
diff --git a/packages/frontend-2/components/project/page/models/Header.vue b/packages/frontend-2/components/project/page/models/Header.vue
index 971cc56858..cc5409b35c 100644
--- a/packages/frontend-2/components/project/page/models/Header.vue
+++ b/packages/frontend-2/components/project/page/models/Header.vue
@@ -63,11 +63,7 @@
               clearable
               fixed-height
             />
-            <LayoutGridListToggle
-              v-model="finalGridOrList"
-              v-tippy="'Swap Grid/Card View'"
-              class="shrink-0"
-            />
+            <LayoutGridListToggle v-model="finalGridOrList" class="shrink-0" />
           </div>
           <FormButton
             color="secondary"
diff --git a/packages/ui-components/src/components/layout/GridListToggle.vue b/packages/ui-components/src/components/layout/GridListToggle.vue
index a00826195b..1c9f40c113 100644
--- a/packages/ui-components/src/components/layout/GridListToggle.vue
+++ b/packages/ui-components/src/components/layout/GridListToggle.vue
@@ -1,24 +1,29 @@
 <template>
   <button
-    class="max-w-max transition flex justify-center items-center gap-2 outline-none select-none h-8 text-foreground border-2 bg-foundation border-foundation-2 rounded-md hover:ring-2 active:scale-[0.97] grow"
+    class="max-w-max transition flex justify-center items-center gap-2 outline-none select-none h-8 text-foreground border-2 border-primary-muted dark:border-foundation bg-primary-muted rounded-md active:scale-[0.97] grow"
     @click="onClick"
   >
-    <div class="relative flex bg-foundation rounded-md">
+    <div class="relative flex bg-primary-muted rounded-md">
       <div
-        class="absolute -top-[2px] -left-[2px] transition"
+        class="absolute transition"
         :class="{
           'translate-x-7': value !== GridListToggleValue.Grid
         }"
       >
         <div
-          :class="value !== GridListToggleValue.Grid ? 'rounded-r-md' : 'rounded-l-md'"
-          class="w-8 h-8 bg-primary-muted shadow-inner transition"
+          class="w-7 h-7 bg-foundation dark:bg-foundation-2 transition rounded shadow"
         />
       </div>
-      <div class="relative z-10 flex gap-1 items-center p-1 rounded-l">
+      <div
+        v-tippy="'Grid View'"
+        class="relative z-10 flex gap-1 items-center p-1 rounded-l"
+      >
         <Squares2X2Icon class="h-5 w-5" />
       </div>
-      <div class="relative z-10 flex gap-1 items-center p-1 rounded-r">
+      <div
+        v-tippy="'List View'"
+        class="relative z-10 flex gap-1 items-center p-1 rounded-r"
+      >
         <Bars3Icon class="h-5 w-5" />
       </div>
     </div>