diff --git a/resources/icons/white/dot.svg b/resources/icons/white/dot.svg
new file mode 100644
index 0000000000..90fbaf7fb1
--- /dev/null
+++ b/resources/icons/white/dot.svg
@@ -0,0 +1,8 @@
+
+
+
diff --git a/resources/icons/white/drop_to_bed.svg b/resources/icons/white/drop_to_bed.svg
new file mode 100644
index 0000000000..76243f8976
--- /dev/null
+++ b/resources/icons/white/drop_to_bed.svg
@@ -0,0 +1,15 @@
+
+
+
diff --git a/resources/icons/white/eye_closed.svg b/resources/icons/white/eye_closed.svg
new file mode 100644
index 0000000000..0cdd16ae00
--- /dev/null
+++ b/resources/icons/white/eye_closed.svg
@@ -0,0 +1,13 @@
+
+
+
diff --git a/resources/icons/white/eye_open.svg b/resources/icons/white/eye_open.svg
new file mode 100644
index 0000000000..1b320da079
--- /dev/null
+++ b/resources/icons/white/eye_open.svg
@@ -0,0 +1,11 @@
+
+
+
diff --git a/resources/icons/white/lock_closed_f.svg b/resources/icons/white/lock_closed_f.svg
new file mode 100644
index 0000000000..412c93c164
--- /dev/null
+++ b/resources/icons/white/lock_closed_f.svg
@@ -0,0 +1,10 @@
+
+
+
diff --git a/src/slic3r/GUI/MainFrame.cpp b/src/slic3r/GUI/MainFrame.cpp
index 0bcf1bd950..47cd3443d9 100644
--- a/src/slic3r/GUI/MainFrame.cpp
+++ b/src/slic3r/GUI/MainFrame.cpp
@@ -97,7 +97,7 @@ DPIFrame(NULL, wxID_ANY, "", wxDefaultPosition, wxDefaultSize, wxDEFAULT_FRAME_S
// Otherwise, MainFrame will be maximized by height
if (slNew) {
wxSize size = wxGetApp().get_min_size();
- size.SetWidth(int(0.5*size.GetHeight()));
+ size.SetHeight(int(0.5*size.GetHeight()));
m_plater->SetMinSize(size);
m_tabpanel->SetMinSize(size);
}
diff --git a/src/slic3r/GUI/ObjectDataViewModel.cpp b/src/slic3r/GUI/ObjectDataViewModel.cpp
index d9b9af016f..336475d2e0 100644
--- a/src/slic3r/GUI/ObjectDataViewModel.cpp
+++ b/src/slic3r/GUI/ObjectDataViewModel.cpp
@@ -138,7 +138,7 @@ void ObjectDataViewModelNode::update_settings_digest_bitmaps()
std::map& categories_icon = Slic3r::GUI::wxGetApp().obj_list()->CATEGORY_ICON;
std::string scaled_bitmap_name = m_name.ToUTF8().data();
- scaled_bitmap_name += "-em" + std::to_string(Slic3r::GUI::wxGetApp().em_unit());
+ scaled_bitmap_name += "-em" + std::to_string(wxGetApp().em_unit()) + (wxGetApp().dark_mode() ? "-dm" : "");
wxBitmap *bmp = m_bitmap_cache->find(scaled_bitmap_name);
if (bmp == nullptr) {
diff --git a/src/slic3r/GUI/OptionsGroup.cpp b/src/slic3r/GUI/OptionsGroup.cpp
index 5c2d6d38ef..fa94e63218 100644
--- a/src/slic3r/GUI/OptionsGroup.cpp
+++ b/src/slic3r/GUI/OptionsGroup.cpp
@@ -578,8 +578,6 @@ void ConfigOptionsGroup::sys_color_changed()
// update undo buttons : rescale bitmaps
for (const auto& field : m_fields)
field.second->sys_color_changed();
-
- m_grid_sizer->Layout();
}
boost::any ConfigOptionsGroup::config_value(const std::string& opt_key, int opt_index, bool deserialize) {
diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp
index b1ff646084..da48224b34 100644
--- a/src/slic3r/GUI/Tab.cpp
+++ b/src/slic3r/GUI/Tab.cpp
@@ -190,15 +190,13 @@ void Tab::create_preset_tab()
add_scaled_button(panel, &m_search_btn, "search");
m_search_btn->SetToolTip(format_wxstr(_L("Click to start a search or use %1% shortcut"), "Ctrl+F"));
- // Determine the theme color of OS (dark or light)
- auto luma = wxGetApp().get_colour_approx_luma(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
// Bitmaps to be shown on the "Revert to system" aka "Lock to system" button next to each input field.
- add_scaled_bitmap(this, m_bmp_value_lock , luma >= 128 ? "lock_closed" : "lock_closed_white");
+ add_scaled_bitmap(this, m_bmp_value_lock , "lock_closed");
add_scaled_bitmap(this, m_bmp_value_unlock, "lock_open");
m_bmp_non_system = &m_bmp_white_bullet;
// Bitmaps to be shown on the "Undo user changes" button next to each input field.
add_scaled_bitmap(this, m_bmp_value_revert, "undo");
- add_scaled_bitmap(this, m_bmp_white_bullet, luma >= 128 ? "dot" : "dot_white");
+ add_scaled_bitmap(this, m_bmp_white_bullet, "dot");
fill_icon_descriptions();
set_tooltips_text();