diff --git a/src/GUI.cpp b/src/GUI.cpp
index 5132d0c39..87fea7fe7 100644
--- a/src/GUI.cpp
+++ b/src/GUI.cpp
@@ -113,7 +113,8 @@ GUI::GUI(QWidget *parent, QStringList torrentCmdLine) : QMainWindow(parent), dis
   connecStatusLblIcon->setFrameShape(QFrame::NoFrame);
   connecStatusLblIcon->setPixmap(QPixmap(QString::fromUtf8(":/Icons/skin/disconnected.png")));
   connecStatusLblIcon->setToolTip(QString::fromUtf8("<b>")+tr("Connection status:")+QString::fromUtf8("</b><br>")+tr("Offline")+QString::fromUtf8("<br><i>")+tr("No peers found...")+QString::fromUtf8("</i>"));
-  toolBar->addWidget(connecStatusLblIcon);
+  toolBar->insertWidget(actionDecreasePriority, connecStatusLblIcon);
+  toolBar->insertSeparator(actionDecreasePriority);
   actionDelete_Permanently->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/delete_perm.png")));
   actionTorrent_Properties->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/properties.png")));
   actionCreate_torrent->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/new.png")));
@@ -1117,6 +1118,9 @@ void GUI::configureSession(bool deleteOptions) {
     if(!BTSession->isQueueingEnabled()) {
       downloadingTorrentTab->hidePriorityColumn(false);
       finishedTorrentTab->hidePriorityColumn(false);
+      actionDecreasePriority->setVisible(true);
+      actionIncreasePriority->setVisible(true);
+      toolBar->layout()->setSpacing(7);
     }
     int max_torrents = options->getMaxActiveTorrents();
     int max_downloads = options->getMaxActiveDownloads();
@@ -1130,6 +1134,9 @@ void GUI::configureSession(bool deleteOptions) {
       BTSession->setQueueingEnabled(false);
       downloadingTorrentTab->hidePriorityColumn(true);
       finishedTorrentTab->hidePriorityColumn(true);
+      actionDecreasePriority->setVisible(false);
+      actionIncreasePriority->setVisible(false);
+      toolBar->layout()->setSpacing(7);
     }
   }
   // Clean up
diff --git a/src/MainWindow.ui b/src/MainWindow.ui
index 0a8cd882e..27975aae2 100644
--- a/src/MainWindow.ui
+++ b/src/MainWindow.ui
@@ -90,6 +90,9 @@
      <height>32</height>
     </size>
    </property>
+   <property name="floatable" >
+    <bool>false</bool>
+   </property>
    <attribute name="toolBarArea" >
     <enum>TopToolBarArea</enum>
    </attribute>
@@ -110,12 +113,11 @@
    <addaction name="actionStart_All" />
    <addaction name="actionPause_All" />
    <addaction name="separator" />
-   <addaction name="actionDecreasePriority" />
-   <addaction name="actionIncreasePriority" />
-   <addaction name="separator" />
    <addaction name="actionOptions" />
    <addaction name="actionExit" />
    <addaction name="separator" />
+   <addaction name="actionDecreasePriority" />
+   <addaction name="actionIncreasePriority" />
   </widget>
   <widget class="QStatusBar" name="statusBar" />
   <action name="actionOpen" >
@@ -235,6 +237,9 @@
    <property name="text" >
     <string>Decrease priority</string>
    </property>
+   <property name="visible" >
+    <bool>false</bool>
+   </property>
   </action>
   <action name="actionIncreasePriority" >
    <property name="icon" >
@@ -243,6 +248,9 @@
    <property name="text" >
     <string>Increase priority</string>
    </property>
+   <property name="visible" >
+    <bool>false</bool>
+   </property>
   </action>
  </widget>
  <resources>