diff --git a/src/Icons/slow.png b/src/Icons/slow.png
deleted file mode 100644
index 2098177e1..000000000
Binary files a/src/Icons/slow.png and /dev/null differ
diff --git a/src/Icons/slow48.png b/src/Icons/slow48.png
deleted file mode 100644
index 92f079bdb..000000000
Binary files a/src/Icons/slow48.png and /dev/null differ
diff --git a/src/Icons/slow_off.png b/src/Icons/slow_off.png
deleted file mode 100644
index 4ed909be3..000000000
Binary files a/src/Icons/slow_off.png and /dev/null differ
diff --git a/src/icons.qrc b/src/icons.qrc
index 7b5c31814..079afa547 100644
--- a/src/icons.qrc
+++ b/src/icons.qrc
@@ -1,18 +1,17 @@
 <!DOCTYPE RCC><RCC version="1.0">
 <qresource>
-  <file>Icons/slow48.png</file>
   <file>Icons/rss32.png</file>
   <file>Icons/sphere2.png</file>
   <file>Icons/downarrow.png</file>
   <file>Icons/url.png</file>
   <file>Icons/locale.png</file>
   <file>Icons/loading.png</file>
-  <file>Icons/slow.png</file>
+  <file>Icons/slow_off.gif</file>
   <file>Icons/magnet.png</file>
   <file>Icons/sphere.png</file>
-  <file>Icons/slow_off.png</file>
   <file>Icons/uparrow.png</file>
   <file>Icons/rss16.png</file>
+  <file>Icons/slow.gif</file>
   <file>Icons/skin/checkingUP.png</file>
   <file>Icons/skin/bg-handle-horizontal.gif</file>
   <file>Icons/skin/play.png</file>
diff --git a/src/statusbar.h b/src/statusbar.h
index c78949300..f90873696 100644
--- a/src/statusbar.h
+++ b/src/statusbar.h
@@ -190,10 +190,10 @@ public slots:
 
   void updateAltSpeedsBtn(bool alternative) {
     if(alternative) {
-      altSpeedsBtn->setIcon(QIcon(":/Icons/slow.png"));
+      altSpeedsBtn->setIcon(QIcon(":/Icons/slow.gif"));
       altSpeedsBtn->setToolTip(tr("Click to disable alternative speed limits"));
     } else {
-      altSpeedsBtn->setIcon(QIcon(":/Icons/slow_off.png"));
+      altSpeedsBtn->setIcon(QIcon(":/Icons/slow_off.gif"));
       altSpeedsBtn->setToolTip(tr("Click to enable alternative speed limits"));
     }
   }
diff --git a/src/ui/options.ui b/src/ui/options.ui
index 4a41a7423..f5e109fac 100644
--- a/src/ui/options.ui
+++ b/src/ui/options.ui
@@ -221,7 +221,7 @@
      </widget>
      <widget class="QStackedWidget" name="tabOption">
       <property name="currentIndex">
-       <number>0</number>
+       <number>3</number>
       </property>
       <widget class="QWidget" name="tabOptionPage1">
        <layout class="QVBoxLayout" name="verticalLayout_10">
@@ -241,8 +241,8 @@
             <rect>
              <x>0</x>
              <y>0</y>
-             <width>513</width>
-             <height>565</height>
+             <width>515</width>
+             <height>543</height>
             </rect>
            </property>
            <layout class="QVBoxLayout" name="verticalLayout_9">
@@ -555,8 +555,8 @@ QGroupBox {
             <rect>
              <x>0</x>
              <y>0</y>
-             <width>631</width>
-             <height>694</height>
+             <width>658</width>
+             <height>684</height>
             </rect>
            </property>
            <layout class="QVBoxLayout" name="verticalLayout_17">
@@ -729,6 +729,18 @@ QGroupBox {
                       <attribute name="verticalHeaderVisible">
                        <bool>false</bool>
                       </attribute>
+                      <attribute name="verticalHeaderVisible">
+                       <bool>false</bool>
+                      </attribute>
+                      <attribute name="horizontalHeaderShowSortIndicator" stdset="0">
+                       <bool>false</bool>
+                      </attribute>
+                      <attribute name="horizontalHeaderStretchLastSection">
+                       <bool>true</bool>
+                      </attribute>
+                      <attribute name="horizontalHeaderDefaultSectionSize">
+                       <number>80</number>
+                      </attribute>
                      </widget>
                     </item>
                     <item>
@@ -1099,8 +1111,8 @@ QGroupBox {
             <rect>
              <x>0</x>
              <y>0</y>
-             <width>447</width>
-             <height>294</height>
+             <width>524</width>
+             <height>398</height>
             </rect>
            </property>
            <layout class="QVBoxLayout" name="verticalLayout_28">
@@ -1344,8 +1356,8 @@ QGroupBox {
             <rect>
              <x>0</x>
              <y>0</y>
-             <width>364</width>
-             <height>333</height>
+             <width>524</width>
+             <height>406</height>
             </rect>
            </property>
            <layout class="QVBoxLayout" name="verticalLayout_33">
@@ -1576,10 +1588,10 @@ QGroupBox {
                     <string/>
                    </property>
                    <property name="pixmap">
-                    <pixmap resource="../icons.qrc">:/Icons/slow48.png</pixmap>
+                    <pixmap resource="../icons.qrc">:/Icons/slow.gif</pixmap>
                    </property>
                    <property name="scaledContents">
-                    <bool>true</bool>
+                    <bool>false</bool>
                    </property>
                   </widget>
                  </item>
@@ -1749,8 +1761,8 @@ QGroupBox {
             <rect>
              <x>0</x>
              <y>0</y>
-             <width>459</width>
-             <height>422</height>
+             <width>482</width>
+             <height>407</height>
             </rect>
            </property>
            <layout class="QVBoxLayout" name="verticalLayout_20">
@@ -2166,7 +2178,7 @@ QGroupBox {
             <rect>
              <x>0</x>
              <y>0</y>
-             <width>426</width>
+             <width>496</width>
              <height>308</height>
             </rect>
            </property>
@@ -2600,8 +2612,8 @@ QGroupBox {
             <rect>
              <x>0</x>
              <y>0</y>
-             <width>287</width>
-             <height>123</height>
+             <width>296</width>
+             <height>124</height>
             </rect>
            </property>
            <layout class="QVBoxLayout" name="verticalLayout_21">
@@ -2697,8 +2709,8 @@ QGroupBox {
             <rect>
              <x>0</x>
              <y>0</y>
-             <width>213</width>
-             <height>220</height>
+             <width>226</width>
+             <height>221</height>
             </rect>
            </property>
            <layout class="QVBoxLayout" name="verticalLayout_23">
@@ -2864,8 +2876,8 @@ QGroupBox {
             <rect>
              <x>0</x>
              <y>0</y>
-             <width>445</width>
-             <height>195</height>
+             <width>459</width>
+             <height>192</height>
             </rect>
            </property>
            <layout class="QVBoxLayout" name="verticalLayout_24">
@@ -3039,8 +3051,8 @@ QGroupBox {
             <rect>
              <x>0</x>
              <y>0</y>
-             <width>96</width>
-             <height>26</height>
+             <width>98</width>
+             <height>28</height>
             </rect>
            </property>
            <layout class="QVBoxLayout" name="verticalLayout_36"/>