diff --git a/src/app/mainwindow.cpp b/src/app/mainwindow.cpp
index f76099bd1..f6fc6b4c8 100644
--- a/src/app/mainwindow.cpp
+++ b/src/app/mainwindow.cpp
@@ -942,7 +942,6 @@ void MainWindow::ToolBarDraws()
     ui->actionHistory->setEnabled(false);
     connect(ui->actionHistory, &QAction::triggered, this, &MainWindow::ActionHistory);
 
-    ui->toolBarDraws->addAction(ui->actionLayout);
     connect(ui->actionLayout, &QAction::triggered, this, &MainWindow::ActionLayout);
     ui->actionLayout->setEnabled(false);
 }
diff --git a/src/app/mainwindow.ui b/src/app/mainwindow.ui
index 688b6463f..176d9e371 100644
--- a/src/app/mainwindow.ui
+++ b/src/app/mainwindow.ui
@@ -832,7 +832,7 @@
    <addaction name="actionSave"/>
   </widget>
   <widget class="QStatusBar" name="statusBar"/>
-  <widget class="QToolBar" name="toolBar">
+  <widget class="QToolBar" name="toolBarStages">
    <property name="enabled">
     <bool>true</bool>
    </property>
@@ -847,7 +847,7 @@
    </attribute>
    <addaction name="actionDraw"/>
    <addaction name="actionDetails"/>
-   <addaction name="actionArrowTool"/>
+   <addaction name="actionLayout"/>
   </widget>
   <widget class="QToolBar" name="toolBarDraws">
    <property name="windowTitle">
@@ -906,6 +906,18 @@
    </attribute>
    <widget class="QWidget" name="dockWidgetContents_10"/>
   </widget>
+  <widget class="QToolBar" name="toolBarArrows">
+   <property name="windowTitle">
+    <string>toolBar</string>
+   </property>
+   <attribute name="toolBarArea">
+    <enum>TopToolBarArea</enum>
+   </attribute>
+   <attribute name="toolBarBreak">
+    <bool>false</bool>
+   </attribute>
+   <addaction name="actionArrowTool"/>
+  </widget>
   <action name="actionNew">
    <property name="icon">
     <iconset theme="document-new">
@@ -1106,6 +1118,9 @@
    </property>
   </action>
   <action name="actionLayout">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
    <property name="icon">
     <iconset resource="share/resources/icon.qrc">
      <normaloff>:/icon/32x32/layout.png</normaloff>:/icon/32x32/layout.png</iconset>
@@ -1264,7 +1279,9 @@
   </action>
   <action name="actionOnlineHelp">
    <property name="icon">
-    <iconset theme="help-contents"/>
+    <iconset theme="help-contents">
+     <normaloff/>
+    </iconset>
    </property>
    <property name="text">
     <string>Online help</string>