diff --git a/src/gui/options.ui b/src/gui/options.ui
index 1144033b0..b6ced09e6 100644
--- a/src/gui/options.ui
+++ b/src/gui/options.ui
@@ -23,29 +23,11 @@
       <bool>false</bool>
      </property>
      <widget class="QListWidget" name="tabSelection">
-      <property name="autoScroll">
-       <bool>false</bool>
+      <property name="horizontalScrollBarPolicy">
+       <enum>Qt::ScrollBarAlwaysOff</enum>
       </property>
-      <property name="iconSize">
-       <size>
-        <width>32</width>
-        <height>32</height>
-       </size>
-      </property>
-      <property name="isWrapping" stdset="0">
-       <bool>true</bool>
-      </property>
-      <property name="resizeMode">
-       <enum>QListView::Adjust</enum>
-      </property>
-      <property name="spacing">
-       <number>4</number>
-      </property>
-      <property name="gridSize">
-       <size>
-        <width>110</width>
-        <height>60</height>
-       </size>
+      <property name="flow">
+       <enum>QListView::TopToBottom</enum>
       </property>
       <property name="viewMode">
        <enum>QListView::IconMode</enum>
@@ -143,6 +125,9 @@
         <property name="topMargin">
          <number>0</number>
         </property>
+        <property name="rightMargin">
+         <number>0</number>
+        </property>
         <property name="bottomMargin">
          <number>0</number>
         </property>
@@ -162,7 +147,7 @@
             <rect>
              <x>0</x>
              <y>0</y>
-             <width>480</width>
+             <width>486</width>
              <height>702</height>
             </rect>
            </property>
@@ -545,6 +530,9 @@
         <property name="topMargin">
          <number>0</number>
         </property>
+        <property name="rightMargin">
+         <number>0</number>
+        </property>
         <property name="bottomMargin">
          <number>0</number>
         </property>
@@ -1058,6 +1046,9 @@
         <property name="topMargin">
          <number>0</number>
         </property>
+        <property name="rightMargin">
+         <number>0</number>
+        </property>
         <property name="bottomMargin">
          <number>0</number>
         </property>
@@ -1972,6 +1963,9 @@
         <property name="topMargin">
          <number>0</number>
         </property>
+        <property name="rightMargin">
+         <number>0</number>
+        </property>
         <property name="bottomMargin">
          <number>0</number>
         </property>
@@ -2358,14 +2352,17 @@
         </item>
        </layout>
       </widget>
-      <widget class="QWidget" name="tabOptionPage7">
-       <layout class="QVBoxLayout">
+      <widget class="QWidget" name="tabWebuiPage">
+       <layout class="QVBoxLayout" name="tabWebuiPageLayout">
         <property name="leftMargin">
          <number>0</number>
         </property>
         <property name="topMargin">
          <number>0</number>
         </property>
+        <property name="rightMargin">
+         <number>0</number>
+        </property>
         <property name="bottomMargin">
          <number>0</number>
         </property>
diff --git a/src/gui/options_imp.cpp b/src/gui/options_imp.cpp
index 07f95fc3f..17a2c1e99 100644
--- a/src/gui/options_imp.cpp
+++ b/src/gui/options_imp.cpp
@@ -67,6 +67,7 @@ options_imp::options_imp(QWidget *parent)
     setupUi(this);
     setAttribute(Qt::WA_DeleteOnClose);
     setModal(true);
+
     // Icons
     tabSelection->item(TAB_UI)->setIcon(GuiIconProvider::instance()->getIcon("preferences-desktop"));
     tabSelection->item(TAB_BITTORRENT)->setIcon(GuiIconProvider::instance()->getIcon("preferences-system-network"));
@@ -79,6 +80,10 @@ options_imp::options_imp(QWidget *parent)
     tabSelection->item(TAB_WEBUI)->setHidden(true);
 #endif
     tabSelection->item(TAB_ADVANCED)->setIcon(GuiIconProvider::instance()->getIcon("preferences-other"));
+    for (int i = 0; i < tabSelection->count(); ++i) {
+        tabSelection->item(i)->setSizeHint(QSize(96, 64));  // uniform size for all icons
+    }
+
     IpFilterRefreshBtn->setIcon(GuiIconProvider::instance()->getIcon("view-refresh"));
 
     hsplitter->setCollapsible(0, false);