diff --git a/src/slic3r/GUI/Widgets/ComboBox.cpp b/src/slic3r/GUI/Widgets/ComboBox.cpp
index 6521da93ea..a2aa6a2cb6 100644
--- a/src/slic3r/GUI/Widgets/ComboBox.cpp
+++ b/src/slic3r/GUI/Widgets/ComboBox.cpp
@@ -85,7 +85,7 @@ void ComboBox::SetSelection(int n)
     drop.SetSelection(n);
     SetLabel(drop.GetValue());
     if (drop.selection >= 0 && drop.iconSize.y > 0)
-        SetIcon(icons[drop.selection].GetBitmapFor(m_parent));//OcraftyoneTODO: dirty conversion
+        SetIcon(icons[drop.selection]);
 }
 void ComboBox::SelectAndNotify(int n) { 
     SetSelection(n);
@@ -108,7 +108,7 @@ void ComboBox::SetValue(const wxString &value)
     drop.SetValue(value);
     SetLabel(value);
     if (drop.selection >= 0 && drop.iconSize.y > 0)
-        SetIcon(icons[drop.selection].GetBitmapFor(m_parent));//OcraftyoneTODO: dirty conversion
+        SetIcon(icons[drop.selection]);
 }
 
 void ComboBox::SetLabel(const wxString &value)
diff --git a/src/slic3r/GUI/Widgets/TextInput.cpp b/src/slic3r/GUI/Widgets/TextInput.cpp
index 968e1f4287..26218d439b 100644
--- a/src/slic3r/GUI/Widgets/TextInput.cpp
+++ b/src/slic3r/GUI/Widgets/TextInput.cpp
@@ -94,10 +94,10 @@ void TextInput::SetLabel(const wxString& label)
     Refresh();
 }
 
-void TextInput::SetIcon(const wxBitmap &icon)
+void TextInput::SetIcon(const wxBitmapBundle &icon_in)
 {
     this->icon = ScalableBitmap();
-    this->icon.bmp() = icon;
+    this->icon.bmp() = icon_in;
     Rescale();
 }
 
@@ -153,7 +153,7 @@ void TextInput::DoSetSize(int x, int y, int width, int height, int sizeFlags)
     wxSize size = GetSize();
     wxPoint textPos = {5, 0};
     if (this->icon.bmp().IsOk()) {
-        wxSize szIcon = this->icon.GetBmpSize();
+        wxSize szIcon = this->icon.GetSize();
         textPos.x += szIcon.x;
     }
     bool align_right = GetWindowStyle() & wxRIGHT;
@@ -194,7 +194,7 @@ void TextInput::render(wxDC& dc)
     // start draw
     wxPoint pt = {5, 0};
     if (icon.bmp().IsOk()) {
-        wxSize szIcon = icon.GetBmpSize();
+        wxSize szIcon = icon.GetSize();
         pt.y = (size.y - szIcon.y) / 2;
         dc.DrawBitmap(icon.get_bitmap(), pt);
         pt.x += szIcon.x + 0;
diff --git a/src/slic3r/GUI/Widgets/TextInput.hpp b/src/slic3r/GUI/Widgets/TextInput.hpp
index 152fb88f3d..06cbd29a79 100644
--- a/src/slic3r/GUI/Widgets/TextInput.hpp
+++ b/src/slic3r/GUI/Widgets/TextInput.hpp
@@ -40,7 +40,7 @@ public:
 
     void SetLabel(const wxString& label);
 
-    void SetIcon(const wxBitmap & icon);
+    void SetIcon(const wxBitmapBundle & icon);
 
     void SetLabelColor(StateColor const &color);