diff --git a/src/slic3r/GUI/MsgDialog.cpp b/src/slic3r/GUI/MsgDialog.cpp
index 46511b053..5cea4bd8a 100644
--- a/src/slic3r/GUI/MsgDialog.cpp
+++ b/src/slic3r/GUI/MsgDialog.cpp
@@ -91,7 +91,7 @@ void MsgDialog::show_dsa_button()
     auto  m_text_dsa = new wxStaticText(this, wxID_ANY, _L("Don't show again"), wxDefaultPosition, wxDefaultSize, 0);
     m_dsa_sizer->Add(m_text_dsa, 0, wxALL | wxALIGN_CENTER, FromDIP(2));
     m_text_dsa->SetFont(::Label::Body_13);
-    m_text_dsa->SetForegroundColour(wxColour(0x32,0x3A,0x3D));
+    m_text_dsa->SetForegroundColour(StateColor::darkModeColorFor(wxColour("#323A3D")));
     btn_sizer->Layout();
     //Fit();
 }
diff --git a/src/slic3r/GUI/UpgradePanel.cpp b/src/slic3r/GUI/UpgradePanel.cpp
index 17c9ac9fe..72c6203f4 100644
--- a/src/slic3r/GUI/UpgradePanel.cpp
+++ b/src/slic3r/GUI/UpgradePanel.cpp
@@ -738,7 +738,9 @@ void MachineInfoPanel::show_ext(bool show, bool force_update)
 
 void MachineInfoPanel::on_sys_color_changed()
 {
-    Update_printer_img(m_obj);
+    if (m_obj) {
+        Update_printer_img(m_obj);
+    }
 }
 
 void MachineInfoPanel::upgrade_firmware_internal() {