diff --git a/src/blackgui/components/settingscomponent.ui b/src/blackgui/components/settingscomponent.ui
index 9151ff013..bd296cad5 100644
--- a/src/blackgui/components/settingscomponent.ui
+++ b/src/blackgui/components/settingscomponent.ui
@@ -2,14 +2,6 @@
 <ui version="4.0">
  <class>CSettingsComponent</class>
  <widget class="QTabWidget" name="CSettingsComponent">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>211</width>
-    <height>378</height>
-   </rect>
-  </property>
   <property name="windowTitle">
    <string>Settings</string>
   </property>
@@ -338,12 +330,6 @@
    </layout>
   </widget>
   <widget class="QWidget" name="tb_SettingsHotkeys">
-   <property name="sizePolicy">
-    <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-     <horstretch>0</horstretch>
-     <verstretch>0</verstretch>
-    </sizepolicy>
-   </property>
    <attribute name="title">
     <string>Hotkeys</string>
    </attribute>
@@ -363,13 +349,13 @@
     <property name="bottomMargin">
      <number>1</number>
     </property>
-    <item>
+    <item alignment="Qt::AlignTop">
      <widget class="BlackGui::Components::CSettingsHotkeyComponent" name="comp_SettingsHotkeysComponent">
-      <property name="sizePolicy">
-       <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-        <horstretch>0</horstretch>
-        <verstretch>0</verstretch>
-       </sizepolicy>
+      <property name="minimumSize">
+       <size>
+        <width>0</width>
+        <height>150</height>
+       </size>
       </property>
      </widget>
     </item>
diff --git a/src/blackgui/components/settingshotkeycomponent.cpp b/src/blackgui/components/settingshotkeycomponent.cpp
index 1b3d64b76..5c3fff720 100644
--- a/src/blackgui/components/settingshotkeycomponent.cpp
+++ b/src/blackgui/components/settingshotkeycomponent.cpp
@@ -50,8 +50,9 @@ namespace BlackGui
             connect(ui->pb_AddHotkey, &QPushButton::clicked, this, &CSettingsHotkeyComponent::addEntry);
             connect(ui->pb_EditHotkey, &QPushButton::clicked, this, &CSettingsHotkeyComponent::editEntry);
             connect(ui->pb_RemoveHotkey, &QPushButton::clicked, this, &CSettingsHotkeyComponent::removeEntry);
+            connect(ui->tb_ReloadHotkey, &QPushButton::clicked, this, &CSettingsHotkeyComponent::reloadHotkeysFromSettings);
 
-            reloadHotkeysFromSettings();
+            this->reloadHotkeysFromSettings();
             ui->tv_Hotkeys->selectRow(0);
         }
 
diff --git a/src/blackgui/components/settingshotkeycomponent.ui b/src/blackgui/components/settingshotkeycomponent.ui
index 5f311b7bd..d919afb76 100644
--- a/src/blackgui/components/settingshotkeycomponent.ui
+++ b/src/blackgui/components/settingshotkeycomponent.ui
@@ -2,18 +2,10 @@
 <ui version="4.0">
  <class>CSettingsHotkeyComponent</class>
  <widget class="QFrame" name="CSettingsHotkeyComponent">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>400</width>
-    <height>193</height>
-   </rect>
-  </property>
   <property name="windowTitle">
    <string>Hotkeys</string>
   </property>
-  <layout class="QGridLayout" name="gl_HotKeyComponent">
+  <layout class="QVBoxLayout" name="vl_SettingsHotkeys">
    <property name="leftMargin">
     <number>1</number>
    </property>
@@ -23,41 +15,7 @@
    <property name="rightMargin">
     <number>1</number>
    </property>
-   <item row="1" column="1">
-    <widget class="QPushButton" name="pb_AddHotkey">
-     <property name="text">
-      <string>Add</string>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="2">
-    <widget class="QPushButton" name="pb_EditHotkey">
-     <property name="text">
-      <string>Edit</string>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="3">
-    <widget class="QPushButton" name="pb_RemoveHotkey">
-     <property name="text">
-      <string>Remove</string>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="0">
-    <spacer name="hs_HotkeyComponent">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>40</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="0" column="0" colspan="5">
+   <item>
     <widget class="QTableView" name="tv_Hotkeys">
      <property name="sizeAdjustPolicy">
       <enum>QAbstractScrollArea::AdjustToContents</enum>
@@ -76,25 +34,83 @@
      </attribute>
     </widget>
    </item>
