diff --git a/src/slic3r/GUI/Widgets/Button.cpp b/src/slic3r/GUI/Widgets/Button.cpp
index 6356eb63a..37709e977 100644
--- a/src/slic3r/GUI/Widgets/Button.cpp
+++ b/src/slic3r/GUI/Widgets/Button.cpp
@@ -65,6 +65,14 @@ void Button::SetLabel(const wxString& label)
     Refresh();
 }
 
+bool Button::SetFont(const wxFont& font)
+{
+    wxWindow::SetFont(font);
+    messureSize();
+    Refresh();
+    return true;
+}
+
 void Button::SetIcon(const wxString& icon)
 {
     if (!icon.IsEmpty()) {
@@ -166,7 +174,7 @@ void Button::render(wxDC& dc)
     dc.SetBrush(*wxTRANSPARENT_BRUSH);
     // calc content size
     wxSize szIcon;
-    wxSize szContent = textSize;
+    wxSize szContent = textSize.GetSize();
 
     ScalableBitmap icon;
     if (m_selected || ((states & (int)StateColor::State::Hovered) != 0))
@@ -205,11 +213,18 @@ void Button::render(wxDC& dc)
     }
     auto text = GetLabel();
     if (!text.IsEmpty()) {
-        if (pt.x + textSize.x > size.x)
+        if (pt.x + textSize.width > size.x)
             text = wxControl::Ellipsize(text, dc, wxELLIPSIZE_END, size.x - pt.x);
-        pt.y += (rcContent.height - textSize.y) / 2;
-        dc.SetFont(GetFont());
+        pt.y += (rcContent.height - textSize.height) / 2;
         dc.SetTextForeground(text_color.colorForStates(states));
+#if 0
+        dc.SetBrush(*wxLIGHT_GREY);
+        dc.SetPen(wxPen(*wxLIGHT_GREY));
+        dc.DrawRectangle(pt, textSize.GetSize());
+#endif
+#ifdef __WXOSX__
+        pt.y -= textSize.x / 2;
+#endif
         dc.DrawText(text, pt);
     }
 }
@@ -217,12 +232,12 @@ void Button::render(wxDC& dc)
 void Button::messureSize()
 {
     wxClientDC dc(this);
-    textSize = dc.GetTextExtent(GetLabel());
+    dc.GetTextExtent(GetLabel(), &textSize.width, &textSize.height, &textSize.x, &textSize.y);
     if (minSize.GetWidth() > 0) {
         wxWindow::SetMinSize(minSize);
         return;
     }
-    wxSize szContent = textSize;
+    wxSize szContent = textSize.GetSize();
     if (this->active_icon.bmp().IsOk()) {
         if (szContent.y > 0) {
             //BBS norrow size between text and icon
diff --git a/src/slic3r/GUI/Widgets/Button.hpp b/src/slic3r/GUI/Widgets/Button.hpp
index 56e46ca8f..100b430e6 100644
--- a/src/slic3r/GUI/Widgets/Button.hpp
+++ b/src/slic3r/GUI/Widgets/Button.hpp
@@ -6,7 +6,7 @@
 
 class Button : public StaticBox
 {
-    wxSize textSize;
+    wxRect textSize;
     wxSize minSize; // set by outer
     wxSize paddingSize;
     ScalableBitmap active_icon;
@@ -30,6 +30,8 @@ public:
 
     void SetLabel(const wxString& label) override;
 
+    bool SetFont(const wxFont& font) override;
+
     void SetIcon(const wxString& icon);
 
     void SetInactiveIcon(const wxString& icon);