diff --git a/Changelog b/Changelog
index c8797dba8..c3ff24255 100644
--- a/Changelog
+++ b/Changelog
@@ -13,6 +13,7 @@
     - FEATURE: Updated Web interface to MochaUI v0.9.5
     - BUGFIX: Fixed several memory leaks
     - BUGFIX: WebUI is now working with IE7
+    - BUGFIX: Fixed spacing problem in toolbar when toggling its visibility
 
 * Unknown - Christophe Dumez <chris@qbittorrent.org> - v1.2.1
     - BUGFIX: Fixed possible crash when deleting a torrent permanently
diff --git a/TODO b/TODO
index f3c689794..2fdba4ddc 100644
--- a/TODO
+++ b/TODO
@@ -1,7 +1,5 @@
 See https://blueprints.launchpad.net/qbittorrent/
 
-- Test new MochaUI on IE7
-
 // translations done
 - Romanian
 - Russian
diff --git a/src/GUI.cpp b/src/GUI.cpp
index 9763bb4ae..2e0bc5eab 100644
--- a/src/GUI.cpp
+++ b/src/GUI.cpp
@@ -904,10 +904,13 @@ void GUI::configureSession(bool deleteOptions) {
     setWindowTitle(tr("qBittorrent %1", "e.g: qBittorrent v0.x").arg(QString::fromUtf8(VERSION)));
   }
   displaySpeedInTitle = new_displaySpeedInTitle;
-  if(options->isToolbarDisplayed()) {
-    toolBar->setVisible(true);
-  } else {
-    toolBar->setVisible(false);
+  if(options->isToolbarDisplayed() != toolBar->isVisible()) {
+      if(options->isToolbarDisplayed()) {
+        toolBar->setVisible(true);
+        toolBar->layout()->setSpacing(7);
+      } else {
+        toolBar->setVisible(false);
+    }
   }
   unsigned int new_refreshInterval = options->getRefreshInterval();
   if(refreshInterval != new_refreshInterval) {
@@ -1502,38 +1505,33 @@ void GUI::on_actionOptions_triggered() {
 void GUI::OptionsSaved(bool deleteOptions) {
   BTSession->addConsoleMessage(tr("Options were saved successfully."));
   bool newSystrayIntegration = options->systrayIntegration();
-  if(newSystrayIntegration && !systrayIntegration) {
-    // create the trayicon
-    createTrayIcon();
+  if(newSystrayIntegration != systrayIntegration) {
+    if(newSystrayIntegration) {
+      // create the trayicon
+      createTrayIcon();
+    } else {
+      // Destroy trayicon
+      delete myTrayIcon;
+      delete myTrayIconMenu;
+    }
+    systrayIntegration = newSystrayIntegration;
   }
-  if(!newSystrayIntegration && systrayIntegration) {
-    // Destroy trayicon
-    delete myTrayIcon;
-    delete myTrayIconMenu;
-  }
-  systrayIntegration = newSystrayIntegration;
   // Update Web UI
-  if (options->isWebUiEnabled())
-  {
+  if (options->isWebUiEnabled()) {
     quint16 port = options->webUiPort();
     QString username = options->webUiUsername();
     QString password = options->webUiPassword();
     initWebUi(username, password, port);
-  }
-  else if(httpServer)
-  {
+  } else if(httpServer) {
     delete httpServer;
   }
   // Update session
   configureSession(deleteOptions);
 }
 
-bool GUI::initWebUi(QString username, QString password, int port)
-{
+bool GUI::initWebUi(QString username, QString password, int port) {
   if(httpServer)
-  {
     httpServer->close();
-  }
   else
     httpServer = new HttpServer(BTSession, 3000, this);
   httpServer->setAuthorization(username, password);
diff --git a/src/src.pro b/src/src.pro
index 525d1ec81..dfc9b9836 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -14,7 +14,7 @@ CONFIG += qt \
     network
 
 # Update this VERSION for each release
-DEFINES += VERSION=\\\"v1.3.0beta1\\\"
+DEFINES += VERSION=\\\"v1.3.0rc1\\\"
 DEFINES += VERSION_MAJOR=1
 DEFINES += VERSION_MINOR=3
 DEFINES += VERSION_BUGFIX=0