diff --git a/src/calamares/DebugWindow.ui b/src/calamares/DebugWindow.ui
index ad9234c0f..1b163d49d 100644
--- a/src/calamares/DebugWindow.ui
+++ b/src/calamares/DebugWindow.ui
@@ -21,7 +21,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
    <item>
     <widget class="QTabWidget" name="tabWidget">
      <property name="currentIndex">
-      <number>3</number>
+      <number>0</number>
      </property>
      <widget class="QWidget" name="globalStorageTab">
       <attribute name="title">
@@ -92,56 +92,64 @@ SPDX-License-Identifier: GPL-3.0-or-later
        </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="toolsTab">
-      <attribute name="title">
-       <string>Tools</string>
-      </attribute>
-      <layout class="QVBoxLayout" name="verticalLayout_4">
-       <item>
-        <widget class="QPushButton" name="crashButton">
-         <property name="text">
-          <string notr="true">Crash now</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QPushButton" name="reloadStylesheetButton">
-         <property name="text">
-          <string>Reload Stylesheet</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QPushButton" name="widgetTreeButton">
-         <property name="text">
-          <string>Widget Tree</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QPushButton" name="sendLogButton">
-         <property name="text">
-          <string>Send Session Log</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <spacer name="verticalSpacer">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>20</width>
-           <height>40</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-      </layout>
-     </widget>
     </widget>
    </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_2">
+     <item>
+      <widget class="QPushButton" name="crashButton">
+       <property name="toolTip">
+        <string>Crashes Calamares, so that Dr. Konqui can look at it.</string>
+       </property>
+       <property name="text">
+        <string notr="true">Crash now</string>
+       </property>
+       <property name="icon">
+        <iconset theme="data-error"/>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="reloadStylesheetButton">
+       <property name="toolTip">
+        <string>Reloads the stylesheet from the branding directory.</string>
+       </property>
+       <property name="text">
+        <string>Reload Stylesheet</string>
+       </property>
+       <property name="icon">
+        <iconset theme="preferences-web-browser-stylesheets"/>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="widgetTreeButton">
+       <property name="toolTip">
+        <string>Displays the tree of widget names in the log (for stylesheet debugging).</string>
+       </property>
+       <property name="text">
+        <string>Widget Tree</string>
+       </property>
+       <property name="icon">
+        <iconset theme="view-list-tree"/>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="sendLogButton">
+       <property name="toolTip">
+        <string>Uploads the session log to the configured pastebin.</string>
+       </property>
+       <property name="text">
+        <string>Send Session Log</string>
+       </property>
+       <property name="icon">
+        <iconset theme="upload-media"/>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
   </layout>
  </widget>
  <resources/>