diff --git a/src/slic3r/GUI/ExtraRenderers.cpp b/src/slic3r/GUI/ExtraRenderers.cpp
index 70baf49ff..4931a71ea 100644
--- a/src/slic3r/GUI/ExtraRenderers.cpp
+++ b/src/slic3r/GUI/ExtraRenderers.cpp
@@ -171,7 +171,10 @@ wxSize BitmapTextRenderer::GetSize() const
         }
         else
 #endif // SUPPORTS_MARKUP && wxHAS_GENERIC_DATAVIEWCTRL
+        {
             size = GetTextExtent(m_value.GetText());
+            size.x = size.x * 9 / 8;
+        }
 
         if (m_value.GetBitmap().IsOk())
             size.x += m_value.GetBitmap().GetWidth() + 4;
diff --git a/src/slic3r/GUI/GUI_ObjectList.cpp b/src/slic3r/GUI/GUI_ObjectList.cpp
index 7cb6a6156..0763740fb 100644
--- a/src/slic3r/GUI/GUI_ObjectList.cpp
+++ b/src/slic3r/GUI/GUI_ObjectList.cpp
@@ -26,6 +26,7 @@
 #include <wx/progdlg.h>
 #include <wx/listbook.h>
 #include <wx/numformatter.h>
+#include <wx/headerctrl.h>
 
 #include "slic3r/Utils/FixModelByWin10.hpp"
 #include "libslic3r/Format/bbs_3mf.hpp"
@@ -75,7 +76,11 @@ ObjectList::ObjectList(wxWindow* parent) :
     wxDataViewCtrl(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxDV_MULTIPLE)
 {
     wxGetApp().UpdateDVCDarkUI(this, true);
-
+    SetFont(Label::sysFont(13));
+#ifdef __WXMSW__
+    GenericGetHeader()->SetFont(Label::sysFont(13));
+#endif
+    
     // create control
     create_objects_ctrl();
 
diff --git a/src/slic3r/GUI/Preferences.cpp b/src/slic3r/GUI/Preferences.cpp
index 87647ec76..0e290030e 100644
--- a/src/slic3r/GUI/Preferences.cpp
+++ b/src/slic3r/GUI/Preferences.cpp
@@ -284,7 +284,6 @@ wxBoxSizer *PreferencesDialog::create_item_loglevel_combobox(wxString title, wxW
 
     std::vector<wxString>::iterator iter;
     for (iter = vlist.begin(); iter != vlist.end(); iter++) { combobox->Append(*iter); }
-    m_sizer_combox->Add(combobox, 0, wxALIGN_CENTER, 0);
 
     auto severity_level = app_config->get("severity_level");
     if (!severity_level.empty()) { combobox->SetValue(severity_level); }
diff --git a/src/slic3r/Utils/MacDarkMode.hpp b/src/slic3r/Utils/MacDarkMode.hpp
index 92d355fcb..7cdc4e6f7 100644
--- a/src/slic3r/Utils/MacDarkMode.hpp
+++ b/src/slic3r/Utils/MacDarkMode.hpp
@@ -13,7 +13,6 @@ extern void set_miniaturizable(void * window);
 void WKWebView_evaluateJavaScript(void * web, wxString const & script, void (*callback)(wxString const &));
 void set_title_colour_after_set_title();
 void initGestures(void * view,  wxEvtHandler * handler);
-
 #endif
 
 
diff --git a/src/slic3r/Utils/MacDarkMode.mm b/src/slic3r/Utils/MacDarkMode.mm
index 36889160f..e28067fc1 100644
--- a/src/slic3r/Utils/MacDarkMode.mm
+++ b/src/slic3r/Utils/MacDarkMode.mm
@@ -1,4 +1,6 @@
 #import "MacDarkMode.hpp"
+#include "../GUI/Widgets/Label.hpp"
+
 #include "wx/osx/core/cfstring.h"
 
 #import <algorithm>
@@ -74,7 +76,7 @@ void WKWebView_evaluateJavaScript(void * web, wxString const & script, void (*ca
         }
     }];
 }
-    
+
 }
 }
 
@@ -178,6 +180,17 @@ void WKWebView_evaluateJavaScript(void * web, wxString const & script, void (*ca
 
 @end
 
+/* Font for wxTextCtrl */
+
+@implementation NSTableHeaderCell (Font)
+
+- (NSFont*) font
+{
+    return Label::sysFont(13).OSXGetNSFont();
+}
+
+@end
+
 /* remove focused border for wxTextCtrl */
 
 @implementation NSTextField (FocusRing)