diff --git a/resources/images/fan_control_add.svg b/resources/images/fan_control_add.svg
index 2f857e2234..ce4e655185 100644
--- a/resources/images/fan_control_add.svg
+++ b/resources/images/fan_control_add.svg
@@ -1,3 +1,3 @@
 <svg width="25" height="25" viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M13.5941 5.15355C13.5941 4.64201 13.1826 4.23047 12.6711 4.23047C12.1595 4.23047 11.748 4.64201 11.748 5.15355V11.3074H5.59413C5.08259 11.3074 4.67105 11.7189 4.67105 12.2305C4.67105 12.742 5.08259 13.1535 5.59413 13.1535H11.748V19.3074C11.748 19.8189 12.1595 20.2305 12.6711 20.2305C13.1826 20.2305 13.5941 19.8189 13.5941 19.3074V13.1535H19.748C20.2595 13.1535 20.6711 12.742 20.6711 12.2305C20.6711 11.7189 20.2595 11.3074 19.748 11.3074H13.5941V5.15355Z" fill="black"/>
+<path d="M13.5941 5.15355C13.5941 4.64201 13.1826 4.23047 12.6711 4.23047C12.1595 4.23047 11.748 4.64201 11.748 5.15355V11.3074H5.59413C5.08259 11.3074 4.67105 11.7189 4.67105 12.2305C4.67105 12.742 5.08259 13.1535 5.59413 13.1535H11.748V19.3074C11.748 19.8189 12.1595 20.2305 12.6711 20.2305C13.1826 20.2305 13.5941 19.8189 13.5941 19.3074V13.1535H19.748C20.2595 13.1535 20.6711 12.742 20.6711 12.2305C20.6711 11.7189 20.2595 11.3074 19.748 11.3074H13.5941V5.15355Z" fill="#262E30"/>
 </svg>
diff --git a/resources/images/fan_control_decrease.svg b/resources/images/fan_control_decrease.svg
index 524b7ed0bb..a1a7133493 100644
--- a/resources/images/fan_control_decrease.svg
+++ b/resources/images/fan_control_decrease.svg
@@ -1,3 +1,3 @@
 <svg width="24" height="25" viewBox="0 0 24 25" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M4 12.1305C4 11.6334 4.40294 11.2305 4.9 11.2305H19.1C19.5971 11.2305 20 11.6334 20 12.1305C20 12.6275 19.5971 13.0305 19.1 13.0305H4.9C4.40294 13.0305 4 12.6275 4 12.1305Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M4 12.1305C4 11.6334 4.40294 11.2305 4.9 11.2305H19.1C19.5971 11.2305 20 11.6334 20 12.1305C20 12.6275 19.5971 13.0305 19.1 13.0305H4.9C4.40294 13.0305 4 12.6275 4 12.1305Z" fill="#262E30"/>
 </svg>
diff --git a/resources/images/print_options_bg_dark.png b/resources/images/print_options_bg_dark.png
deleted file mode 100644
index 267765cbf5..0000000000
Binary files a/resources/images/print_options_bg_dark.png and /dev/null differ
diff --git a/resources/images/print_options_bg_dark.svg b/resources/images/print_options_bg_dark.svg
new file mode 100644
index 0000000000..ce32d1f397
--- /dev/null
+++ b/resources/images/print_options_bg_dark.svg
@@ -0,0 +1,16 @@
+<svg width="44" height="22" viewBox="0 0 44 22" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_2172_1443)">
+<mask id="mask0_2172_1443" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="0" y="0" width="44" height="22">
+<path d="M44 0H0V22H44V0Z" fill="#4c4c55"/>
+</mask>
+<g mask="url(#mask0_2172_1443)">
+<path d="M40.8572 0.5H3.14286C1.62408 0.5 0.39286 2.067 0.39286 4V18C0.39286 19.933 1.62408 21.5 3.14286 21.5H40.8572C42.376 21.5 43.6072 19.933 43.6072 18V4C43.6072 2.067 42.376 0.5 40.8572 0.5Z" fill="#302f34"/>
+<path d="M40.8572 0.5H3.14286C1.62408 0.5 0.39286 2.067 0.39286 4V18C0.39286 19.933 1.62408 21.5 3.14286 21.5H40.8572C42.376 21.5 43.6072 19.933 43.6072 18V4C43.6072 2.067 42.376 0.5 40.8572 0.5Z" stroke="#009688"/>
+</g>
+</g>
+<defs>
+<clipPath id="clip0_2172_1443">
+<rect width="44" height="22" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/src/slic3r/GUI/DeviceTab/uiAmsHumidityPopup.cpp b/src/slic3r/GUI/DeviceTab/uiAmsHumidityPopup.cpp
index b752d3cfec..e88c19fd3e 100644
--- a/src/slic3r/GUI/DeviceTab/uiAmsHumidityPopup.cpp
+++ b/src/slic3r/GUI/DeviceTab/uiAmsHumidityPopup.cpp
@@ -23,6 +23,7 @@ uiAmsPercentHumidityDryPopup::uiAmsPercentHumidityDryPopup(wxWindow *parent)
     : wxDialog(parent, wxID_ANY, "")
 {
     Create();
+    wxGetApp().UpdateDlgDarkUI(this);
 }
 
 void uiAmsPercentHumidityDryPopup::Create()
diff --git a/src/slic3r/GUI/Widgets/FanControl.cpp b/src/slic3r/GUI/Widgets/FanControl.cpp
index 5a18933291..616098d4f5 100644
--- a/src/slic3r/GUI/Widgets/FanControl.cpp
+++ b/src/slic3r/GUI/Widgets/FanControl.cpp
@@ -896,7 +896,7 @@ void FanControlPopupNew::post_event(int fan_type, wxString speed)
 
 void FanControlPopupNew::on_show(wxShowEvent& evt)
 {
-    wxGetApp().UpdateDarkUIWin(this);
+    wxGetApp().UpdateDlgDarkUI(this);
 }
 
 void FanControlPopupNew::command_control_air_duct(int mode_id, int submode)