diff --git a/qt/i2pd_qt/mainwindow.cpp b/qt/i2pd_qt/mainwindow.cpp
index a4afe6a3..840f5b5b 100644
--- a/qt/i2pd_qt/mainwindow.cpp
+++ b/qt/i2pd_qt/mainwindow.cpp
@@ -40,10 +40,10 @@ MainWindow::MainWindow(QWidget *parent) :
 {
     ui->setupUi(this);
     statusButtonsUI->setupUi(ui->statusButtonsPane);
-    ui->statusButtonsPane->setFixedSize(172,300);
-    ui->verticalLayout->setGeometry(QRect(0,0,172,ui->verticalLayout->geometry().height()));
-    ui->statusButtonsPane->adjustSize();
-    ui->centralWidget->adjustSize();
+    ui->statusButtonsPane->setFixedSize(171,300);
+    ui->verticalLayout->setGeometry(QRect(0,0,171,ui->verticalLayout->geometry().height()));
+    //ui->statusButtonsPane->adjustSize();
+    //ui->centralWidget->adjustSize();
     setWindowTitle(QApplication::translate("AppTitle","I2PD"));
 
     //TODO handle resizes and change the below into resize() call
diff --git a/qt/i2pd_qt/mainwindow.ui b/qt/i2pd_qt/mainwindow.ui
index afbef9a3..60aacbe2 100644
--- a/qt/i2pd_qt/mainwindow.ui
+++ b/qt/i2pd_qt/mainwindow.ui
@@ -83,7 +83,7 @@
        <item>
         <widget class="QWidget" name="statusButtonsPane" native="true">
          <property name="sizePolicy">
-          <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
@@ -146,7 +146,7 @@
          </property>
          <property name="sizeHint" stdset="0">
           <size>
-           <width>172</width>
+           <width>171</width>
            <height>0</height>
           </size>
          </property>
@@ -260,7 +260,7 @@
              </font>
             </property>
             <property name="text">
-             <string>Settings</string>
+             <string>General settings</string>
             </property>
            </widget>
           </item>
@@ -3061,7 +3061,7 @@ Comma separated list of base64 identities:</string>
              </font>
             </property>
             <property name="text">
-             <string>Tunnels</string>
+             <string>Tunnels settings</string>
             </property>
            </widget>
           </item>
diff --git a/qt/i2pd_qt/statusbuttons.ui b/qt/i2pd_qt/statusbuttons.ui
index 79461cd4..edf5a90c 100644
--- a/qt/i2pd_qt/statusbuttons.ui
+++ b/qt/i2pd_qt/statusbuttons.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>170</width>
+    <width>171</width>
     <height>295</height>
    </rect>
   </property>
@@ -18,7 +18,7 @@
   </property>
   <property name="minimumSize">
    <size>
-    <width>170</width>
+    <width>171</width>
     <height>295</height>
    </size>
   </property>
@@ -28,10 +28,10 @@
   <widget class="QWidget" name="verticalLayoutWidget">
    <property name="geometry">
     <rect>
-     <x>20</x>
+     <x>21</x>
      <y>0</y>
-     <width>151</width>
-     <height>301</height>
+     <width>171</width>
+     <height>300</height>
     </rect>
    </property>
    <layout class="QVBoxLayout" name="verticalLayout">
@@ -40,6 +40,12 @@
     </property>
     <item>
      <widget class="QPushButton" name="mainPagePushButton">
+      <property name="maximumSize">
+       <size>
+        <width>150</width>
+        <height>16777215</height>
+       </size>
+      </property>
       <property name="text">
        <string>Main page</string>
       </property>
@@ -47,6 +53,12 @@
     </item>
     <item>
      <widget class="QPushButton" name="routerCommandsPushButton">
+      <property name="maximumSize">
+       <size>
+        <width>150</width>
+        <height>16777215</height>
+       </size>
+      </property>
       <property name="text">
        <string>Router commands</string>
       </property>
@@ -54,6 +66,12 @@
     </item>
     <item>
      <widget class="QPushButton" name="localDestinationsPushButton">
+      <property name="maximumSize">
+       <size>
+        <width>150</width>
+        <height>16777215</height>
+       </size>
+      </property>
       <property name="text">
        <string>Local destinations</string>
       </property>
@@ -61,6 +79,12 @@
     </item>
     <item>
      <widget class="QPushButton" name="leasesetsPushButton">
+      <property name="maximumSize">
+       <size>
+        <width>150</width>
+        <height>16777215</height>
+       </size>
+      </property>
       <property name="text">
        <string>Leasesets</string>
       </property>
@@ -68,6 +92,12 @@
     </item>
     <item>
      <widget class="QPushButton" name="tunnelsPushButton">
+      <property name="maximumSize">
+       <size>
+        <width>150</width>
+        <height>16777215</height>
+       </size>
+      </property>
       <property name="text">
        <string>Tunnels</string>
       </property>
@@ -75,6 +105,12 @@
     </item>
     <item>
      <widget class="QPushButton" name="transitTunnelsPushButton">
+      <property name="maximumSize">
+       <size>
+        <width>150</width>
+        <height>16777215</height>
+       </size>
+      </property>
       <property name="text">
        <string>Transit tunnels</string>
       </property>
@@ -82,6 +118,12 @@
     </item>
     <item>
      <widget class="QPushButton" name="transportsPushButton">
+      <property name="maximumSize">
+       <size>
+        <width>150</width>
+        <height>16777215</height>
+       </size>
+      </property>
       <property name="text">
        <string>Transports</string>
       </property>
@@ -89,6 +131,12 @@
     </item>
     <item>
      <widget class="QPushButton" name="i2pTunnelsPushButton">
+      <property name="maximumSize">
+       <size>
+        <width>150</width>
+        <height>16777215</height>
+       </size>
+      </property>
       <property name="text">
        <string>I2P tunnels</string>
       </property>
@@ -96,6 +144,12 @@
     </item>
     <item>
      <widget class="QPushButton" name="samSessionsPushButton">
+      <property name="maximumSize">
+       <size>
+        <width>150</width>
+        <height>16777215</height>
+       </size>
+      </property>
       <property name="text">
        <string>SAM sessions</string>
       </property>