diff --git a/src/slic3r/GUI/PrintOptionsDialog.cpp b/src/slic3r/GUI/PrintOptionsDialog.cpp
index 902636634d..68b9f7e385 100644
--- a/src/slic3r/GUI/PrintOptionsDialog.cpp
+++ b/src/slic3r/GUI/PrintOptionsDialog.cpp
@@ -158,6 +158,11 @@ wxBoxSizer* PrintOptionsDialog::create_settings_group(wxWindow* parent)
     wxBoxSizer* sizer = new wxBoxSizer(wxVERTICAL);
     wxBoxSizer* line_sizer = new wxBoxSizer(wxHORIZONTAL);
 
+    auto m_line = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxSize(-1, 1), wxTAB_TRAVERSAL);
+    m_line->SetBackgroundColour(wxColour(166, 169, 170));
+
+    sizer->Add(m_line, 0, wxEXPAND, 0);
+
     // ai monitoring with levels
     line_sizer = new wxBoxSizer(wxHORIZONTAL);
     m_cb_ai_monitoring = new CheckBox(parent);
@@ -166,7 +171,8 @@ wxBoxSizer* PrintOptionsDialog::create_settings_group(wxWindow* parent)
     line_sizer->Add(FromDIP(5), 0, 0, 0);
     line_sizer->Add(m_cb_ai_monitoring, 0, wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(5));
     line_sizer->Add(text_ai_monitoring, 1, wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(5));
-    sizer->Add(line_sizer, 0, wxEXPAND | wxALL, FromDIP(5));
+    sizer->Add(0,0,0,wxTOP, FromDIP(18));
+    sizer->Add(line_sizer, 0, wxEXPAND | wxLEFT | wxRIGHT, FromDIP(18));
     line_sizer->Add(FromDIP(5), 0, 0, 0);
 
     line_sizer = new wxBoxSizer(wxHORIZONTAL);
@@ -184,11 +190,11 @@ wxBoxSizer* PrintOptionsDialog::create_settings_group(wxWindow* parent)
     line_sizer->Add(FromDIP(30), 0, 0, 0);
     line_sizer->Add(text_ai_monitoring_caption, 0, wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(5));
     line_sizer->Add( ai_monitoring_level_list, 0, wxEXPAND|wxALL, FromDIP(5) );
-    sizer->Add(line_sizer, 0, wxEXPAND | wxALL , 0);
+    sizer->Add(line_sizer, 0, wxEXPAND | wxLEFT | wxRIGHT, FromDIP(18));
 
     line1 = new StaticLine(parent, false);
     line1->SetLineColour(STATIC_BOX_LINE_COL);
-    sizer->Add(line1, 0, wxEXPAND | wxLEFT | wxRIGHT, FromDIP(20));
+    sizer->Add(line1, 0, wxEXPAND | wxLEFT | wxRIGHT, FromDIP(18));
 
     // detection of build plate position
     line_sizer = new wxBoxSizer(wxHORIZONTAL);
@@ -198,7 +204,7 @@ wxBoxSizer* PrintOptionsDialog::create_settings_group(wxWindow* parent)
     line_sizer->Add(FromDIP(5), 0, 0, 0);
     line_sizer->Add(m_cb_plate_mark, 0, wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(5));
     line_sizer->Add(text_plate_mark, 1, wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(5));
-    sizer->Add(line_sizer, 0, wxEXPAND | wxALL, FromDIP(5));
+    sizer->Add(line_sizer, 0, wxEXPAND | wxLEFT | wxRIGHT, FromDIP(18));
     line_sizer->Add(FromDIP(5), 0, 0, 0);
 
     line_sizer = new wxBoxSizer(wxHORIZONTAL);
@@ -210,8 +216,8 @@ wxBoxSizer* PrintOptionsDialog::create_settings_group(wxWindow* parent)
     text_plate_mark_caption->SetFont(Label::Body_14);
     text_plate_mark_caption->SetForegroundColour(STATIC_TEXT_CAPTION_COL);
     line_sizer->Add(FromDIP(30), 0, 0, 0);
-    line_sizer->Add(text_plate_mark_caption, 1, wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(5));
-    sizer->Add(line_sizer, 0, wxEXPAND | wxALL , FromDIP(5));
+    line_sizer->Add(text_plate_mark_caption, 1, wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(0));
+    sizer->Add(line_sizer, 0, wxEXPAND | wxLEFT | wxRIGHT, FromDIP(18));
 
     line2 = new StaticLine(parent, false);
     line2->SetLineColour(STATIC_BOX_LINE_COL);
@@ -225,7 +231,8 @@ wxBoxSizer* PrintOptionsDialog::create_settings_group(wxWindow* parent)
     line_sizer->Add(FromDIP(5), 0, 0, 0);
     line_sizer->Add(m_cb_first_layer, 0, wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(5));
     line_sizer->Add(text_first_layer, 1, wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(5));
-    sizer->Add(line_sizer, 0, wxEXPAND | wxALL, FromDIP(5));
+    sizer->Add(0,0,0,wxTOP, FromDIP(15));
+    sizer->Add(line_sizer, 0, wxEXPAND | wxLEFT | wxRIGHT, FromDIP(18));
     line_sizer->Add(FromDIP(5), 0, 0, 0);
 
     line3 = new StaticLine(parent, false);
@@ -240,12 +247,14 @@ wxBoxSizer* PrintOptionsDialog::create_settings_group(wxWindow* parent)
     line_sizer->Add(FromDIP(5), 0, 0, 0);
     line_sizer->Add(m_cb_auto_recovery, 0, wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(5));
     line_sizer->Add(text_auto_recovery, 1, wxALL | wxALIGN_CENTER_VERTICAL, FromDIP(5));
