diff --git a/packages/client/src/components/SettingsBar.svelte b/packages/client/src/components/SettingsBar.svelte
index 7a5c2d2cd3..41b546eff6 100644
--- a/packages/client/src/components/SettingsBar.svelte
+++ b/packages/client/src/components/SettingsBar.svelte
@@ -82,6 +82,7 @@
             prop={setting.key}
             value={option.value}
             icon={option.barIcon}
+            title={option.barTitle}
           />
         {/each}
       {/if}
@@ -97,10 +98,10 @@
     display: flex;
     position: absolute;
     z-index: 999;
-    padding: 6px 12px;
+    padding: 6px 10px;
     opacity: 0;
-    background-color: white;
     flex-direction: row;
+    background: var(--background);
     justify-content: center;
     align-items: center;
     border-radius: 4px;
@@ -115,6 +116,6 @@
     flex: 0 0 1px;
     align-self: stretch;
     margin: 0 4px;
-    background-color: #ddd;
+    background-color: var(--spectrum-global-color-gray-300);
   }
 </style>
diff --git a/packages/client/src/components/SettingsButton.svelte b/packages/client/src/components/SettingsButton.svelte
index 8015315fb3..aa03a37926 100644
--- a/packages/client/src/components/SettingsButton.svelte
+++ b/packages/client/src/components/SettingsButton.svelte
@@ -5,6 +5,7 @@
   export let prop
   export let value
   export let icon
+  export let title
   export let rotate = false
   export let bool = false
 
@@ -13,6 +14,7 @@
 </script>
 
 <div
+  {title}
   class:rotate
   class:active
   on:click={() => {
@@ -28,17 +30,18 @@
 <style>
   div {
     padding: 6px;
-    border-radius: 4px;
-    color: #666;
+    border-radius: 2px;
+    color: var(--spectrum-global-color-gray-700);
     display: flex;
+    transition: color 0.13s ease-in-out, background-color 0.13s ease-in-out;
   }
   div:hover {
-    background-color: #eee;
+    background-color: var(--spectrum-global-color-gray-200);
     cursor: pointer;
   }
   .active,
   .active:hover {
-    background-color: #e5f2ff;
+    background-color: rgba(13, 102, 208, 0.1);
     color: var(--spectrum-global-color-blue-600);
   }
   .rotate {