diff --git a/Modules/SettingsPanel/SettingsPanel.qml b/Modules/SettingsPanel/SettingsPanel.qml
index 049a4ba..efc89a2 100644
--- a/Modules/SettingsPanel/SettingsPanel.qml
+++ b/Modules/SettingsPanel/SettingsPanel.qml
@@ -11,8 +11,8 @@ import qs.Widgets
 NPanel {
   id: root
 
-  panelWidth: Math.max(screen?.width * 0.4, 768) * scaling
-  panelHeight: Math.max(screen?.height * 0.75, 810) * scaling
+  panelWidth: Math.round(Math.max(screen?.width * 0.4, 1000) * scaling)
+  panelHeight: Math.round(Math.max(screen?.height * 0.75, 800) * scaling)
   panelAnchorHorizontalCenter: true
   panelAnchorVerticalCenter: true
 
diff --git a/Modules/SettingsPanel/Tabs/ColorSchemeTab.qml b/Modules/SettingsPanel/Tabs/ColorSchemeTab.qml
index 415d9f9..e14b6f3 100644
--- a/Modules/SettingsPanel/Tabs/ColorSchemeTab.qml
+++ b/Modules/SettingsPanel/Tabs/ColorSchemeTab.qml
@@ -247,38 +247,43 @@ ColumnLayout {
 
               // Color swatches
               RowLayout {
+                id: swatches
+
+
                 spacing: Style.marginS * scaling
                 Layout.fillWidth: true
                 Layout.alignment: Qt.AlignHCenter
 
+                readonly property int swatchSize: 20 * scaling
+
                 // Primary color swatch
                 Rectangle {
-                  width: 28 * scaling
-                  height: 28 * scaling
+                  width: swatches.swatchSize
+                  height: swatches.swatchSize
                   radius: width * 0.5
                   color: getSchemeColor(modelData, "mPrimary")
                 }
 
                 // Secondary color swatch
                 Rectangle {
-                  width: 28 * scaling
-                  height: 28 * scaling
+                  width: swatches.swatchSize
+                  height: swatches.swatchSize
                   radius: width * 0.5
                   color: getSchemeColor(modelData, "mSecondary")
                 }
 
                 // Tertiary color swatch
                 Rectangle {
-                  width: 28 * scaling
-                  height: 28 * scaling
+                  width: swatches.swatchSize
+                  height: swatches.swatchSize
                   radius: width * 0.5
                   color: getSchemeColor(modelData, "mTertiary")
                 }
 
                 // Error color swatch
                 Rectangle {
-                  width: 28 * scaling
-                  height: 28 * scaling
+                  width: swatches.swatchSize
+                  height: swatches.swatchSize
                   radius: width * 0.5
                   color: getSchemeColor(modelData, "mError")
                 }