diff --git a/src/slic3r/GUI/MsgDialog.cpp b/src/slic3r/GUI/MsgDialog.cpp
index 2946a9c149..00d31ca600 100644
--- a/src/slic3r/GUI/MsgDialog.cpp
+++ b/src/slic3r/GUI/MsgDialog.cpp
@@ -301,8 +301,10 @@ int RichMessageDialog::ShowModal()
 {
     if (m_checkBoxText.IsEmpty())
         m_checkBox->Hide();
-    else
+    else {
         m_checkBox->SetLabelText(m_checkBoxText);
+        m_checkBox->Update();
+    }
     Layout();
 
     return wxDialog::ShowModal();
diff --git a/src/slic3r/GUI/Widgets/BitmapToggleButton.cpp b/src/slic3r/GUI/Widgets/BitmapToggleButton.cpp
index e73b789c5f..58896d01c0 100644
--- a/src/slic3r/GUI/Widgets/BitmapToggleButton.cpp
+++ b/src/slic3r/GUI/Widgets/BitmapToggleButton.cpp
@@ -4,8 +4,9 @@
 
 BitmapToggleButton::BitmapToggleButton(wxWindow* parent, const wxString& label, wxWindowID id)
 {
+    const long style = wxBORDER_NONE | wxBU_EXACTFIT | wxBU_LEFT;
     if (label.IsEmpty())
-        wxBitmapToggleButton::Create(parent, id, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBORDER_NONE | wxBU_EXACTFIT);
+        wxBitmapToggleButton::Create(parent, id, wxNullBitmap, wxDefaultPosition, wxDefaultSize, style);
     else {
 #ifdef __linux__
         wxSize label_size = parent->GetTextExtent(label);
@@ -14,7 +15,7 @@ BitmapToggleButton::BitmapToggleButton(wxWindow* parent, const wxString& label,
         wxSize def_size = wxDefaultSize;
 #endif
         // Call Create() from wxToggleButton instead of wxBitmapToggleButton to allow add Label text under Linux
-        wxToggleButton::Create(parent, id, label, wxDefaultPosition, def_size, wxBORDER_NONE | wxBU_EXACTFIT);
+        wxToggleButton::Create(parent, id, label, wxDefaultPosition, def_size, style);
     }
 
 #ifdef __WXMSW__
diff --git a/src/slic3r/GUI/Widgets/CheckBox.cpp b/src/slic3r/GUI/Widgets/CheckBox.cpp
index 627f1d0971..618c9a9ccd 100644
--- a/src/slic3r/GUI/Widgets/CheckBox.cpp
+++ b/src/slic3r/GUI/Widgets/CheckBox.cpp
@@ -54,6 +54,8 @@ void CheckBox::update()
     updateBitmap(e);
 #endif
 
+    if (GetBitmapMargins().GetWidth() == 0 && !GetLabelText().IsEmpty())
+        SetBitmapMargins(4, 0);
     update_size();
 }