diff --git a/components/SwitchTheme.vue b/components/SwitchTheme.vue
index ab7f968..d473016 100644
--- a/components/SwitchTheme.vue
+++ b/components/SwitchTheme.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { Sun, Moon } from 'lucide-vue-next'
+import { Sun, Moon, Laptop } from 'lucide-vue-next'
 
 const colorMode = useColorMode()
 </script>
@@ -9,10 +9,10 @@ const colorMode = useColorMode()
     <DropdownMenuTrigger as-child>
       <Button variant="ghost">
         <Sun
-          class="absolute h-[1.2rem] w-[1.2rem] rotate-90 scale-0 transition-all dark:rotate-0 dark:scale-100"
+          class="absolute w-5 h-5 transition-all scale-100 dark:scale-0"
         />
         <Moon
-          class="h-[1.2rem] w-[1.2rem] rotate-0 scale-100 transition-all dark:-rotate-90 dark:scale-0"
+          class="w-5 h-5 transition-all scale-0 dark:scale-100"
         />
         <span class="sr-only">Toggle theme</span>
       </Button>
@@ -21,13 +21,25 @@ const colorMode = useColorMode()
       align="end"
       class="min-w-min"
     >
-      <DropdownMenuItem @click="colorMode.preference = 'light'">
+      <DropdownMenuItem
+        class="cursor-pointer"
+        @click="colorMode.preference = 'light'"
+      >
+        <Sun class="w-4 h-4 mr-1" />
         Light
       </DropdownMenuItem>
-      <DropdownMenuItem @click="colorMode.preference = 'dark'">
+      <DropdownMenuItem
+        class="cursor-pointer"
+        @click="colorMode.preference = 'dark'"
+      >
+        <Moon class="w-4 h-4 mr-1" />
         Dark
       </DropdownMenuItem>
-      <DropdownMenuItem @click="colorMode.preference = 'system'">
+      <DropdownMenuItem
+        class="cursor-pointer"
+        @click="colorMode.preference = 'system'"
+      >
+        <Laptop class="w-4 h-4 mr-1" />
         System
       </DropdownMenuItem>
     </DropdownMenuContent>
diff --git a/components/dashboard/links/Index.vue b/components/dashboard/links/Index.vue
index a1c076a..a9f5b5a 100644
--- a/components/dashboard/links/Index.vue
+++ b/components/dashboard/links/Index.vue
@@ -22,7 +22,7 @@ async function getLinks() {
 const { isLoading } = useInfiniteScroll(
   document,
   getLinks,
-  { distance: 10, interval: 1000, canLoadMore: () => !listComplete },
+  { distance: 150, interval: 1000, canLoadMore: () => !listComplete },
 )
 
 function updateLinkList(link, type) {
@@ -59,5 +59,11 @@ function updateLinkList(link, type) {
     >
       <Loader class="animate-spin" />
     </div>
+    <div
+      v-if="!isLoading && listComplete"
+      class="flex items-center justify-center text-sm"
+    >
+      No more
+    </div>
   </main>
 </template>
diff --git a/components/layouts/Header.vue b/components/layouts/Header.vue
index 7997e32..04c56fb 100644
--- a/components/layouts/Header.vue
+++ b/components/layouts/Header.vue
@@ -71,7 +71,7 @@ const showMenu = ref(false)
                   class="w-5 h-5 mr-1"
                 />
                 GitHub</a>
-              <span class="px-2 py-2">
+              <span class="ml-1">
                 <SwitchTheme />
               </span>
             </div>