diff --git a/src/slic3r/GUI/Notebook.cpp b/src/slic3r/GUI/Notebook.cpp
index 05c328b218..bc80e8862f 100644
--- a/src/slic3r/GUI/Notebook.cpp
+++ b/src/slic3r/GUI/Notebook.cpp
@@ -20,7 +20,15 @@ ButtonsListCtrl::ButtonsListCtrl(wxWindow *parent, wxBoxSizer* side_tools) :
 #ifdef __WINDOWS__
     SetDoubleBuffered(true);
 #endif //__WINDOWS__
-    wxColour default_btn_bg = wxColour("#3B4446"); // Gradient #414B4E
+
+    wxColour default_btn_bg;
+#ifdef __APPLE__
+    default_btn_bg = wxColour("#3B4446"); // Gradient #414B4E
+#else
+    default_btn_bg = wxColour("#2D2D30"); // Gradient #414B4E
+#endif
+
+   
     SetBackgroundColour(default_btn_bg);
 
     int em = em_unit(this);// Slic3r::GUI::wxGetApp().em_unit();
diff --git a/src/slic3r/GUI/UpgradePanel.cpp b/src/slic3r/GUI/UpgradePanel.cpp
index 72c6203f4a..9bc37993de 100644
--- a/src/slic3r/GUI/UpgradePanel.cpp
+++ b/src/slic3r/GUI/UpgradePanel.cpp
@@ -969,7 +969,10 @@ void UpgradePanel::show_status(int status)
 
 void UpgradePanel::on_sys_color_changed()
 {
-   m_push_upgrade_panel->on_sys_color_changed();
+    //add some protection for Dark mode
+    if (m_push_upgrade_panel) {
+        m_push_upgrade_panel->on_sys_color_changed();
+    }
 }
 
 bool UpgradePanel::Show(bool show)
diff --git a/src/slic3r/Utils/MacDarkMode.mm b/src/slic3r/Utils/MacDarkMode.mm
index f005987f52..10248fd0fa 100644
--- a/src/slic3r/Utils/MacDarkMode.mm
+++ b/src/slic3r/Utils/MacDarkMode.mm
@@ -44,9 +44,9 @@ double mac_max_scaling_factor()
     
 void set_miniaturizable(void * window)
 {
-    CGFloat rFloat = 38/255.0;
-    CGFloat gFloat = 46/255.0;
-    CGFloat bFloat = 48/255.0;
+    CGFloat rFloat = 34/255.0;
+    CGFloat gFloat = 34/255.0;
+    CGFloat bFloat = 36/255.0;
     [(NSView*) window window].titlebarAppearsTransparent = true;
     [(NSView*) window window].backgroundColor = [NSColor colorWithCalibratedRed:rFloat green:gFloat blue:bFloat alpha:1.0];
     [(NSView*) window window].styleMask |= NSMiniaturizableWindowMask;