diff --git a/img/headers/acolyte.png b/img/headers/acolyte.png
index 04bb5fde..10aa2469 100644
Binary files a/img/headers/acolyte.png and b/img/headers/acolyte.png differ
diff --git a/img/headers/cover.png b/img/headers/cover.png
index 11989a15..b91fb0d9 100644
Binary files a/img/headers/cover.png and b/img/headers/cover.png differ
diff --git a/img/headers/olive.png b/img/headers/olive.png
new file mode 100644
index 00000000..e809e30f
Binary files /dev/null and b/img/headers/olive.png differ
diff --git a/img/headers/ruins.png b/img/headers/ruins.png
index aedf67b2..df495d83 100644
Binary files a/img/headers/ruins.png and b/img/headers/ruins.png differ
diff --git a/modsettings/CustomUIAssets.json b/modsettings/CustomUIAssets.json
index da875443..4b490189 100644
--- a/modsettings/CustomUIAssets.json
+++ b/modsettings/CustomUIAssets.json
@@ -75,14 +75,24 @@
     "URL": "http://cloud-3.steamusercontent.com/ugc/2027213118466516005/113C19D37CFFA9E554394FD5B11B32967F846A62/"
   },
   {
-    "Name": "header_core",
+    "Name": "header_cover",
     "Type": 0,
-    "URL": "http://cloud-3.steamusercontent.com/ugc/2024962321894443102/5727544F24E8C4546031F4DDE8BD4B45D93AC3FC/"
+    "URL": "http://cloud-3.steamusercontent.com/ugc/5118935530977312342/0D22712378B1F9A5A1FC7DA40C355943C878DDC0/"
   },
   {
     "Name": "header_acolyte",
     "Type": 0,
-    "URL": "http://cloud-3.steamusercontent.com/ugc/2024962321894443022/3262DF2ABAE8D9A2BF64ECB74C1BB34B33814554/"
+    "URL": "http://cloud-3.steamusercontent.com/ugc/5118935530977311773/B8B2021D42CFB084AFDCCA42EE6B9A57F3E30AC6/"
+  },
+  {
+    "Name": "header_ruins",
+    "Type": 0,
+    "URL": "http://cloud-3.steamusercontent.com/ugc/5118935530977312917/E24A34736C912186C7AC58270E3819B6A44B3EE8/"
+  },
+  {
+    "Name": "header_olive",
+    "Type": 0,
+    "URL": "http://cloud-3.steamusercontent.com/ugc/5118935530977377198/4E88B41107A29D027D86E6B80D47B03617335990/"
   },
   {
     "Name": "option_on",
diff --git a/xml/OptionPanel.xml b/xml/OptionPanel.xml
index 93bc46d2..677113a9 100644
--- a/xml/OptionPanel.xml
+++ b/xml/OptionPanel.xml
@@ -13,7 +13,7 @@
   <!-- main window -->
   <TableLayout class="window"
     width="500"
-    height="700"
+    height="800"
     active="false"
     color="#000000"
     outlineSize="2 2"
@@ -24,7 +24,7 @@
 
   <!-- group headers -->
   <Row class="group-header"
-    preferredHeight="60" />
+    preferredHeight="54" />
   <Cell class="group-header"
     columnSpan="2"
     color="#222222" />
@@ -89,12 +89,51 @@
       <VerticalScrollView horizontalScrollbarVisibility="AutohideAndExpandViewport">
         <TableLayout columnWidths="0 75"
           autoCalculateHeight="1"
-          cellPadding="10 0 8 8">
+          cellPadding="10 0 5 5">
+
+          <!-- Group: general settings -->
+          <Row class="group-header">
+            <Cell class="group-header">
+              <Panel class="group-header"
+                image="header_acolyte">
+                <Text class="group-header">GENERAL SETTINGS</Text>
+              </Panel>
+            </Cell>
+          </Row>
+
+          <!-- Option: play area snap tags -->
+          <Row class="option-text">
+            <Cell class="option-text">
+              <VerticalLayout class="text-column">
+                <Text class="option-header">Enable snap tags for play area</Text>
+                <Text class="description">Only cards with the tag "Location" will snap (official cards are supported by default). Disable this if you are having issues with custom content.</Text>
+              </VerticalLayout>
+            </Cell>
+            <Cell class="option-button">
+              <Toggle id="playAreaSnapTags"
+                onValueChanged="onClick_toggleOption(playAreaSnapTags)"/>
+            </Cell>
+          </Row>
+
+          <!-- Option: splash scenario name on setup -->
+          <Row class="option-text">
+            <Cell class="option-text">
+              <VerticalLayout class="text-column">
+                <Text class="option-header">Show scenario title on setup</Text>
+                <Text class="description">Fade in the name of the scenario for 2 seconds when placing down a scenario.</Text>
+              </VerticalLayout>
+            </Cell>
+            <Cell class="option-button">
+              <Toggle id="showTitleSplash"
+                onValueChanged="onClick_toggleOption(showTitleSplash)"/>
+            </Cell>
+          </Row>
+
           <!-- Group: playermat settings -->
           <Row class="group-header">
             <Cell class="group-header">
               <Panel class="group-header"
-                image="header_core">
+                image="header_cover">
                 <Text class="group-header">PLAYERMAT SETTINGS</Text>
               </Panel>
             </Cell>
@@ -142,20 +181,6 @@
             </Cell>
           </Row>
 
-          <!-- Option: play area snap tags -->
-          <Row class="option-text">
-            <Cell class="option-text">
-              <VerticalLayout class="text-column">
-                <Text class="option-header">Enable snap tags for play area</Text>
-                <Text class="description">Only cards with the tag "Location" will snap (official cards are supported by default). Disable this if you are having issues with custom content.</Text>
-              </VerticalLayout>
-            </Cell>
-            <Cell class="option-button">
-              <Toggle id="playAreaSnapTags"
-                onValueChanged="onClick_toggleOption(playAreaSnapTags)"/>
-            </Cell>
-          </Row>
-
           <!-- Option: use clickable resource counters -->
           <Row class="option-text">
             <Cell class="option-text">
@@ -170,25 +195,11 @@
             </Cell>
           </Row>
 
-          <!-- Option: splash scenario name on setup -->
-          <Row class="option-text">
-            <Cell class="option-text">
-              <VerticalLayout class="text-column">
-                <Text class="option-header">Show Scenario Title on Setup</Text>
-                <Text class="description">Fade in the name of the scenario for 2 seconds when placing down a scenario.</Text>
-              </VerticalLayout>
-            </Cell>
-            <Cell class="option-button">
-              <Toggle id="showTitleSplash"
-                onValueChanged="onClick_toggleOption(showTitleSplash)"/>
-            </Cell>
-          </Row>
-
           <!-- Group: fan-made accessories -->
           <Row class="group-header">
             <Cell class="group-header">
               <Panel class="group-header"
-                image="header_acolyte">
+                image="header_olive">
                 <Text class="group-header">FAN-MADE ACCESSORIES</Text>
               </Panel>
             </Cell>