diff --git a/docs/graphics/options_misc.png b/docs/graphics/options_misc.png
index 658779134..f8ecbffb9 100644
Binary files a/docs/graphics/options_misc.png and b/docs/graphics/options_misc.png differ
diff --git a/docs/graphics/options_misc_classic.png b/docs/graphics/options_misc_classic.png
index 7a10ccbba..e7ef2bdb1 100644
Binary files a/docs/graphics/options_misc_classic.png and b/docs/graphics/options_misc_classic.png differ
diff --git a/docs/graphics/options_misc_light.png b/docs/graphics/options_misc_light.png
index 446f20898..2cdde2fe7 100644
Binary files a/docs/graphics/options_misc_light.png and b/docs/graphics/options_misc_light.png differ
diff --git a/docs/graphics/options_ui.png b/docs/graphics/options_ui.png
index 6efd912d5..c5f694623 100644
Binary files a/docs/graphics/options_ui.png and b/docs/graphics/options_ui.png differ
diff --git a/docs/index.html b/docs/index.html
index a01b40c5b..90e9df308 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -2689,16 +2689,7 @@
     </tr>
   </table>
   <br>
-  <p><b>UI Settings</b> dialog (2 tabs):</p>
-  <table border="5" cellpadding="2" frame="box" rules="none">
-    <tr>
-      <td><img src="graphics/options_ui.png"></td>
-      <td>&nbsp;&nbsp;&nbsp;&nbsp;</td>
-      <td valign="top"><br>This tab is described in further detail in
-        <b>Advanced Configuration - <a href="#ROMInfo">ROM Launcher</a></b>.</td>
-    </tr>
-  </table>
-  <br>
+  <p><b>User Interface Settings</b> dialog (2 tabs):</p>
   <table border="5" cellpadding="2" frame="box" rules="none">
     <tr>
       <td><img src="graphics/options_misc.png"><br><br></td>
@@ -2706,8 +2697,8 @@
       <td valign="top">
         <table border="1" cellpadding="4">
           <tr><th>Item</th><th>Brief description</th><th>For more information,<br>see <a href="#CommandLine">CommandLine</a></th></tr>
-          <tr><td>Interface Palette</td><td>Palette to use for UI elements (see examples)</td><td>-uipalette</td></tr>
-          <tr><td>List quick delay</td><td>Time to wait between keypresses in list-widgets</td><td>-listdelay</td></tr>
+          <tr><td>Theme</td><td>Theme to use for UI elements (see examples)</td><td>-uipalette</td></tr>
+          <tr><td>List input delay</td><td>Maximum delay between keypresses in list-widgets before a search string resets. </td><td>-listdelay</td></tr>
           <tr><td>Mouse wheel scroll</td><td>Number of lines a mouse scroll will move in list-widgets</td><td>-mscroll</td></tr>
         </table>
       </td>
@@ -2719,6 +2710,15 @@
     </tr>
   </table>
   <br>
+  <table border="5" cellpadding="2" frame="box" rules="none">
+    <tr>
+      <td><img src="graphics/options_ui.png"></td>
+      <td>&nbsp;&nbsp;&nbsp;&nbsp;</td>
+      <td valign="top"><br>This tab is described in further detail in
+        <b>Advanced Configuration - <a href="#ROMInfo">ROM Launcher</a></b>.</td>
+    </tr>
+  </table>
+  <br>
   <a name="Snapshots"></a>
   <p><b>Snapshot Settings</b> dialog:</p>
   <table border="5" cellpadding="2" frame="box" rules="none">
diff --git a/src/gui/UIDialog.cxx b/src/gui/UIDialog.cxx
index 4c3551f9d..c78cdfc52 100644
--- a/src/gui/UIDialog.cxx
+++ b/src/gui/UIDialog.cxx
@@ -255,7 +255,12 @@ void UIDialog::setDefaults()
 {
   switch(myTab->getActiveTab())
   {
-    case 0:  // Launcher options
+    case 0:  // Misc. options
+      myPalettePopup->setSelected("standard");
+      myListDelayPopup->setValue(300);
+      myWheelLinesPopup->setValue(4);
+      break;
+    case 1:  // Launcher options
     {
       uInt32 w = std::min(instance().frameBuffer().desktopSize().w, 900u);
       uInt32 h = std::min(instance().frameBuffer().desktopSize().h, 600u);
@@ -266,13 +271,6 @@ void UIDialog::setDefaults()
       myLauncherExitWidget->setState(false);
       break;
     }
-
-    case 1:  // Misc. options
-      myPalettePopup->setSelected("standard");
-      myListDelayPopup->setValue(300);
-      myWheelLinesPopup->setValue(4);
-      break;
-
     default:
       break;
   }