-   <item row="3" column="1">
-    <spacer name="vs_HotkeyComponent">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeType">
-      <enum>QSizePolicy::MinimumExpanding</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>40</height>
-      </size>
-     </property>
-    </spacer>
+   <item>
+    <widget class="QWidget" name="wi_Buttons" native="true">
+     <layout class="QHBoxLayout" name="hl_Buttons">
+      <property name="leftMargin">
+       <number>3</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>3</number>
+      </property>
+      <property name="bottomMargin">
+       <number>0</number>
+      </property>
+      <item>
+       <widget class="QToolButton" name="tb_ReloadHotkey">
+        <property name="toolTip">
+         <string>reload hotkey settings</string>
+        </property>
+        <property name="statusTip">
+         <string>reload settings</string>
+        </property>
+        <property name="text">
+         <string>reload</string>
+        </property>
+        <property name="icon">
+         <iconset resource="../../blackmisc/blackmisc.qrc">
+          <normaloff>:/pastel/icons/pastel/16/arrow-refresh.png</normaloff>:/pastel/icons/pastel/16/arrow-refresh.png</iconset>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <spacer name="hs_Buttons">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>40</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item alignment="Qt::AlignRight">
+       <widget class="QPushButton" name="pb_EditHotkey">
+        <property name="text">
+         <string>edit</string>
+        </property>
+       </widget>
+      </item>
+      <item alignment="Qt::AlignRight">
+       <widget class="QPushButton" name="pb_AddHotkey">
+        <property name="text">
+         <string>add</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QPushButton" name="pb_RemoveHotkey">
+        <property name="text">
+         <string>remove</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
    </item>
   </layout>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
- <resources/>
+ <tabstops>
+  <tabstop>tv_Hotkeys</tabstop>
+ </tabstops>
+ <resources>
+  <include location="../../blackmisc/blackmisc.qrc"/>
+ </resources>
  <connections/>
 </ui>
diff --git a/src/blackgui/components/settingssimulatorbasicscomponent.ui b/src/blackgui/components/settingssimulatorbasicscomponent.ui
index 0bb6e48b1..31d46935e 100644
--- a/src/blackgui/components/settingssimulatorbasicscomponent.ui
+++ b/src/blackgui/components/settingssimulatorbasicscomponent.ui
@@ -2,91 +2,32 @@
 <ui version="4.0">
  <class>CSettingsSimulatorBasicsComponent</class>
  <widget class="QFrame" name="CSettingsSimulatorBasicsComponent">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>511</width>
-    <height>469</height>
-   </rect>
-  </property>
   <property name="windowTitle">
    <string>Simulator basic settings</string>
   </property>
-  <property name="frameShape">
-   <enum>QFrame::StyledPanel</enum>
-  </property>
-  <property name="frameShadow">
-   <enum>QFrame::Raised</enum>
-  </property>
-  <layout class="QGridLayout" name="gridLayout">
-   <item row="1" column="4" alignment="Qt::AlignTop">
-    <widget class="QPushButton" name="pb_ModelFileDialog">
-     <property name="text">
-      <string>...</string>
-     </property>
-    </widget>
-   </item>
-   <item row="7" column="4">
-    <widget class="QPushButton" name="pb_CopyDefaults">
-     <property name="toolTip">
-      <string>copy (materialize) defaults</string>
-     </property>
-     <property name="text">
-      <string>copy def.</string>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="4">
-    <widget class="QPushButton" name="pb_SimulatorFileDialog">
-     <property name="text">
-      <string>...</string>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="0">
-    <widget class="QLabel" name="lbl_SimulatorDirectory">
-     <property name="text">
-      <string>Simulator directory:</string>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="0" alignment="Qt::AlignTop">
-    <widget class="QLabel" name="lbl_ModelDirectory">
-     <property name="text">
-      <string>Model directories:</string>
-     </property>
-    </widget>
-   </item>
-   <item row="6" column="4">
-    <widget class="QPushButton" name="pb_Reset">
-     <property name="text">
-      <string>reset</string>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="2">
+  <layout class="QGridLayout" name="gl_SimulatorBasics">
+   <item row="1" column="2">
     <widget class="QLineEdit" name="le_SimulatorDirectory">
      <property name="placeholderText">
       <string>Simulator directory path</string>
      </property>
     </widget>
    </item>
-   <item row="5" column="4" alignment="Qt::AlignTop">
-    <widget class="QPushButton" name="pb_ExcludeFileDialog">
+   <item row="1" column="0">
+    <widget class="QLabel" name="lbl_SimulatorDirectory">
      <property name="text">
