diff --git a/src/components/Button.tsx b/src/components/Button.tsx
index dc319eb5cb..a008c8605c 100644
--- a/src/components/Button.tsx
+++ b/src/components/Button.tsx
@@ -292,7 +292,7 @@ export function Button({
           baseStyles.push({height: 50, width: 50})
         }
       } else if (size === 'small') {
-        baseStyles.push({height: 40, width: 40})
+        baseStyles.push({height: 34, width: 34})
       } else if (size === 'tiny') {
         baseStyles.push({height: 20, width: 20})
       }
diff --git a/src/screens/Messages/List/index.tsx b/src/screens/Messages/List/index.tsx
index 2ae17a1414..060dac6301 100644
--- a/src/screens/Messages/List/index.tsx
+++ b/src/screens/Messages/List/index.tsx
@@ -61,12 +61,16 @@ export function MessagesScreen({navigation, route}: Props) {
     return (
       <Link
         to="/messages/settings"
-        accessibilityLabel={_(msg`Message settings`)}
-        accessibilityHint={_(msg`Opens the message settings page`)}>
-        <SettingsSlider size="lg" style={t.atoms.text} />
+        label={_(msg`Chat settings`)}
+        size="small"
+        variant="ghost"
+        color="secondary"
+        shape="square"
+        style={[a.justify_center]}>
+        <SettingsSlider size="md" style={[t.atoms.text_contrast_medium]} />
       </Link>
     )
-  }, [_, t.atoms.text])
+  }, [_, t])
 
   const initialNumToRender = useInitialNumToRender()
   const [isPTRing, setIsPTRing] = useState(false)
@@ -165,7 +169,7 @@ export function MessagesScreen({navigation, route}: Props) {
         <ViewHeader
           title={_(msg`Messages`)}
           renderButton={renderButton}
-          showBorder={false}
+          showBorder
           canGoBack={false}
         />
       )}
@@ -225,32 +229,32 @@ function DesktopHeader({
         a.justify_between,
         a.gap_lg,
         a.px_lg,
-        a.py_sm,
+        a.pr_md,
+        a.py_md,
         a.border_b,
         t.atoms.border_contrast_low,
       ]}>
       <Text style={[a.text_2xl, a.font_bold]}>
         <Trans>Messages</Trans>
       </Text>
-      <View style={[a.flex_row, a.align_center, a.gap_md]}>
+      <View style={[a.flex_row, a.align_center, a.gap_sm]}>
         <Button
           label={_(msg`Message settings`)}
           color="secondary"
-          size="large"
+          size="small"
           variant="ghost"
-          style={[{height: 'auto', width: 'auto'}, a.px_sm, a.py_sm]}
+          shape="square"
           onPress={onNavigateToSettings}>
-          <ButtonIcon icon={SettingsSlider} />
+          <SettingsSlider size="md" style={[t.atoms.text_contrast_medium]} />
         </Button>
         {gtTablet && (
           <Button
             label={_(msg`New chat`)}
             color="primary"
-            size="large"
+            size="small"
             variant="solid"
-            style={[{height: 'auto', width: 'auto'}, a.px_md, a.py_sm]}
             onPress={newChatControl.open}>
-            <ButtonIcon icon={Plus} position="right" />
+            <ButtonIcon icon={Plus} position="left" />
             <ButtonText>
               <Trans>New chat</Trans>
             </ButtonText>