diff --git a/src/slic3r/GUI/EditGCodeDialog.cpp b/src/slic3r/GUI/EditGCodeDialog.cpp
index 6546786609..ee5ff299f7 100644
--- a/src/slic3r/GUI/EditGCodeDialog.cpp
+++ b/src/slic3r/GUI/EditGCodeDialog.cpp
@@ -658,7 +658,11 @@ void ParamsModel::GetValue(wxVariant& variant, const wxDataViewItem& item, unsig
     if (col == (unsigned int)0)
 #ifdef __linux__
 //        variant << wxDataViewIconText(node->text, get_bmp_bundle(node->icon_name)->GetIconFor(m_ctrl->GetParent())); //TODO: update to bundle with wx update
-wxDataViewIconText(node->text, create_scaled_bitmap(node->icon_name, m_ctrl->GetParent()));
+    {
+        wxIcon icon;
+        icon.CopyFromBitmap(create_scaled_bitmap(node->icon_name, m_ctrl->GetParent()));
+        wxDataViewIconText(node->text, icon);
+    }
 #else
 //        variant << DataViewBitmapText(node->text, get_bmp_bundle(node->icon_name)->GetBitmapFor(m_ctrl->GetParent())); //TODO: update to bundle with wx update
         variant << DataViewBitmapText(node->text, create_scaled_bitmap(node->icon_name, m_ctrl->GetParent()));
diff --git a/src/slic3r/GUI/EditGCodeDialog.hpp b/src/slic3r/GUI/EditGCodeDialog.hpp
index afff93afdc..9d29282dc8 100644
--- a/src/slic3r/GUI/EditGCodeDialog.hpp
+++ b/src/slic3r/GUI/EditGCodeDialog.hpp
@@ -63,7 +63,7 @@ protected:
 
     void selection_changed(wxDataViewEvent& evt);
 
-    wxBoxSizer* EditGCodeDialog::create_btn_sizer(long flags);
+    wxBoxSizer* create_btn_sizer(long flags);
 };