diff --git a/resources/data/skins/dark-mode.surge-skin/skin.xml b/resources/data/skins/dark-mode.surge-skin/skin.xml
index 7fe4d7bb497..06d53083451 100644
--- a/resources/data/skins/dark-mode.surge-skin/skin.xml
+++ b/resources/data/skins/dark-mode.surge-skin/skin.xml
@@ -145,9 +145,8 @@
         <color id="dialog.textfield.text" value="lightgray"/>
         <color id="dialog.label.text" value="lightgray"/>
 
-        <color id="dialog.checkbox.background" value="white"/>
         <color id="dialog.checkbox.border" value="lightgray"/>
-        <color id="dialog.checkbox.tick" value="darkergray"/>
+        <color id="dialog.checkbox.tick" value="lightgray"/>
 
         <color id="effect.label.separator" value="#5E5E5E"/>
         <color id="effect.label.text" value="lightgray"/>
diff --git a/src/surge-xt/gui/overlays/PatchStoreDialog.cpp b/src/surge-xt/gui/overlays/PatchStoreDialog.cpp
index 39c0d9761b7..4bacac51d34 100644
--- a/src/surge-xt/gui/overlays/PatchStoreDialog.cpp
+++ b/src/surge-xt/gui/overlays/PatchStoreDialog.cpp
@@ -200,9 +200,32 @@ void PatchStoreDialog::onSkinChanged()
                           skin->getColor(Colors::Dialog::Entry::Border));
     };
 
+    auto resetLabel = [this](const auto &label) {
+        label->setFont(skin->getFont(Fonts::PatchStore::Label));
+        label->setColour(juce::Label::textColourId, skin->getColor(Colors::Dialog::Label::Text));
+    };
+
     resetColors(nameEd);
     resetColors(authorEd);
     resetColors(catEd);
+    resetColors(commentEd);
+
+    resetLabel(nameEdL);
+    resetLabel(authorEdL);
+    resetLabel(catEdL);
+    resetLabel(commentEdL);
+    resetLabel(storeTuningLabel);
+
+#if HAS_TAGS_FIELD
+    resetLabel(tagEdL);
+    resetColors(tagEd);
+#endif
+
+    storeTuningButton->setColour(juce::ToggleButton::tickDisabledColourId,
+                                 skin->getColor(Colors::Dialog::Checkbox::Border));
+    storeTuningButton->setColour(juce::ToggleButton::tickColourId,
+                                 skin->getColor(Colors::Dialog::Checkbox::Tick));
+
     catEd->setColour(Surge::Widgets::TypeAhead::ColourIds::emptyBackgroundId,
                      skin->getColor(Colors::Dialog::Entry::Background));
     catEd->setColour(Surge::Widgets::TypeAhead::ColourIds::borderid,
@@ -214,25 +237,6 @@ void PatchStoreDialog::onSkinChanged()
     categoryProvider->hl = categoryProvider->txt;
     categoryProvider->hlbg = skin->getColor(Colors::Dialog::Entry::Focus);
 
-#if HAS_TAGS_FIELD
-    resetColors(tagEd);
-#endif
-    resetColors(commentEd);
-
-    auto resetLabel = [this](const auto &label) {
-        label->setFont(skin->getFont(Fonts::PatchStore::Label));
-        label->setColour(juce::Label::textColourId, skin->getColor(Colors::Dialog::Label::Text));
-    };
-
-    resetLabel(nameEdL);
-    resetLabel(authorEdL);
-#if HAS_TAGS_FIELD
-    resetLabel(tagEdL);
-#endif
-    resetLabel(catEdL);
-    resetLabel(commentEdL);
-    resetLabel(storeTuningLabel);
-
     okButton->setSkin(skin, associatedBitmapStore);
     cancelButton->setSkin(skin, associatedBitmapStore);
     okOverButton->setSkin(skin, associatedBitmapStore);