diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index fd8d435..8716ad8 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -29,7 +29,7 @@ jobs:
         if: matrix.platform == 'ubuntu-24.04'
         run: |
           sudo apt-get update
-          sudo apt-get install -y libasound2-dev libudev-dev pkg-config libwebkit2gtk-4.0-dev build-essential libssl-dev libgtk-3-dev libayatana-appindicator3-dev librsvg2-dev patchelf
+          sudo apt-get install -y libasound2-dev libudev-dev pkg-config libwebkit2gtk-4.1-dev build-essential libssl-dev libgtk-3-dev libayatana-appindicator3-dev librsvg2-dev patchelf
       - name: install pnpm
         run: npm install -g pnpm
       - name: install frontend dependencies
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2503366..6080834 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+### 2.2.0
+  - Smaller sidebar design
+  - New Settings Page design
+  - Fixed Gitification not polling notifications by using Rust based timer instead of JavaScript timer.
+
 ### 2.1.1
   - Fixed tray icon template on mac.
   - 
diff --git a/package.json b/package.json
index 4371344..ae7974c 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "gitification",
   "type": "module",
-  "version": "2.1.1",
+  "version": "2.2.0",
   "files": [
     "README.md",
     "package.json"
diff --git a/public/Geist-wght.ttf b/public/Geist-wght.ttf
new file mode 100644
index 0000000..f63f0af
Binary files /dev/null and b/public/Geist-wght.ttf differ
diff --git a/public/GeistMono-wght.ttf b/public/GeistMono-wght.ttf
new file mode 100644
index 0000000..f1f640b
Binary files /dev/null and b/public/GeistMono-wght.ttf differ
diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
index 9abc1d6..e9db03e 100644
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
@@ -1622,6 +1622,7 @@ dependencies = [
  "tauri-plugin-single-instance",
  "tauri-plugin-store",
  "tauri-plugin-updater",
+ "tokio",
 ]
 
 [[package]]
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
index d34f24f..1b15a46 100644
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -16,6 +16,7 @@ tauri-build = { version = "2", features = [] }
 [dependencies]
 serde_json = "1.0"
 serde = { version = "1.0", features = [ "derive" ] }
+tokio = { version = "1", features = ["time"] }
 tauri = { version = "2", features = ["macos-private-api", "tray-icon", "image-png", "image-ico"] }
 rodio = "0.20.1"
 tauri-plugin-store = ">=2.1.0, <3"
diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
index 60a8f49..b64ce38 100644
--- a/src-tauri/src/main.rs
+++ b/src-tauri/src/main.rs
@@ -8,6 +8,7 @@ mod commands;
 use commands::{
     go_to_notification_settings, play_notification_sound, set_icon_template,
 };
+use std::time::Duration;
 use tauri::{
     tray::{MouseButton, MouseButtonState, TrayIconEvent},
     App, Emitter, Manager, PhysicalPosition, WindowEvent,
@@ -18,6 +19,17 @@ fn handle_setup(app: &mut App) -> Result<(), Box<dyn std::error::Error>> {
     let window = app.get_webview_window("main").expect("window not found");
     window.set_always_on_top(true)?;
 
+    let app_handle = app.handle().clone();
+    tauri::async_runtime::spawn(async move {
+        let mut interval = tokio::time::interval(Duration::from_secs(10));
+        interval.tick().await;
+
+        loop {
+            interval.tick().await;
+            let _ = app_handle.emit("poll_tick", ());
+        }
+    });
+
     #[cfg(target_os = "macos")]
     {
         use tauri::ActivationPolicy;
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
index 41e8124..02527c8 100644
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -1,4 +1,5 @@
 {
+  "$schema": "https://raw.githubusercontent.com/tauri-apps/tauri/refs/heads/dev/crates/tauri-schema-generator/schemas/config.schema.json",
   "build": {
     "beforeDevCommand": "pnpm dev",
     "beforeBuildCommand": "pnpm build",
@@ -48,7 +49,7 @@
     "createUpdaterArtifacts": true
   },
   "productName": "Gitification",
-  "version": "2.1.1",
+  "version": "2.2.0",
   "identifier": "app.gitification",
   "plugins": {
     "deep-link": {
@@ -80,7 +81,7 @@
     "trayIcon": {
       "iconPath": "icons/tray/icon.png",
       "iconAsTemplate": true,
-      "menuOnLeftClick": false
+      "showMenuOnLeftClick": false
     }
   }
 }
diff --git a/src/App.vue b/src/App.vue
index 4998b24..e63ea0f 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,7 +1,8 @@
 <script lang="ts" setup>
 import { whenever } from '@vueuse/core'
-import { computed, onScopeDispose, watch, watchEffect } from 'vue'
+import { computed, watch } from 'vue'
 import { useOauthListener } from './composables/useOauthListener'
+import { usePollTick } from './composables/usePollTick'
 import * as Gitification from './gitification/index'
 import * as UI from './ui'
 import * as Views from './views'
@@ -25,11 +26,13 @@ const Route = computed(() => {
   }
 })
 
-watchEffect(() => {
-  Gitification.actions.setMenubarIcon(
-    !Gitification.state.threads.some((t) => t.unread),
-  )
-})
+watch(
+  () => Gitification.state.threads.some((t) => t.unread),
+  (hasUnread) => {
+    Gitification.actions.setMenubarIcon(!hasUnread)
+  },
+  { immediate: true },
+)
 
 watch(() => Gitification.state.theme, (theme) => {
   if (theme === 'light') {
@@ -40,19 +43,13 @@ watch(() => Gitification.state.theme, (theme) => {
   }
 }, { immediate: true })
 
-const timer = setInterval(() => {
-  Gitification.actions
-    .fetchThreads()
-}, 60_000)
-
-onScopeDispose(() => {
-  clearInterval(timer)
-})
+usePollTick(() => Gitification.actions.fetchThreads())
 
-whenever(() => Gitification.state.currentUser, () => {
-  Gitification.actions
-    .fetchThreads()
-}, { immediate: true })
+whenever(
+  () => Gitification.state.currentUser,
+  () => void Gitification.actions.fetchThreads(),
+  { immediate: true },
+)
 </script>
 
 <template>
diff --git a/src/composables/usePollTick.ts b/src/composables/usePollTick.ts
new file mode 100644
index 0000000..a5f34ab
--- /dev/null
+++ b/src/composables/usePollTick.ts
@@ -0,0 +1,24 @@
+import * as Gitification from '../gitification'
+import { useTauriEvent } from './useTauriEvent'
+
+export function usePollTick(
+  callback: () => void | Promise<void>,
+) {
+  let polling = false
+
+  return useTauriEvent('poll_tick', () => {
+    const interval = Gitification.state.settings.pollInterval * 1000
+
+    if (polling || Date.now() - Gitification.actions.getLastFetchThreadsAt() < interval) {
+      return
+    }
+
+    polling = true
+
+    void Promise.resolve(callback())
+      .catch(() => {})
+      .finally(() => {
+        polling = false
+      })
+  })
+}
diff --git a/src/gitification/actions/index.ts b/src/gitification/actions/index.ts
index 7dc328f..520ed83 100644
--- a/src/gitification/actions/index.ts
+++ b/src/gitification/actions/index.ts
@@ -7,12 +7,19 @@ import * as AutoStart from '@tauri-apps/plugin-autostart'
 import { isPermissionGranted, requestPermission, sendNotification } from '@tauri-apps/plugin-notification'
 import { exit, relaunch } from '@tauri-apps/plugin-process'
 import { open } from '@tauri-apps/plugin-shell'
+import { InvokeCommand } from '../../constants'
 import * as Gitification from '../index'
 
+let lastFetchThreadsAt = 0
+
 export function requestNotificationPermission() {
   return requestPermission()
 }
 
+export function getLastFetchThreadsAt() {
+  return lastFetchThreadsAt
+}
+
 export function openURL(url: string) {
   open(url)
 }
@@ -126,7 +133,7 @@ export function quitApp() {
 
 export function playNotificationSound() {
   if (Gitification.state.settings.soundsEnabled) {
-    invoke('play_notification_sound')
+    invoke(InvokeCommand.PlayNotificationSound)
   }
 }
 
@@ -151,6 +158,8 @@ export async function fetchThreads(withLoader = false) {
     return
   }
 
+  lastFetchThreadsAt = Date.now()
+
   if (withLoader) {
     clearThreadSelection()
   }
@@ -190,7 +199,7 @@ export async function fetchThreads(withLoader = false) {
 }
 
 export async function setMenubarIcon(isTemplate: boolean) {
-  await invoke('set_icon_template', { isTemplate })
+  await invoke(InvokeCommand.SetIconTemplate, { isTemplate })
 }
 
 let installing = false
diff --git a/src/gitification/auth/index.ts b/src/gitification/auth/index.ts
index c5229ed..30ebc25 100644
--- a/src/gitification/auth/index.ts
+++ b/src/gitification/auth/index.ts
@@ -1,4 +1,4 @@
-import { getCurrent, onOpenUrl } from '@tauri-apps/plugin-deep-link'
+import { onOpenUrl } from '@tauri-apps/plugin-deep-link'
 import * as Gitification from '../index'
 
 const REDIRECT_URI = 'gitification://oauth/callback'
@@ -81,16 +81,6 @@ async function handleUrl(rawUrl: string) {
   }
 }
 
-async function handleUrls(urls: string[] | null) {
-  if (urls == null) {
-    return
-  }
-
-  for (const url of urls) {
-    await handleUrl(url)
-  }
-}
-
 export function getRedirectUri() {
   return REDIRECT_URI
 }
@@ -103,10 +93,16 @@ export function openAuthorization() {
 
 export async function initialize() {
   const unlisten = await onOpenUrl((urls) => {
-    void handleUrls(urls)
+    void (async () => {
+      if (urls == null) {
+        return
+      }
+
+      for (const url of urls) {
+        await handleUrl(url)
+      }
+    })()
   })
 
-  await handleUrls(await getCurrent())
-
   return unlisten
 }
diff --git a/src/gitification/storage/index.ts b/src/gitification/storage/index.ts
index ee4a17a..fc594ac 100644
--- a/src/gitification/storage/index.ts
+++ b/src/gitification/storage/index.ts
@@ -13,6 +13,7 @@ export function createStorage() {
     settings: {
       onlyParticipating: false,
       openAtStartup: false,
+      pollInterval: 60,
       soundsEnabled: false,
       showReadNotifications: false,
       showSystemNotifications: true,
@@ -74,7 +75,16 @@ export function createStorage() {
         void storePromise.then((store) => store.clear())
       }
       else {
-        ctx = Object.fromEntries(values) as unknown as StorageTypes.AppStorageContextV2
+        const persistedContext = Object.fromEntries(values) as Partial<StorageTypes.AppStorageContextV2>
+
+        ctx = {
+          ...storage.value,
+          ...persistedContext,
+          settings: {
+            ...storage.value.settings,
+            ...persistedContext.settings,
+          },
+        }
       }
 
       Object.assign(storage.value, ctx)
@@ -92,6 +102,7 @@ export function createStorage() {
       storage.value.settings = {
         onlyParticipating: false,
         openAtStartup: false,
+        pollInterval: 60,
         soundsEnabled: false,
         showReadNotifications: false,
         showSystemNotifications: true,
diff --git a/src/gitification/storage/types.ts b/src/gitification/storage/types.ts
index da0137b..2f39722 100644
--- a/src/gitification/storage/types.ts
+++ b/src/gitification/storage/types.ts
@@ -27,6 +27,7 @@ export type ColorPreference = 'light' | 'dark' | 'system'
 export type StorageSettings = {
   onlyParticipating: boolean
   openAtStartup: boolean
+  pollInterval: 30 | 60 | 90 | 120
   soundsEnabled: boolean
   showReadNotifications: boolean
   showSystemNotifications: boolean
diff --git a/src/lib.css b/src/lib.css
index 15cf56d..3a1841b 100644
--- a/src/lib.css
+++ b/src/lib.css
@@ -14,7 +14,8 @@
   --color-txt-3: rgb(180, 180, 180);
 
   --color-primary: rgb(100, 149, 237);
-  --font-sans: 'Inter', sans-serif;
+  --font-sans: 'Geist', sans-serif;
+  --font-mono: 'Geist Mono', monospace;
 }
 
 .light {
@@ -60,11 +61,19 @@ body,
 }
 
 @font-face {
-  font-family: 'Inter';
+  font-family: 'Geist';
   font-style: normal;
   font-weight: 100 900;
   font-display: swap;
-  src: url("/Inter.ttf") format("truetype");
+  src: url("/Geist-wght.ttf") format("truetype");
+}
+
+@font-face {
+  font-family: 'Geist Mono';
+  font-style: normal;
+  font-weight: 100 900;
+  font-display: swap;
+  src: url("/GeistMono-wght.ttf") format("truetype");
 }
 
 .prose {
@@ -77,7 +86,7 @@ body,
   h1,h2,h3,h4,h5,h6 {
     @apply text-txt-1 font-bold;
   }
-  
+
 
   h1 {
     @apply text-xl
@@ -90,7 +99,7 @@ body,
   h3,h4,h5 {
     @apply text-base
   }
-  
+
   ul, ol {
     @apply list-disc list-inside pl-4 space-y-1;
   }
@@ -98,4 +107,4 @@ body,
   li li {
     @apply mt-1;
   }
-}
\ No newline at end of file
+}
diff --git a/src/ui/Button/Button.constants.ts b/src/ui/Button/Button.constants.ts
index 36ec1b3..8d2d922 100644
--- a/src/ui/Button/Button.constants.ts
+++ b/src/ui/Button/Button.constants.ts
@@ -7,17 +7,22 @@ export const ButtonVariantStyles = {
     shadow,
   },
   secondary: {
-    bg: 'light:bg-gray-900 light:hover:bg-gray-800 bg-white hover:bg-gray-300',
+    bg: 'light:bg-gray-900 light:hover:bg-gray-800 bg-gray-300 hover:bg-gray-200',
     fg: 'light:text-gray-50 text-gray-950',
     shadow,
   },
+  tertiary: {
+    bg: 'light:bg-surface-3 light:hover:bg-surface-4 bg-surface-4 hover:bg-surface-5',
+    fg: 'text-txt-2 hover:text-txt-1',
+    shadow: '',
+  },
   ghost: {
     bg: 'hover:bg-surface-3 focus-visible:bg-surface-3',
     fg: 'text-txt-1 hover:text-txt-2',
     shadow: '',
   },
   danger: {
-    bg: 'bg-red-700 hover:bg-red-500',
+    bg: 'bg-[#ed1c46] hover:bg-red-500',
     fg: 'text-white',
     shadow,
   },
@@ -25,7 +30,7 @@ export const ButtonVariantStyles = {
 
 export const PaddingVariantStyles = {
   none: '',
-  sm: 'py-[4px] px-[6px] text-xs',
-  md: 'py-[6px] px-[8px] text-sm',
-  icon: 'p-[8px] text-[16px] aspect-square',
+  sm: 'py-[4px] px-[6px] text-[10px]',
+  md: 'py-[6px] px-[8px] text-[12px]',
+  icon: 'p-[6px] text-[15px] aspect-square',
 }
diff --git a/src/ui/Button/Button.vue b/src/ui/Button/Button.vue
index fb7aac3..7b49678 100644
--- a/src/ui/Button/Button.vue
+++ b/src/ui/Button/Button.vue
@@ -24,7 +24,7 @@ const slots = defineSlots<{
   default: () => VNode
 }>()
 
-const iconWrapperStyles = 'text-[16px] shrink-0 inline-grid place-items-center'
+const iconWrapperStyles = 'text-[14px] shrink-0 inline-grid place-items-center'
 </script>
 
 <template>
diff --git a/src/ui/Icons/index.tsx b/src/ui/Icons/index.tsx
index 96f82f4..dd8787d 100644
--- a/src/ui/Icons/index.tsx
+++ b/src/ui/Icons/index.tsx
@@ -5,6 +5,7 @@ export { default as CheckmarkCircle01 } from 'virtual:icons/hugeicons/checkmark-
 export { default as CheckmarkSquare01 } from 'virtual:icons/hugeicons/checkmark-square-01'
 export { default as Comment01 } from 'virtual:icons/hugeicons/comment-01'
 export { default as CursorRectangleSelection01 } from 'virtual:icons/hugeicons/cursor-rectangle-selection-01'
+export { default as Delete01 } from 'virtual:icons/hugeicons/delete-01'
 export { default as DownloadSquare02 } from 'virtual:icons/hugeicons/download-square-02'
 export { default as GitCommit } from 'virtual:icons/hugeicons/git-commit'
 export { default as GitPullRequest } from 'virtual:icons/hugeicons/git-pull-request'
@@ -17,9 +18,11 @@ export { default as Logout05 } from 'virtual:icons/hugeicons/logout-05'
 export { default as MailAccount02 } from 'virtual:icons/hugeicons/mail-account-02'
 export { default as Menu02 } from 'virtual:icons/hugeicons/menu-02'
 export { default as MessageUser02 } from 'virtual:icons/hugeicons/message-user-02'
+export { default as MoreHorizontal } from 'virtual:icons/hugeicons/more-horizontal'
 export { default as NotificationOff01 } from 'virtual:icons/hugeicons/notification-off-01'
 export { default as Reload } from 'virtual:icons/hugeicons/reload'
 export { default as Settings03 } from 'virtual:icons/hugeicons/settings-03'
+export { default as ShutDown } from 'virtual:icons/hugeicons/shut-down'
 export { default as Tag01 } from 'virtual:icons/hugeicons/tag-01'
 export { default as Tick01 } from 'virtual:icons/hugeicons/tick-01'
 export { default as TickDouble04 } from 'virtual:icons/hugeicons/tick-double-04'
diff --git a/src/ui/MenuItems/MenuItems.vue b/src/ui/MenuItems/MenuItems.vue
index 5590b17..b0ac31f 100644
--- a/src/ui/MenuItems/MenuItems.vue
+++ b/src/ui/MenuItems/MenuItems.vue
@@ -118,7 +118,7 @@ const tickShown = computed(() => {
   >
     <template #render="{ meta }: Item<ItemMeta> & Required<Pick<Item<ItemMeta>, 'meta'>>">
       <div
-        class="relative h-[40px] py-1 gap-2 flex flex-row items-center text-left justify-start w-full group-[.vue-selectable-items-item-focused]:bg-surface-3"
+        class="relative h-[36px] py-1 gap-2 flex flex-row items-center text-left justify-start w-full group-[.vue-selectable-items-item-focused]:bg-surface-3"
         :class="[
           tickShown ? 'px-5' : 'px-2',
         ]"
@@ -130,7 +130,7 @@ const tickShown = computed(() => {
 
         <div
           v-if="iconShown"
-          class="text-txt-2 shrink-0 size-[24px] grid place-items-center text-[16px]"
+          class="text-txt-2 shrink-0 size-[24px] grid place-items-center text-[14px]"
         >
           <component
             :is="meta.icon"
diff --git a/src/ui/Page/PageHeader.vue b/src/ui/Page/PageHeader.vue
index 20653a1..800a290 100644
--- a/src/ui/Page/PageHeader.vue
+++ b/src/ui/Page/PageHeader.vue
@@ -12,19 +12,22 @@ useKey('esc', () => {
 </script>
 
 <template>
-  <div class="border-b border-b-surface-2 shrink-0 flex flex-row gap-2 px-2 py-3 items-center">
-    <UI.Button
-      variant="ghost"
-      paddingVariant="md"
-      @click="emit('back')"
+  <div class="border-b border-b-surface-2 shrink-0 flex flex-row gap-3 tracking-wider px-2 py-4 items-center">
+    <UI.Tooltip
+      position="bottom-start"
+      title="Back [esc]"
     >
-      <template #leftIcon>
+      <UI.Button
+        variant="tertiary"
+        paddingVariant="icon"
+        @click="emit('back')"
+      >
         <UI.Icons.ArrowLeft01 />
-      </template>
+      </UI.Button>
+    </UI.Tooltip>
 
-      <h1><slot /></h1>
-
-      <UI.Key hotkey="esc" />
-    </UI.Button>
+    <h1 class="text-txt-2 text-sm">
+      <slot />
+    </h1>
   </div>
 </template>
diff --git a/src/ui/PickGroup/PickGroup.vue b/src/ui/PickGroup/PickGroup.vue
index 5e84c43..3a5527b 100644
--- a/src/ui/PickGroup/PickGroup.vue
+++ b/src/ui/PickGroup/PickGroup.vue
@@ -13,15 +13,15 @@ defineEmits<{
 </script>
 
 <template>
-  <div class="bg-surface-2 rounded-lg pick-group flex flex-row flex-nowrap min-w-0 *:shrink-0">
+  <div class="pick-group flex min-w-0 flex-row flex-nowrap rounded-lg border border-surface-3 bg-surface-2/35 p-0.5 *:shrink-0">
     <UI.Button
       v-for="value in values"
       :key="String(value)"
       variant="ghost"
       paddingVariant="none"
-      class="capitalize text-sm py-2 px-3 focus-visible:z-2"
+      class="h-7 rounded-md px-2.5 text-xs capitalize focus-visible:z-2"
       :class="{
-        'bg-surface-5': modelValue === value,
+        'bg-primary/20': modelValue === value,
         'text-txt-3': modelValue !== value,
       }"
       @click="$emit('update:modelValue', value)"
diff --git a/src/ui/SettingsGroup/SettingsGroup.vue b/src/ui/SettingsGroup/SettingsGroup.vue
index faa6a53..be76405 100644
--- a/src/ui/SettingsGroup/SettingsGroup.vue
+++ b/src/ui/SettingsGroup/SettingsGroup.vue
@@ -5,11 +5,11 @@ defineProps<{
 </script>
 
 <template>
-  <div class="pl-2 settings-group space-y-3">
-    <h3 class="with-attention text-txt-1 text-base font-[500] text-left">
-      • {{ title }}
+  <div class="settings-group overflow-hidden space-y-2">
+    <h3 class="with-attention flex min-h-9 items-center gap-2 px-3 text-[13px] font-bold text-txt-1 text-left">
+      {{ title }}
     </h3>
-    <div class="pl-8 space-y-2">
+    <div class="rounded-lg border border-surface-3 light:bg-surface-2/60 bg-surface-2/35 divide-y divide-surface-3/80">
       <slot />
     </div>
   </div>
diff --git a/src/ui/SettingsItem/SettingsItem.vue b/src/ui/SettingsItem/SettingsItem.vue
index d9aea11..987d48a 100644
--- a/src/ui/SettingsItem/SettingsItem.vue
+++ b/src/ui/SettingsItem/SettingsItem.vue
@@ -5,19 +5,14 @@ defineProps<{
 </script>
 
 <template>
-  <div class="settings-item flex flex-row justify-between items-center w-full">
-    <slot
-      v-if="$slots.title"
-      name="title"
-    />
-    <h2
-      v-else
-      class="with-attention text-[15px] font-[300] tracking-tight text-txt-2"
-    >
-      {{ title }}
+  <div class="settings-item with-attention flex min-h-12 w-full flex-row items-center justify-between gap-4 px-3 py-2">
+    <h2 class="with-attention min-w-0 text-[13px] font-normal text-txt-2">
+      <slot name="title">
+        {{ title }}
+      </slot>
     </h2>
 
-    <div class="flex flex-col gap-2">
+    <div class="flex shrink-0 flex-col gap-2">
       <slot />
     </div>
   </div>
diff --git a/src/ui/Sidebar/Sidebar.vue b/src/ui/Sidebar/Sidebar.vue
index deea6a5..ee6dd69 100644
--- a/src/ui/Sidebar/Sidebar.vue
+++ b/src/ui/Sidebar/Sidebar.vue
@@ -6,17 +6,22 @@ import { usePopoverControl } from '../../composables/usePopoverControl'
 import * as Gitification from '../../gitification/index'
 import { menuItem } from '../MenuItems/MenuItems.vue'
 
-const settingsItems = computed(() => [
-  menuItem({
-    key: 'settings',
-    meta: { text: 'Settings', icon: UI.Icons.Settings03, key: '1' },
-    onSelect: () => Gitification.router.navigate('settings'),
-  }),
+const menuItems = computed(() => [
   menuItem({
     key: 'about',
-    meta: { text: 'App Info', icon: UI.Icons.InformationCircle, key: '2' },
+    meta: { text: 'About', icon: UI.Icons.InformationCircle, key: '1' },
     onSelect: () => Gitification.router.navigate('about'),
   }),
+  menuItem({
+    key: 'report-bug',
+    meta: { text: 'Report bug', icon: UI.Icons.IssueOpened24, key: '2' },
+    onSelect: () => Gitification.actions.openURL('https://github.com/Gitification-App/gitification/issues/new'),
+  }),
+  menuItem({
+    key: 'repository',
+    meta: { text: 'See Repository', icon: UI.Icons.Github01, key: '3' },
+    onSelect: () => Gitification.actions.openURL('https://github.com/Gitification-App/gitification'),
+  }),
 ])
 
 const profilePopoverControl = usePopoverControl()
@@ -39,7 +44,7 @@ useKey('r', () => {
 
 <template>
   <div
-    class="flex flex-col shrink-0 gap-1 p-4 w-[64px] h-full border-r-1 border-surface-3"
+    class="flex flex-col shrink-0 p-2 h-full border-r-1 border-surface-3"
   >
     <UI.Popover
       v-if="Gitification.state.currentUser != null"
@@ -122,6 +127,19 @@ useKey('r', () => {
       </UI.Button>
     </UI.Tooltip>
 
+    <UI.Tooltip
+      position="right"
+      title="Settings"
+    >
+      <UI.Button
+        variant="ghost"
+        paddingVariant="icon"
+        @click="Gitification.router.navigate('settings')"
+      >
+        <UI.Icons.Settings03 />
+      </UI.Button>
+    </UI.Tooltip>
+
     <UI.Popover
       position="right-end"
       :control="menuPopoverControl"
@@ -137,12 +155,12 @@ useKey('r', () => {
             hotkey="."
             @click="Gitification.actions.clearThreadSelection()"
           >
-            <UI.Icons.Menu02 />
+            <UI.Icons.MoreHorizontal />
           </UI.Button>
         </UI.Tooltip>
       </template>
 
-      <UI.MenuItems :items="settingsItems" />
+      <UI.MenuItems :items="menuItems" />
     </UI.Popover>
   </div>
 </template>
diff --git a/src/ui/Tooltip/Tooltip.vue b/src/ui/Tooltip/Tooltip.vue
index 0f3ef78..4eaed19 100644
--- a/src/ui/Tooltip/Tooltip.vue
+++ b/src/ui/Tooltip/Tooltip.vue
@@ -72,6 +72,8 @@ const visible = customRef((track, trigger) => {
     :detached="true"
     class="font-mono text-txt-3 text-xs px-2 py-1 pointer-events-none"
   >
-    {{ title }}
+    <div className="max-w-[250px]">
+      {{ title }}
+    </div>
   </UI.FloatingContent>
 </template>
diff --git a/src/views/AboutView.vue b/src/views/AboutView.vue
index 7cf5077..21ceeda 100644
--- a/src/views/AboutView.vue
+++ b/src/views/AboutView.vue
@@ -36,34 +36,10 @@ const version = __APP_VERSION__
     </UI.PageHeader>
 
     <UI.PageContent class="with-attention space-y-5 pb-20">
-      <div class="space-y-3">
+      <div>
         <div class="text-xl font-medium text-txt-1">
           Gitification <span class="font-mono font-medium tracking-tighter text-primary text-xs">{{ version }}</span>
         </div>
-
-        <div class=" flex flex-row gap-2">
-          <UI.Button
-            paddingVariant="sm"
-            variant="secondary"
-            @click="Gitification.actions.openURL('https://github.com/Gitification-App/gitification/issues/new')"
-          >
-            <template #leftIcon>
-              <UI.Icons.IssueOpened24 />
-            </template>
-            Report bug
-          </UI.Button>
-
-          <UI.Button
-            paddingVariant="sm"
-            variant="secondary"
-            @click="Gitification.actions.openURL('https://github.com/Gitification-App/gitification')"
-          >
-            <template #leftIcon>
-              <UI.Icons.Github01 />
-            </template>
-            See Repository
-          </UI.Button>
-        </div>
       </div>
 
       <div class="border-b border-surface-2 w-full" />
diff --git a/src/views/SettingsView.vue b/src/views/SettingsView.vue
index 9a3e335..5fca776 100644
--- a/src/views/SettingsView.vue
+++ b/src/views/SettingsView.vue
@@ -9,7 +9,7 @@ import * as UI from '../ui'
       Settings
     </UI.PageHeader>
 
-    <UI.PageContent class="space-y-5">
+    <UI.PageContent class="space-y-3">
       <UI.SettingsGroup title="Appearence">
         <UI.SettingsItem title="Theme">
           <UI.PickGroup
@@ -46,7 +46,13 @@ import * as UI from '../ui'
           <UI.PickGroup
             :modelValue="Gitification.state.settings.soundsEnabled ? 'On' : 'Off'"
             :values="['On', 'Off']"
-            @update:modelValue="Gitification.state.settings.soundsEnabled = $event === 'On'"
+            @update:modelValue="(newValue) => {
+              const enabled = newValue === 'On'
+              Gitification.state.settings.soundsEnabled = enabled
+              if (enabled) {
+                Gitification.actions.playNotificationSound()
+              }
+            }"
           />
         </UI.SettingsItem>
 
@@ -83,6 +89,26 @@ import * as UI from '../ui'
             @update:modelValue="Gitification.state.settings.onlyParticipating = $event === 'On'"
           />
         </UI.SettingsItem>
+
+        <UI.SettingsItem>
+          <template #title>
+            Poll interval
+
+            <UI.Tooltip
+              position="top-start"
+              title="Gitification fetches notifications from GitHub at a regular interval. You can set the interval here."
+            >
+              <button className="text-[10px] align-top">
+                <span class="font-mono inline-block px-1 text-primary">?</span>
+              </button>
+            </UI.Tooltip>
+          </template>
+
+          <UI.PickGroup
+            v-model="Gitification.state.settings.pollInterval"
+            :values="[30, 60, 90, 120]"
+          />
+        </UI.SettingsItem>
       </UI.SettingsGroup>
 
       <UI.SettingsGroup title="Accounts">
@@ -106,7 +132,7 @@ import * as UI from '../ui'
             paddingVariant="md"
             @click="Gitification.actions.logout(user.id)"
           >
-            Remove
+            <UI.Icons.Delete01 />
           </UI.Button>
         </UI.SettingsItem>
       </UI.SettingsGroup>
@@ -124,13 +150,13 @@ import * as UI from '../ui'
             <template #leftIcon>
               <UI.Icons.Reload />
             </template>
-            Reset
+            Reset settings
           </UI.Button>
         </UI.Tooltip>
 
         <UI.Tooltip
           position="top-end"
-          title="Exit Gitification application"
+          title="Quit application"
         >
           <UI.Button
             variant="danger"
@@ -138,9 +164,8 @@ import * as UI from '../ui'
             @click="Gitification.actions.quitApp()"
           >
             <template #leftIcon>
-              <UI.Icons.Cancel01 />
+              <UI.Icons.ShutDown />
             </template>
-            Exit App
           </UI.Button>
         </UI.Tooltip>
       </div>