-    sizer->Add(line_sizer, 0, wxEXPAND | wxALL, FromDIP(5));
+    sizer->Add(0,0,0,wxTOP, FromDIP(15));
+    sizer->Add(line_sizer, 0, wxEXPAND | wxLEFT | wxRIGHT, FromDIP(18));
     line_sizer->Add(FromDIP(5), 0, 0, 0);
 
     line4 = new StaticLine(parent, false);
     line4->SetLineColour(wxColour(255,255,255));
     sizer->Add(line4, 0, wxEXPAND | wxLEFT | wxRIGHT, FromDIP(20));
+    sizer->Add(0,0,0,wxTOP, FromDIP(20));
 
     ai_monitoring_level_list->Connect( wxEVT_COMBOBOX, wxCommandEventHandler(PrintOptionsDialog::set_ai_monitor_sensitivity), NULL, this );
 
@@ -299,7 +308,10 @@ void PrintOptionsDialog::update_machine_obj(MachineObject *obj_)
 
 bool PrintOptionsDialog::Show(bool show)
 {
-    if (show) { CentreOnParent(); }
+    if (show) { 
+        wxGetApp().UpdateDlgDarkUI(this);
+        CentreOnParent(); 
+    }
     return DPIDialog::Show(show);
 }
 
diff --git a/src/slic3r/GUI/SavePresetDialog.cpp b/src/slic3r/GUI/SavePresetDialog.cpp
index a6a7477566..2c97c21e2f 100644
--- a/src/slic3r/GUI/SavePresetDialog.cpp
+++ b/src/slic3r/GUI/SavePresetDialog.cpp
@@ -89,8 +89,8 @@ SavePresetDialog::Item::Item(Preset::Type type, const std::string &suffix, wxBox
     m_input_ctrl->Bind(wxEVT_TEXT, [this](wxCommandEvent &) { update(); });
 
 
-    input_sizer_v->Add(m_input_ctrl, 0, wxALIGN_CENTER | wxLEFT | wxRIGHT, 1);
-    input_sizer_h->Add(input_sizer_v, 0, wxALIGN_CENTER, 0);
+    input_sizer_v->Add(m_input_ctrl, 0, wxALL, 1);
+    input_sizer_h->Add(input_sizer_v, 0, wxALL, 1);
 
     m_input_area->SetSizer(input_sizer_h);
     m_input_area->Layout();
@@ -363,11 +363,10 @@ void SavePresetDialog::build(std::vector<Preset::Type> types, std::string suffix
     block_right->SetBackgroundColour(SAVE_PRESET_DIALOG_DEF_COLOUR);
     btns->Add(block_right, 0, wxRIGHT, 40);
 
-    auto m_top_line = new wxStaticLine(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL);
-    m_top_line->SetForegroundColour(wxColour(166, 169, 170));
-    m_top_line->SetBackgroundColour(wxColour(166, 169, 170));
+    auto m_line = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxSize(-1, 1), wxTAB_TRAVERSAL);
+    m_line->SetBackgroundColour(wxColour(166, 169, 170));
 
-    m_Sizer_main->Add(m_top_line, 0, wxEXPAND, 0);
+    m_Sizer_main->Add( m_line, 0, wxEXPAND, 0 );
     m_Sizer_main->Add(m_presets_sizer, 0, wxEXPAND | wxALL, BORDER_W);
     m_Sizer_main->Add(btns, 0, wxEXPAND | wxBOTTOM, BORDER_W + 7);
 
diff --git a/src/slic3r/GUI/SelectMachine.cpp b/src/slic3r/GUI/SelectMachine.cpp
index a729dce40a..c57170a58c 100644
--- a/src/slic3r/GUI/SelectMachine.cpp
+++ b/src/slic3r/GUI/SelectMachine.cpp
@@ -3069,6 +3069,7 @@ bool SelectMachineDialog::Show(bool show)
 
     // set default value when show this dialog
     if (show) {
+        wxGetApp().UpdateDlgDarkUI(this);
         wxGetApp().reset_to_active();
         set_default();
         update_user_machine_list();
diff --git a/src/slic3r/GUI/SetBedTypeDialog.cpp b/src/slic3r/GUI/SetBedTypeDialog.cpp
index 68caeba0b6..cb8ad7d9c0 100644
--- a/src/slic3r/GUI/SetBedTypeDialog.cpp
+++ b/src/slic3r/GUI/SetBedTypeDialog.cpp
@@ -43,7 +43,7 @@ SetBedTypeDialog::SetBedTypeDialog(wxWindow* parent, wxWindowID id, const wxStri
     m_button_ok = new Button(this, _L("OK"));
     m_button_ok->SetBackgroundColor(btn_bg_green);
     m_button_ok->SetBorderColor(*wxWHITE);
-    m_button_ok->SetTextColor(*wxWHITE);
+    m_button_ok->SetTextColor(wxColour("#FFFFFE"));
     m_button_ok->SetFont(Label::Body_12);
     m_button_ok->SetSize(wxSize(FromDIP(58), FromDIP(24)));
     m_button_ok->SetMinSize(wxSize(FromDIP(58), FromDIP(24)));
@@ -90,6 +90,8 @@ SetBedTypeDialog::SetBedTypeDialog(wxWindow* parent, wxWindowID id, const wxStri
     m_sizer_main->Fit(this);
 
     CenterOnParent();
+
+    wxGetApp().UpdateDlgDarkUI(this);
 }
 
 SetBedTypeDialog::~SetBedTypeDialog()