diff --git a/src/renderer/components/css/NavigationPage.css b/src/renderer/components/css/NavigationPage.css
index 31217dfa..83bea1e2 100644
--- a/src/renderer/components/css/NavigationPage.css
+++ b/src/renderer/components/css/NavigationPage.css
@@ -18,7 +18,6 @@
   display: flex;
   justify-content: center;
   align-items: center;
-  border-bottom: 1px solid var(--color-border);
   padding: 1.25rem 1rem;
   background: var(--color-background-secondary);
 }
@@ -87,7 +86,6 @@
   display: flex;
   justify-content: center;
   align-items: center;
-  border-bottom: 1px solid var(--color-border);
   padding: 0.75rem;
 }
 
diff --git a/src/renderer/pages/css/Gallery.css b/src/renderer/pages/css/Gallery.css
index 8ce0769b..4dc8dfa9 100644
--- a/src/renderer/pages/css/Gallery.css
+++ b/src/renderer/pages/css/Gallery.css
@@ -182,7 +182,7 @@ input:checked + .switch-slider::before {
   border: 1px solid var(--color-border-secondary);
   border-radius: var(--radius-md);
   padding: 0.375rem 0.5rem;
-  background: var(--color-surface-elevated);
+  background: var(--color-background-secondary);
   gap: 0.375rem;
 }
 
@@ -197,7 +197,7 @@ input:checked + .switch-slider::before {
   border-radius: 2px;
   width: 70px;
   height: 4px;
-  background: var(--color-border);
+  background: var(--color-background-tertiary);
   outline: none;
   appearance: none;
   cursor: pointer;
@@ -351,8 +351,9 @@ input:checked + .switch-slider::before {
   min-width: 200px;
   max-height: 280px;
   color: var(--color-text-primary);
-  background: var(--color-surface-elevated);
+  background: var(--color-background-tertiary);
   box-shadow: var(--shadow-lg);
+  scrollbar-width: none;
 }
 
 .multiselect-option {
@@ -362,7 +363,7 @@ input:checked + .switch-slider::before {
   padding: 0.25rem 0.5rem;
   min-height: unset;
   font-size: 0.95rem;
-  background: var(--color-surface-elevated);
+  background: var(--color-background-secondary);
   transition: var(--transition-fast);
   gap: 0.25rem;
   cursor: pointer;
@@ -936,7 +937,7 @@ input:checked + .switch-slider::before {
   width: 90%;
   max-width: 500px;
   max-height: 90vh;
-  background: var(--color-background-primary);
+  background: var(--color-background-tertiary);
   box-shadow: var(--shadow-lg);
 }
 
@@ -1016,7 +1017,7 @@ input:checked + .switch-slider::before {
   width: 100%;
   font-size: 0.875rem;
   color: var(--color-text-primary);
-  background: var(--color-surface);
+  background: var(--color-background-secondary);
   transition: var(--transition-fast);
   box-sizing: border-box;
 }
@@ -1036,13 +1037,13 @@ input:checked + .switch-slider::before {
   width: 20px;
   height: 20px;
   color: white;
-  background: var(--color-blue-common);
+  background: var(--color-accent);
   transition: var(--transition-fast);
   cursor: pointer;
 }
 
 .info-button:hover {
-  background: var(--color-blue-common);
+  background: var(--color-accent-hover);
 }
 
 .info-panel {
@@ -1088,8 +1089,8 @@ input:checked + .switch-slider::before {
   font-family: 'SF Mono', Monaco, Menlo, 'Ubuntu Mono', monospace;
   font-weight: 600;
   text-align: center;
-  color: white;
-  background: var(--color-blue-common);
+  color: var(--color-text-primary);
+  background: var(--color-background-secondary);
   box-shadow: 0 1px 3px rgb(0 0 0 / 12%), 0 1px 2px rgb(0 0 0 / 24%);
   letter-spacing: 0.02em;
   flex-shrink: 0;
@@ -1113,14 +1114,14 @@ input:checked + .switch-slider::before {
   font-family: inherit;
   font-weight: 500;
   color: white;
-  background: var(--color-blue-common);
+  background: var(--color-accent);
   transition: var(--transition-fast);
   gap: 0.5rem;
   cursor: pointer;
 }
 
 .btn-primary:hover {
-  background: var(--color-blue-common);
+  background: var(--color-accent-hover);
   transform: translateY(-1px);
   box-shadow: var(--shadow-sm);
 }
@@ -1135,7 +1136,7 @@ input:checked + .switch-slider::before {
   font-family: inherit;
   font-weight: 500;
   color: var(--color-text-primary);
-  background: var(--color-surface-elevated);
+  background: var(--color-background-secondary);
   transition: var(--transition-fast);
   gap: 0.5rem;
   cursor: pointer;
diff --git a/src/renderer/pages/css/UploadPage.css b/src/renderer/pages/css/UploadPage.css
index b3cd5eae..976f4ea0 100644
--- a/src/renderer/pages/css/UploadPage.css
+++ b/src/renderer/pages/css/UploadPage.css
@@ -70,7 +70,7 @@ html, body {
   width: auto;
   min-width: 200px;
   font-family: inherit;
-  background: var(--color-surface);
+  background: var(--color-background-secondary);
   transition: var(--transition-fast);
   gap: 0.75rem;
   cursor: pointer;
@@ -145,7 +145,7 @@ html, body {
   font-family: inherit;
   font-weight: 500;
   color: var(--color-text-secondary);
-  background: var(--color-surface);
+  background: var(--color-background-secondary);
   transition: all var(--transition-fast);
   gap: 0.5rem;
   cursor: pointer;
@@ -335,7 +335,7 @@ html, body {
   border: 1px solid var(--color-border-secondary);
   border-radius: var(--radius-md);
   overflow: hidden;
-  background: var(--color-surface);
+  background: var(--color-background-secondary);
 }
 
 .segmented-button {
@@ -513,7 +513,7 @@ html, body {
   padding: 0.875rem 1rem;
   font-family: inherit;
   text-align: left;
-  background: var(--color-surface);
+  background: var(--color-background-secondary);
   transition: var(--transition-medium);
   flex-direction: row;
   gap: 0.5rem;
@@ -635,7 +635,7 @@ html, body {
   font-family: 'SF Mono', Monaco, 'Cascadia Code', 'Roboto Mono', Consolas, 'Courier New', monospace;
   font-weight: 500;
   color: var(--color-text-secondary);
-  background: var(--color-surface);
+  background: var(--color-background-secondary);
   transition: var(--transition-fast);
   cursor: pointer;
 }
@@ -657,7 +657,7 @@ html, body {
   border: 1px solid var(--color-border-secondary);
   border-radius: var(--radius-md);
   width: 100%;
-  background: var(--color-surface);
+  background: var(--color-background-secondary);
 }
 
 .toggle-button {
@@ -735,7 +735,7 @@ html, body {
   align-items: center;
   border-bottom: 1px solid var(--color-border-secondary);
   padding: 1rem 1.25rem;
-  background: var(--color-background-tertiary);
+  background: var(--color-surface);
 }
 
 .modal-title {