-      <string>...</string>
+      <string>Simulator directory:</string>
      </property>
     </widget>
    </item>
-   <item row="8" column="4">
-    <widget class="QPushButton" name="pb_Save">
+   <item row="2" column="0" alignment="Qt::AlignTop">
+    <widget class="QLabel" name="lbl_ModelDirectory">
      <property name="text">
-      <string>save</string>
+      <string>Model directories:</string>
      </property>
     </widget>
    </item>
-   <item row="5" column="2" rowspan="4">
+   <item row="6" column="2" rowspan="4">
     <widget class="QPlainTextEdit" name="pte_ExcludeDirectories">
      <property name="documentTitle">
       <string>Excluded directory patterns</string>
@@ -99,7 +40,14 @@
      </property>
     </widget>
    </item>
-   <item row="5" column="0" rowspan="4" alignment="Qt::AlignTop">
+   <item row="2" column="2" rowspan="3">
+    <widget class="QPlainTextEdit" name="pte_ModelDirectories">
+     <property name="placeholderText">
+      <string>Model directories</string>
+     </property>
+    </widget>
+   </item>
+   <item row="6" column="0" rowspan="4" alignment="Qt::AlignTop">
     <widget class="QLabel" name="lbl_ExcludeDirectories">
      <property name="toolTip">
       <string>Excluded from model loading</string>
@@ -109,27 +57,38 @@
      </property>
     </widget>
    </item>
-   <item row="1" column="2" rowspan="3">
-    <widget class="QPlainTextEdit" name="pte_ModelDirectories">
-     <property name="placeholderText">
-      <string>Model directories</string>
+   <item row="0" column="0">
+    <widget class="QLabel" name="lbl_Simulator">
+     <property name="text">
+      <string>Simulator:</string>
      </property>
     </widget>
    </item>
-   <item row="9" column="0" colspan="4" alignment="Qt::AlignRight">
+   <item row="0" column="1" colspan="2">
     <widget class="BlackGui::Components::CSimulatorSelector" name="comp_SimulatorSelector">
      <property name="minimumSize">
       <size>
-       <width>175</width>
+       <width>0</width>
        <height>25</height>
       </size>
      </property>
-     <property name="lineWidth">
-      <number>0</number>
+    </widget>
+   </item>
+   <item row="1" column="3">
+    <widget class="QPushButton" name="pb_SimulatorFileDialog">
+     <property name="text">
+      <string>...</string>
      </property>
     </widget>
    </item>
-   <item row="3" column="4">
+   <item row="2" column="3">
+    <widget class="QPushButton" name="pb_ModelFileDialog">
+     <property name="text">
+      <string>...</string>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="3">
     <widget class="QPushButton" name="pb_AdjustModelDirectory">
      <property name="toolTip">
       <string>remove redundant directories, fix file paths ...</string>
@@ -139,6 +98,37 @@
      </property>
     </widget>
    </item>
+   <item row="6" column="3">
+    <widget class="QPushButton" name="pb_ExcludeFileDialog">
+     <property name="text">
+      <string>...</string>
+     </property>
+    </widget>
+   </item>
+   <item row="7" column="3">
+    <widget class="QPushButton" name="pb_Reset">
+     <property name="text">
+      <string>reset</string>
+     </property>
+    </widget>
+   </item>
+   <item row="8" column="3">
+    <widget class="QPushButton" name="pb_CopyDefaults">
+     <property name="toolTip">
+      <string>copy (materialize) defaults</string>
+     </property>
+     <property name="text">
+      <string>copy def.</string>
+     </property>
+    </widget>
+   </item>
+   <item row="9" column="3">
+    <widget class="QPushButton" name="pb_Save">
+     <property name="text">
+      <string>save</string>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
  <customwidgets>
@@ -151,15 +141,8 @@
  </customwidgets>
  <tabstops>
   <tabstop>le_SimulatorDirectory</tabstop>
-  <tabstop>pb_SimulatorFileDialog</tabstop>
   <tabstop>pte_ModelDirectories</tabstop>
-  <tabstop>pb_ModelFileDialog</tabstop>
-  <tabstop>pb_AdjustModelDirectory</tabstop>
   <tabstop>pte_ExcludeDirectories</tabstop>
-  <tabstop>pb_ExcludeFileDialog</tabstop>
-  <tabstop>pb_Reset</tabstop>
-  <tabstop>pb_CopyDefaults</tabstop>
-  <tabstop>pb_Save</tabstop>
  </tabstops>
  <resources/>
  <connections/>