diff --git a/lib/Slic3r/GUI/Plater.pm b/lib/Slic3r/GUI/Plater.pm
index 023ec4ae5..893cc366b 100644
--- a/lib/Slic3r/GUI/Plater.pm
+++ b/lib/Slic3r/GUI/Plater.pm
@@ -546,8 +546,6 @@ sub _on_select_preset {
         wxTheApp->{preset_bundle}->update_platter_filament_ui($idx, $choice);
 	} else {
         my $selected_item = $choice->GetSelection();
-        print ("selected_item = $selected_item\n");
-        print ("selected_item_$group = ". $self->{"selected_item_$group"}. "\n");
         return if ($selected_item == $self->{"selected_item_$group"});
 
         my $selected_string = $choice->GetString($selected_item);
diff --git a/resources/icons/action_undo.png b/resources/icons/action_undo.png
index 877f15986..06bb98b22 100644
Binary files a/resources/icons/action_undo.png and b/resources/icons/action_undo.png differ
diff --git a/resources/icons/action_undo_grey.png b/resources/icons/action_undo_grey.png
new file mode 100644
index 000000000..eaa1593e3
Binary files /dev/null and b/resources/icons/action_undo_grey.png differ
diff --git a/resources/icons/sys_unlock_grey.png b/resources/icons/sys_unlock_grey.png
new file mode 100644
index 000000000..0dedf4dee
Binary files /dev/null and b/resources/icons/sys_unlock_grey.png differ
diff --git a/xs/src/slic3r/GUI/Tab.cpp b/xs/src/slic3r/GUI/Tab.cpp
index 2b82694db..e15767329 100644
--- a/xs/src/slic3r/GUI/Tab.cpp
+++ b/xs/src/slic3r/GUI/Tab.cpp
@@ -126,13 +126,15 @@ void Tab::create_preset_tab(PresetBundle *preset_bundle)
 
 	m_question_btn->SetToolTip(_(L("Hover the cursor over buttons to find more information.")));
 
+	// Determine the theme color of OS (dark or light)
+	auto luma = 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.
 	m_bmp_value_lock  	  .LoadFile(from_u8(var("sys_lock.png")),     wxBITMAP_TYPE_PNG);
-	m_bmp_value_unlock	  .LoadFile(from_u8(var("sys_unlock.png")),   wxBITMAP_TYPE_PNG);
+	m_bmp_value_unlock    .LoadFile(from_u8(var(luma >= 128 ? "sys_unlock.png" : "sys_unlock_grey.png")), wxBITMAP_TYPE_PNG);
 	m_bmp_non_system = &m_bmp_white_bullet;
 	// Bitmaps to be shown on the "Undo user changes" button next to each input field.
-	m_bmp_value_revert	  .LoadFile(from_u8(var("action_undo.png")),  wxBITMAP_TYPE_PNG);
-	m_bmp_white_bullet	  .LoadFile(from_u8(var("bullet_white.png")), wxBITMAP_TYPE_PNG);
+	m_bmp_value_revert    .LoadFile(from_u8(var(luma >= 128 ? "action_undo.png" : "action_undo_grey.png")), wxBITMAP_TYPE_PNG);
+	m_bmp_white_bullet    .LoadFile(from_u8(var("bullet_white.png")), wxBITMAP_TYPE_PNG);
 	m_bmp_question        .LoadFile(from_u8(var("question_mark_01.png")), wxBITMAP_TYPE_PNG);
 
 	fill_icon_descriptions();