diff --git a/src/lib/gui/MainWindow.cpp b/src/lib/gui/MainWindow.cpp
index 50095cfb3..0bcddc28b 100644
--- a/src/lib/gui/MainWindow.cpp
+++ b/src/lib/gui/MainWindow.cpp
@@ -239,10 +239,11 @@ void MainWindow::setupControls()
   ui->lineEditName->setVisible(false);
 
 #if defined(Q_OS_MAC)
-
   ui->rbModeServer->setAttribute(Qt::WA_MacShowFocusRect, 0);
   ui->rbModeClient->setAttribute(Qt::WA_MacShowFocusRect, 0);
-
+  ui->btnSaveServerConfig->setFixedWidth(ui->btnSaveServerConfig->height());
+#else
+  ui->btnSaveServerConfig->setIconSize(QSize(22, 22));
 #endif
 
   const auto trayItemSize = QSize(24, 24);
diff --git a/src/lib/gui/MainWindow.ui b/src/lib/gui/MainWindow.ui
index 25bfdfca3..ad52c35fe 100644
--- a/src/lib/gui/MainWindow.ui
+++ b/src/lib/gui/MainWindow.ui
@@ -234,22 +234,13 @@
               </widget>
              </item>
              <item>
-              <widget class="QToolButton" name="btnSaveServerConfig">
+              <widget class="QPushButton" name="btnSaveServerConfig">
                <property name="toolTip">
                 <string>Export server configuration</string>
                </property>
-               <property name="text">
-                <string>...</string>
-               </property>
                <property name="icon">
                 <iconset theme="QIcon::ThemeIcon::DocumentSaveAs"/>
                </property>
-               <property name="iconSize">
-                <size>
-                 <width>22</width>
-                 <height>22</height>
-                </size>
-               </property>
               </widget>
              </item>
              <item>