Index: binaries/data/mods/public/gui/session/minimap/MiniMap.xml
===================================================================
--- binaries/data/mods/public/gui/session/minimap/MiniMap.xml
+++ binaries/data/mods/public/gui/session/minimap/MiniMap.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <object
 	name="minimapPanel"
-	size="0 100%-212 212 100%"
+	size="0 0 100% 100%"
 	type="image"
 	sprite="mapPanel"
 >
@@ -20,7 +20,7 @@
 	<object
 		name="idleWorkerButton"
 		type="button"
-		size="100%-120 100%-120 100%-5 100%-5"
+		size="100%-119 100%-119 100%-5 100%-5"
 		tooltip_style="sessionToolTip"
 		hotkey="selection.idleworker"
 		sprite="stretched:session/minimap-idle.png"
@@ -32,7 +32,7 @@
 	<object
 		name="diplomacyColorsButton"
 		type="button"
-		size="4 100%-120 119 100%-5"
+		size="5 100%-119 119 100%-5"
 		tooltip_style="sessionToolTip"
 		hotkey="session.diplomacycolors"
 	/>
Index: binaries/data/mods/public/gui/session/selection_panels.js
===================================================================
--- binaries/data/mods/public/gui/session/selection_panels.js
+++ binaries/data/mods/public/gui/session/selection_panels.js
@@ -209,8 +209,9 @@
 g_SelectionPanels.Construction = {
 	"getMaxNumberOfItems": function()
 	{
-		return 24 - getNumberOfRightPanelButtons();
+		return 40 - getNumberOfRightPanelButtons();
 	},
+	"rowLength": 10,
 	"getItems": function()
 	{
 		return getAllBuildableEntitiesFromSelection();
@@ -398,8 +399,9 @@
 g_SelectionPanels.Gate = {
 	"getMaxNumberOfItems": function()
 	{
-		return 24 - getNumberOfRightPanelButtons();
+		return 40 - getNumberOfRightPanelButtons();
 	},
+	"rowLength": 10,
 	"getItems": function(unitEntStates)
 	{
 		let hideLocked = unitEntStates.every(state => !state.gate || !state.gate.locked);
@@ -439,8 +441,9 @@
 g_SelectionPanels.Pack = {
 	"getMaxNumberOfItems": function()
 	{
-		return 24 - getNumberOfRightPanelButtons();
+		return 40 - getNumberOfRightPanelButtons();
 	},
+	"rowLength": 10,
 	"getItems": function(unitEntStates)
 	{
 		let checks = {};
@@ -613,8 +616,9 @@
 g_SelectionPanels.Research = {
 	"getMaxNumberOfItems": function()
 	{
-		return 8;
+		return 10;
 	},
+	"rowLength": 10,
 	"getItems": function(unitEntStates)
 	{
 		let ret = [];
@@ -922,8 +926,9 @@
 g_SelectionPanels.Training = {
 	"getMaxNumberOfItems": function()
 	{
-		return 24 - getNumberOfRightPanelButtons();
+		return 40 - getNumberOfRightPanelButtons();
 	},
+	"rowLength": 10,
 	"getItems": function()
 	{
 		return getAllTrainableEntitiesFromSelection();
@@ -1020,8 +1025,9 @@
 g_SelectionPanels.Upgrade = {
 	"getMaxNumberOfItems": function()
 	{
-		return 24 - getNumberOfRightPanelButtons();
+		return 40 - getNumberOfRightPanelButtons();
 	},
+	"rowLength": 10,
 	"getItems": function(unitEntStates)
 	{
 		// Interface becomes complicated with multiple different units and this is meant per-entity, so prevent it if the selection has multiple different units.
Index: binaries/data/mods/public/gui/session/selection_panels_left/alert_panel.xml
===================================================================
--- binaries/data/mods/public/gui/session/selection_panels_left/alert_panel.xml
+++ binaries/data/mods/public/gui/session/selection_panels_left/alert_panel.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <object name="unitAlertPanel"
 	style="TranslucentPanel"
-	size="4 100%-43 100%-4 100%-4"
+	size="4 100%-42 100%-4 100%-4"
 	type="text"
 >
-	<object size="100%-110 2 100% 100%-2">
+	<object size="100%-116 2 100% 100%-2">
 		<repeat count="3">
-			<object name="unitAlertButton[n]" hidden="true" style="iconButton" type="button" size="0 0 36 36" tooltip_style="sessionToolTipBottomBold" z="100">
-				<object name="unitAlertIcon[n]" type="image" ghost="true" size="3 3 33 33"/>
+			<object name="unitAlertButton[n]" hidden="true" style="iconButton" type="button" size="0 0 38 38" tooltip_style="sessionToolTipBottomBold" z="100">
+				<object name="unitAlertIcon[n]" type="image" ghost="true" size="3 3 35 35"/>
 			</object>
 		</repeat>
 	</object>
Index: binaries/data/mods/public/gui/session/selection_panels_left/barter_panel.xml
===================================================================
--- binaries/data/mods/public/gui/session/selection_panels_left/barter_panel.xml
+++ binaries/data/mods/public/gui/session/selection_panels_left/barter_panel.xml
@@ -1,10 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <object name="unitBarterPanel" size="12 12 100% 100%" hidden="true" hotkey="session.massbarter">
-
 	<repeat count="4">
 		<object size="0 0 42 42">
 			<include file="gui/session/trade/BarterButton.xml"/>
 		</object>
 	</repeat>
-
 </object>
Index: binaries/data/mods/public/gui/session/selection_panels_left/formation_panel.xml
===================================================================
--- binaries/data/mods/public/gui/session/selection_panels_left/formation_panel.xml
+++ binaries/data/mods/public/gui/session/selection_panels_left/formation_panel.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
-<object name="unitFormationPanel" size="24 12 100% 100%">
+<?xml version="1.0" encoding="UTF-8"?>
+<object name="unitFormationPanel" size="12 12 100% 100%">
 	<object>
 		<repeat count="16">
-			<object name="unitFormationButton[n]" hidden="true" style="iconButton" type="button" size="0 0 36 36" tooltip_style="sessionToolTipBottomBold" z="100">
-				<object name="unitFormationIcon[n]" type="image" ghost="true" size="3 3 33 33"/>
-				<object name="unitFormationSelection[n]" hidden="true" type="image" ghost="true" size="3 3 33 33" sprite="stretched:session/icons/corners.png"/>
+			<object name="unitFormationButton[n]" hidden="true" style="iconButton" type="button" size="0 0 38 38" tooltip_style="sessionToolTipBottomBold" z="100">
+				<object name="unitFormationIcon[n]" type="image" ghost="true" size="3 3 35 35"/>
+				<object name="unitFormationSelection[n]" hidden="true" type="image" ghost="true" size="3 3 35 35" sprite="stretched:session/icons/corners.png"/>
 			</object>
 		</repeat>
 	</object>
Index: binaries/data/mods/public/gui/session/selection_panels_left/garrison_panel.xml
===================================================================
--- binaries/data/mods/public/gui/session/selection_panels_left/garrison_panel.xml
+++ binaries/data/mods/public/gui/session/selection_panels_left/garrison_panel.xml
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="utf-8"?>
-<object name="unitGarrisonPanel" size="24 12 100% 100%">
+<?xml version="1.0" encoding="UTF-8"?>
+<object name="unitGarrisonPanel" size="12 12 100% 100%">
 	<object>
 		<repeat count="12">
-			<object name="unitGarrisonButton[n]" hidden="true" style="iconButton" type="button" size="0 0 36 36" tooltip_style="sessionToolTipBottomBold" z="100">
+			<object name="unitGarrisonButton[n]" hidden="true" style="iconButton" type="button" size="0 0 38 38" tooltip_style="sessionToolTipBottomBold" z="100">
 				<object name="unitGarrisonSelection[n]" type="image" ghost="true"/>
-				<object name="unitGarrisonIcon[n]" type="image" ghost="true" size="3 3 33 33"/>
+				<object name="unitGarrisonIcon[n]" type="image" ghost="true" size="3 3 35 35"/>
 				<object name="unitGarrisonCount[n]" ghost="true" style="groupIconsText" type="text"/>
 			</object>
 		</repeat>
 	</object>
 	<!-- Health bar of garrisoned units -->
 	<object size="-14 1 -7 100%-49" type="image" name="healthGarrison" tooltip_style="sessionToolTip">
-		<translatableAttribute id="tooltip">Hitpoints</translatableAttribute>
+		<translatableAttribute id="tooltip">Health</translatableAttribute>
 		<object type="image" sprite="barBorder" ghost="true" size="-1 -1 100%+1 100%+1"/>
 		<object type="image" sprite="healthBackground" ghost="true"/>
 		<object type="image" sprite="healthForeground" ghost="true" name="healthBarGarrison"/>
Index: binaries/data/mods/public/gui/session/selection_panels_left/stance_panel.xml
===================================================================
--- binaries/data/mods/public/gui/session/selection_panels_left/stance_panel.xml
+++ binaries/data/mods/public/gui/session/selection_panels_left/stance_panel.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- Stance Selection -->
 <object name="unitStancePanel"
 	style="TranslucentPanel"
-	size="4 100%-43 100%-4 100%-4"
+	size="4 100%-42 100%-4 100%-4"
 	type="text"
 >
-	<object size="1 2 100% 100%">
+	<object size="0 2 100% 100%-2">
 		<repeat count="5">
-			<object name="unitStanceButton[n]" hidden="true" style="iconButton" type="button" size="0 0 36 36" tooltip_style="sessionToolTipBottomBold" z="100">
-				<object name="unitStanceIcon[n]" type="image" ghost="true" size="3 3 33 33"/>
-				<object name="unitStanceSelection[n]" hidden="true" type="image" ghost="true" size="3 3 33 33" sprite="stretched:session/icons/corners.png"/>
+			<object name="unitStanceButton[n]" hidden="true" style="iconButton" type="button" size="0 0 38 38" tooltip_style="sessionToolTipBottomBold" z="100">
+				<object name="unitStanceIcon[n]" type="image" ghost="true" size="3 3 35 35"/>
+				<object name="unitStanceSelection[n]" hidden="true" type="image" ghost="true" size="3 3 35 35" sprite="stretched:session/icons/corners.png"/>
 			</object>
 		</repeat>
 	</object>
Index: binaries/data/mods/public/gui/session/selection_panels_middle/multiple_details_area.xml
===================================================================
--- binaries/data/mods/public/gui/session/selection_panels_middle/multiple_details_area.xml
+++ binaries/data/mods/public/gui/session/selection_panels_middle/multiple_details_area.xml
@@ -1,46 +1,41 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Unit details for Multiple Units -->
-<object size="50%-112 0 50%+112 100%" name="detailsAreaMultiple">
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Details panel for multiple entities. -->
+<object size="4 4 100%-4 100%-40" name="detailsAreaMultiple">
 	<object name="unitSelectionPanel"
-		size="20 12 100%-20 100%"
+		size="12 12 100%-20 100%"
 	>
-	<object>
-		<repeat count="16">
-		<object name="unitSelectionButton[n]" hidden="true" style="iconButton" type="button" size="0 0 36 36" tooltip_style="sessionToolTipBold" z="100">
-			<object name="unitSelectionSelection[n]" type="image" ghost="true"/>
-			<object name="unitSelectionIcon[n]" type="image" ghost="true" size="3 3 33 33"/>
-			<object name="unitSelectionCount[n]" ghost="true" style="groupIconsText" type="text"/>
-			<object size="0 100%-3 100% 100%" name="unitSelectionHealth[n]" ghost="true">
-			</object>
+		<object>
+			<repeat count="16">
+				<object name="unitSelectionButton[n]" hidden="true" style="iconButton" type="button" size="0 0 38 38" tooltip_style="sessionToolTipBold" z="100">
+					<object name="unitSelectionSelection[n]" type="image" ghost="true"/>
+					<object name="unitSelectionIcon[n]" type="image" ghost="true" size="3 3 35 35"/>
+					<object name="unitSelectionCount[n]" ghost="true" style="groupIconsText" type="text"/>
+					<object size="0 100%-3 100% 100%" name="unitSelectionHealth[n]" ghost="true"/>
+				</object>
+			</repeat>
 		</object>
-		</repeat>
-	</object>
-	</object>
-
-	<!-- Total -->
-	<object size="100%-42 12 100%-8 46" type="image" sprite="groupsIcon">
-	<object type="text" style="largeCenteredOutlinedText" name="numberOfUnits" tooltip_style="sessionToolTipBold"/>
-	</object>
-
-	<!-- Stats Bars -->
-	<object size= "100%-38 50 100%-18 100%-44" type="image" tooltip_style="sessionToolTip">
-	<!-- Health bar -->
-	<object size="4 0 11 100%" type="image" name="healthMultiple" tooltip_style="sessionToolTip">
-		<object type="image" sprite="barBorder" ghost="true" size="-1 -1 100%+1 100%+1"/>
-		<object type="image" sprite="healthBackground" ghost="true"/>
-		<object type="image" sprite="healthForeground" ghost="true" name="healthBarMultiple"/>
-		<object type="image" sprite="statsBarShaderVertical" ghost="true"/>
-	</object>
-
-	<!-- Capture bar -->
-	<object size="15 0 22 100%" type="image" name="captureMultiple" tooltip_style="sessionToolTip">
-		<object type="image" sprite="barBorder" ghost="true" size="-1 -1 100%+1 100%+1"/>
-		<repeat count="9">
-			<object type="image" sprite="playerColorBackground" ghost="true" name="captureBarMultiple[n]" hidden="true"/>
-		</repeat>
-		<object type="image" sprite="statsBarShaderVertical" ghost="true"/>
 	</object>
+	<!-- Total number of selected entities. -->
+	<object size="100%-40 12 100%-8 44" type="image" sprite="groupsIcon">
+		<object type="text" style="largeCenteredOutlinedText" name="numberOfUnits" tooltip_style="sessionToolTipBold"/>
+	</object>
+	<!-- Status bars. -->
+	<object size= "100%-38 48 100%-8 100%" type="image" tooltip_style="sessionToolTip">
+		<!-- Health bar. -->
+		<object size="50%-10 0 50%-2 100%" type="image" name="healthMultiple" tooltip_style="sessionToolTip">
+			<object type="image" sprite="barBorder" ghost="true" size="-1 -1 100%+1 100%+1"/>
+			<object type="image" sprite="healthBackground" ghost="true"/>
+			<object type="image" sprite="healthForeground" ghost="true" name="healthBarMultiple"/>
+			<object type="image" sprite="statsBarShaderVertical" ghost="true"/>
+		</object>
+		<!-- Capture bar. -->
+		<object size="50%+2 0 50%+10 100%" type="image" name="captureMultiple" tooltip_style="sessionToolTip">
+			<object type="image" sprite="barBorder" ghost="true" size="-1 -1 100%+1 100%+1"/>
+			<repeat count="9">
+				<object type="image" sprite="playerColorBackground" ghost="true" name="captureBarMultiple[n]" hidden="true"/>
+			</repeat>
+			<object type="image" sprite="statsBarShaderVertical" ghost="true"/>
+		</object>
 	</object>
 </object>
 
Index: binaries/data/mods/public/gui/session/selection_panels_middle/single_details_area.xml
===================================================================
--- binaries/data/mods/public/gui/session/selection_panels_middle/single_details_area.xml
+++ binaries/data/mods/public/gui/session/selection_panels_middle/single_details_area.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Unit details for Single Unit -->
-<object size="50%-112 0 50%+112 100%" name="detailsAreaSingle">
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Details panel for a single entity. -->
+<object size="4 4 100%-4 100%-40" name="detailsAreaSingle">
 
 	<!-- Stats Bars -->
-	<object size= "2 0 100%-2 98" type="image" tooltip_style="sessionToolTip">
+	<object size= "0 0 100% 96" type="image" tooltip_style="sessionToolTip">
 
-		<object size="0 4 100% 64" type="image" sprite="topEdgedPanelShader">
+		<object size="0 0 100% 60" type="image" sprite="topEdgedPanelShader">
 
-			<!-- Placeholders storing the position for the bars -->
+			<!-- Placeholders storing the position for the bars. -->
 			<object size="88 1 100% 24" name="sectionPosTop" hidden="true"/>
 			<object size="88 11 100% 34" name="sectionPosMiddle" hidden="true"/>
 			<object size="88 32 100% 55" name="sectionPosBottom" hidden="true"/>
@@ -15,7 +15,7 @@
 			<!-- Health bar -->
 			<object name="healthSection">
 				<object size="0 0 100% 12" name="healthLabel" type="text" style="StatsTextLeft" ghost="true">
-					<translatableAttribute id="tooltip">Health:</translatableAttribute>
+					<translatableAttribute id="tooltip">Health</translatableAttribute>
 				</object>
 				<object size="0 0 100% 12" name="healthStats" type="text" style="StatsTextRight" ghost="true"/>
 				<object size="1 14 100% 21" name="health" type="image" tooltip_style="sessionToolTip">
@@ -29,7 +29,7 @@
 			<!-- Capture bar -->
 			<object name="captureSection">
 				<object size="0 0 100% 12" name="captureLabel" type="text" style="StatsTextLeft" ghost="true">
-					<translatableAttribute id="tooltip">Capture points:</translatableAttribute>
+					<translatableAttribute id="tooltip">Capture points</translatableAttribute>
 				</object>
 				<object size="0 0 100% 12" name="captureStats" type="text" style="StatsTextRight" ghost="true"/>
 				<object size="1 14 100% 21" name="capture" type="image" tooltip_style="sessionToolTip">
@@ -54,7 +54,7 @@
 			</object>
 		</object>
 
-		<object size="0 63 100% 99" type="image" sprite="edgedPanelShader">
+		<object size="0 59 100% 95" type="image" sprite="edgedPanelShader">
 			<!-- Attack and Armor -->
 			<object size="90 -2 126 34" name="attackAndArmorStats" type="image" sprite="stretched:session/icons/stances/defensive.png" tooltip_style="sessionToolTipInstantly">
 				<translatableAttribute id="tooltip">Attack and Armor</translatableAttribute>
@@ -94,22 +94,22 @@
 	</object>
 
 
-	<!-- Names (this must come before the attack and armor icon to avoid clipping issues) -->
-	<object size="2 96 100%-2 100%-36" name="statsArea" type="image" sprite="edgedPanelShader">
+	<!-- Names (this must come before the attack and armor icon to avoid clipping issues). -->
+	<object size="0 92 100% 100%" name="statsArea" type="image" sprite="edgedPanelShader">
 
-		<!-- These images are used to clip off the top and bottom of the civ icon -->
+		<!-- These images are used to clip off the top and bottom of the civ emblem. -->
 		<object z="30" size="0 -5 100% 40" ghost="true" type="image" sprite="remove"/>
 		<object z="30" size="0 100%-5 100% 100%+40" ghost="true" type="image" sprite="remove"/>
 
 		<object z="30" size="0 2 100% 45" ghost="true">
-			<!-- Specific Name -->
+			<!-- Specific Name. -->
 			<object size="0 0 100% 20" name="specific" ghost="true" type="text" style="SpecificNameCentered"/>
 
-			<!-- Generic Name -->
+			<!-- Generic Name. -->
 			<object size="0 15 100% 36" name="generic" ghost="true" type="text" style="GenericNameCentered"/>
 		</object>
 
-		<!-- Player Name and Civ -->
+		<!-- Player name and civilization. -->
 		<object size="0 40 100% 100%">
 			<object size="50%-64 50%-64 50%+64 50%+64" name="playerCivIcon" type="image" ghost="true"/>
 			<object name="playerColorBackground" type="image" sprite="playerColorBackground" ghost="true"/>
Index: binaries/data/mods/public/gui/session/selection_panels_middle/unit_ally_commands.xml
===================================================================
--- binaries/data/mods/public/gui/session/selection_panels_middle/unit_ally_commands.xml
+++ binaries/data/mods/public/gui/session/selection_panels_middle/unit_ally_commands.xml
@@ -1,19 +1,17 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- Unit Commands -->
 <object name="unitAllyCommandPanel"
 	size="0 100%-36 100% 100%-4"
 	type="image"
 	z="30"
 >
-	<object size="0 1 100% 100%">
-	<repeat count="2">
-		<object name="unitAllyCommandButton[n]" hidden="true" style="iconButton" type="button" size="0 0 32 32" tooltip_style="sessionToolTipBottomBold">
-		<object name="unitAllyCommandIcon[n]" ghost="true" type="image" style="commandIcon"/>
-		<object name="unitAllyCommandCount[n]" ghost="true" style="groupIconsText" type="text"/>
-		</object>
-	</repeat>
+	<object size="0 0 100% 100%">
+		<repeat count="2">
+			<object name="unitAllyCommandButton[n]" hidden="true" style="iconButton" type="button" size="0 0 32 32" tooltip_style="sessionToolTipBottomBold">
+				<object name="unitAllyCommandIcon[n]" ghost="true" type="image" style="commandIcon"/>
+				<object name="unitAllyCommandCount[n]" ghost="true" style="groupIconsText" type="text"/>
+			</object>
+		</repeat>
 	</object>
-	<!-- shading for unit commands area -->
-	<object z="50" size="4 100% 100%-4 100%" ghost="true" type="image" sprite="bottomEdgedPanelShader"/>
 </object>
 
Index: binaries/data/mods/public/gui/session/selection_panels_middle/unit_commands.xml
===================================================================
--- binaries/data/mods/public/gui/session/selection_panels_middle/unit_commands.xml
+++ binaries/data/mods/public/gui/session/selection_panels_middle/unit_commands.xml
@@ -1,19 +1,17 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- Unit Commands -->
 <object name="unitCommandPanel"
 	size="0 100%-36 100% 100%-4"
 	type="image"
 	z="30"
 >
-	<object size="0 1 100% 100%">
-	<repeat count="6">
-		<object name="unitCommandButton[n]" hidden="true" style="iconButton" type="button" size="0 0 32 32" tooltip_style="sessionToolTipBottomBold">
-		<object name="unitCommandIcon[n]" ghost="true" type="image" style="commandIcon"/>
-		<object name="unitCommandCount[n]" ghost="true" style="groupIconsText" type="text"/>
-		</object>
-	</repeat>
+	<object size="0 0 100% 100%">
+		<repeat count="6">
+			<object name="unitCommandButton[n]" hidden="true" style="iconButton" type="button" size="0 0 32 32" tooltip_style="sessionToolTipBottomBold">
+				<object name="unitCommandIcon[n]" ghost="true" type="image" style="commandIcon"/>
+				<object name="unitCommandCount[n]" ghost="true" style="groupIconsText" type="text"/>
+			</object>
+		</repeat>
 	</object>
-	<!-- shading for unit commands area -->
-	<object z="50" size="4 100% 100%-4 100%" ghost="true" type="image" sprite="bottomEdgedPanelShader"/>
 </object>
 
Index: binaries/data/mods/public/gui/session/selection_panels_right/construction_panel.xml
===================================================================
--- binaries/data/mods/public/gui/session/selection_panels_right/construction_panel.xml
+++ binaries/data/mods/public/gui/session/selection_panels_right/construction_panel.xml
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <object name="unitConstructionPanel"
-	size="10 12 100% 100%"
+	size="6 6 100% 100%"
 >
 	<object>
-	<repeat count="24">
-		<object name="unitConstructionButton[n]" hidden="true" style="iconButton" type="button" size="0 0 46 46" tooltip_style="sessionToolTipBottom">
-		<object name="unitConstructionIcon[n]" type="image" ghost="true" size="3 3 43 43"/>
-		</object>
-	</repeat>
+		<repeat count="40">
+			<object name="unitConstructionButton[n]" hidden="true" style="iconButton" type="button" size="0 0 38 38" tooltip_style="sessionToolTipBottom">
+				<object name="unitConstructionIcon[n]" type="image" ghost="true" size="3 3 35 35"/>
+			</object>
+		</repeat>
 	</object>
 </object>
Index: binaries/data/mods/public/gui/session/selection_panels_right/gate_panel.xml
===================================================================
--- binaries/data/mods/public/gui/session/selection_panels_right/gate_panel.xml
+++ binaries/data/mods/public/gui/session/selection_panels_right/gate_panel.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <object name="unitGatePanel"
-	size="10 12 100% 100%"
+	size="6 6 100% 100%"
 >
 	<object>
-	<repeat count="8">
-		<object name="unitGateButton[n]" hidden="true" style="iconButton" type="button" size="0 0 46 46" tooltip_style="sessionToolTipBottom">
-		<object name="unitGateIcon[n]" type="image" ghost="true" size="3 3 43 43"/>
-		<object name="unitGateSelection[n]" hidden="true" type="image" ghost="true" size="3 3 43 43" sprite="stretched:session/icons/corners.png"/>
-		</object>
-	</repeat>
+		<repeat count="10">
+			<object name="unitGateButton[n]" hidden="true" style="iconButton" type="button" size="0 0 38 38" tooltip_style="sessionToolTipBottom">
+				<object name="unitGateIcon[n]" type="image" ghost="true" size="3 3 35 35"/>
+				<object name="unitGateSelection[n]" hidden="true" type="image" ghost="true" size="3 3 35 35" sprite="stretched:session/icons/corners.png"/>
+			</object>
+		</repeat>
 	</object>
 </object>
Index: binaries/data/mods/public/gui/session/selection_panels_right/pack_panel.xml
===================================================================
--- binaries/data/mods/public/gui/session/selection_panels_right/pack_panel.xml
+++ binaries/data/mods/public/gui/session/selection_panels_right/pack_panel.xml
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <object name="unitPackPanel"
-	size="10 12 100% 100%"
+	size="6 6 100% 100%"
 >
 	<object>
-	<repeat count="8">
-		<object name="unitPackButton[n]" hidden="true" style="iconButton" type="button" size="0 0 46 46" tooltip_style="sessionToolTipBottom">
-		<object name="unitPackIcon[n]" type="image" ghost="true" size="3 3 43 43"/>
-		</object>
-	</repeat>
+		<repeat count="10">
+			<object name="unitPackButton[n]" hidden="true" style="iconButton" type="button" size="0 0 38 38" tooltip_style="sessionToolTipBottom">
+				<object name="unitPackIcon[n]" type="image" ghost="true" size="3 3 35 35"/>
+			</object>
+		</repeat>
 	</object>
 </object>
Index: binaries/data/mods/public/gui/session/selection_panels_right/queue_panel.xml
===================================================================
--- binaries/data/mods/public/gui/session/selection_panels_right/queue_panel.xml
+++ binaries/data/mods/public/gui/session/selection_panels_right/queue_panel.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <object name="unitQueuePanel"
 	size="4 -56 100% 0"
 	type="image"
@@ -8,14 +8,13 @@
 		<translatableAttribute id="tooltip">Production queue</translatableAttribute>
 		<object name="queueTimeRemaining" ghost="true" style="iconButtonProgress" type="text"/>
 	</object>
-
 	<object size="48 6 100% 100%">
-	<repeat count="16">
-		<object name="unitQueueButton[n]" hidden="true" style="iconButton" type="button" size="0 0 40 40" tooltip_style="sessionToolTipBottom">
-		<object name="unitQueueIcon[n]" ghost="true" type="image" size="3 3 37 37"/>
-		<object name="unitQueueProgressSlider[n]" type="image" sprite="queueProgressSlider" ghost="true" size="3 3 37 37" z="20"/>
-		<object name="unitQueueCount[n]" ghost="true" style="groupIconsText" type="text" z="20"/>
-		</object>
-	</repeat>
+		<repeat count="16">
+			<object name="unitQueueButton[n]" hidden="true" style="iconButton" type="button" size="0 0 42 42" tooltip_style="sessionToolTipBottom">
+				<object name="unitQueueIcon[n]" ghost="true" type="image" size="3 3 39 39"/>
+				<object name="unitQueueProgressSlider[n]" type="image" sprite="queueProgressSlider" ghost="true" size="3 3 39 39" z="20"/>
+				<object name="unitQueueCount[n]" ghost="true" style="groupIconsText" type="text" z="20"/>
+			</object>
+		</repeat>
 	</object>
 </object>
Index: binaries/data/mods/public/gui/session/selection_panels_right/research_panel.xml
===================================================================
--- binaries/data/mods/public/gui/session/selection_panels_right/research_panel.xml
+++ binaries/data/mods/public/gui/session/selection_panels_right/research_panel.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <object name="unitResearchPanel"
-	size="10 100%-102 100% 100%"
+	size="6 100%-82 100% 100%"
 >
 	<object>
-	<repeat count="16">
-		<object name="unitResearchButton[n]" hidden="true" style="iconButton" type="button" size="0 0 46 46" tooltip_style="sessionToolTipBottom">
-		<object name="unitResearchIcon[n]" type="image" ghost="true" size="3 3 43 43"/>
-		<object name="unitResearchUnchosenIcon[n]" type="image" hidden="true" ghost="true" size="3 3 43 43" sprite="stretched:session/icons/tech_pair_would_be_unavailable.png"/>
-		</object>
-	</repeat>
-	<repeat count="8">
-		<object name="unitResearchPair[n]" hidden="true" size="0 0 46 92">
-		<object name="unitResearchPairIcon[n]" type="image" ghost="true" size="8 38 38 54" sprite="stretched:session/icons/vertical_pair.png"/>
-		</object>
-	</repeat>
+		<repeat count="20">
+			<object name="unitResearchButton[n]" hidden="true" style="iconButton" type="button" size="0 0 38 38" tooltip_style="sessionToolTipBottom">
+				<object name="unitResearchIcon[n]" type="image" ghost="true" size="3 3 35 35"/>
+				<object name="unitResearchUnchosenIcon[n]" type="image" hidden="true" ghost="true" size="3 3 35 35" sprite="stretched:session/icons/tech_pair_would_be_unavailable.png"/>
+			</object>
+		</repeat>
+		<repeat count="10">
+			<object name="unitResearchPair[n]" hidden="true" size="0 0 38 76">
+				<object name="unitResearchPairIcon[n]" type="image" ghost="true" size="8 30 30 46" sprite="stretched:session/icons/vertical_pair.png"/>
+			</object>
+		</repeat>
 	</object>
 </object>
Index: binaries/data/mods/public/gui/session/selection_panels_right/training_panel.xml
===================================================================
--- binaries/data/mods/public/gui/session/selection_panels_right/training_panel.xml
+++ binaries/data/mods/public/gui/session/selection_panels_right/training_panel.xml
@@ -1,19 +1,19 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <object name="unitTrainingPanel"
-	size="10 12 100% 100%"
+	size="6 6 100% 100%"
 >
 	<object>
-	<repeat count="24">
-		<object name="unitTrainingButton[n]" hidden="true" style="iconButton" type="button" size="0 0 46 46" tooltip_style="sessionToolTipBottom">
-			<object name="unitTrainingIcon[n]" type="image" ghost="true" size="3 3 43 43"/>
-			<object name="unitTrainingCount[n]" ghost="true" style="groupIconsText" type="text" z="20"/>
-			<action on="MouseWheelUp">
-				OnTrainMouseWheel(1);
-			</action>
-			<action on="MouseWheelDown">
-				OnTrainMouseWheel(-1);
-			</action>
-		</object>
-	</repeat>
+		<repeat count="40">
+			<object name="unitTrainingButton[n]" hidden="true" style="iconButton" type="button" size="0 0 38 38" tooltip_style="sessionToolTipBottom">
+				<object name="unitTrainingIcon[n]" type="image" ghost="true" size="3 3 35 35"/>
+				<object name="unitTrainingCount[n]" ghost="true" style="groupIconsText" type="text" z="20"/>
+				<action on="MouseWheelUp">
+					OnTrainMouseWheel(1);
+				</action>
+				<action on="MouseWheelDown">
+					OnTrainMouseWheel(-1);
+				</action>
+			</object>
+		</repeat>
 	</object>
 </object>
Index: binaries/data/mods/public/gui/session/selection_panels_right/upgrade_panel.xml
===================================================================
--- binaries/data/mods/public/gui/session/selection_panels_right/upgrade_panel.xml
+++ binaries/data/mods/public/gui/session/selection_panels_right/upgrade_panel.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <object name="unitUpgradePanel"
-	size="10 12 100% 100%"
+	size="6 6 100% 100%"
 >
 	<object>
-	<repeat count="8">
-		<object name="unitUpgradeButton[n]" hidden="true" style="iconButton" type="button" size="0 0 46 46" tooltip_style="sessionToolTipBottom">
-		<object name="unitUpgradeIcon[n]" type="image" ghost="true" size="3 3 43 43"/>
-		<object name="unitUpgradeUpgradeIcon[n]" type="image" ghost="true" size="3 3 43 43" sprite="stretched:session/icons/upgrade.png"/>
-		<object name="unitUpgradeProgressSlider[n]" type="image" sprite="queueProgressSlider" ghost="true" size="3 3 43 43" z="20"/>
-		<object name="unitUpgradeSelection[n]" hidden="true" type="image" ghost="true" size="3 3 43 43" sprite="stretched:session/icons/corners.png"/>
-		<object name="unitUpgradeCount[n]" ghost="true" style="groupIconsText" type="text" z="30"/>
-		</object>
-	</repeat>
+		<repeat count="10">
+			<object name="unitUpgradeButton[n]" hidden="true" style="iconButton" type="button" size="0 0 38 38" tooltip_style="sessionToolTipBottom">
+				<object name="unitUpgradeIcon[n]" type="image" ghost="true" size="3 3 35 35"/>
+				<object name="unitUpgradeUpgradeIcon[n]" type="image" ghost="true" size="3 3 35 35" sprite="stretched:session/icons/upgrade.png"/>
+				<object name="unitUpgradeProgressSlider[n]" type="image" sprite="queueProgressSlider" ghost="true" size="3 3 35 35" z="20"/>
+				<object name="unitUpgradeSelection[n]" hidden="true" type="image" ghost="true" size="3 3 35 35" sprite="stretched:session/icons/corners.png"/>
+				<object name="unitUpgradeCount[n]" ghost="true" style="groupIconsText" type="text" z="30"/>
+			</object>
+		</repeat>
 	</object>
 </object>
Index: binaries/data/mods/public/gui/session/session.xml
===================================================================
--- binaries/data/mods/public/gui/session/session.xml
+++ binaries/data/mods/public/gui/session/session.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <objects>
 
@@ -12,10 +12,10 @@
 <script directory="gui/session/lobby/LobbyRatingReport/"/>
 <script directory="gui/session/message_box/"/>
 <script directory="gui/session/minimap/"/>
+<script directory="gui/session/objectives/"/>
 <script directory="gui/session/top_panel/"/>
 <script directory="gui/session/top_panel/IconButtons/"/>
 <script directory="gui/session/trade/"/>
-<script directory="gui/session/objectives/"/>
 
 <object name="session">
 
@@ -68,12 +68,14 @@
 	<object name="placementTooltip" type="tooltip" independent="true" style="informationTooltip"/>
 
 	<!-- START of BOTTOM PANEL -->
-	<!-- limit to the minimal supported width of 1024px -->
+	<!-- Limit to the minimal supported width of 1024 pixels. -->
 	<object size="50%-512 0 50%+512 100%">
 
-		<include directory="gui/session/minimap/"/>
+		<object size="50%-512 100%-212 50%-300 100%">
+			<include directory="gui/session/minimap/"/>
+		</object>
 
-		<!-- Supplemental Details Panel (Left of Selection Details) -->
+		<!-- Supplemental Details Panel (left). -->
 		<object
 			size="50%-304 100%-170 50%-110 100%"
 			name="supplementalSelectionDetails"
@@ -84,7 +86,7 @@
 			<include directory="gui/session/selection_panels_left/"/>
 		</object>
 
-		<!-- Selection Details Panel (Middle) -->
+		<!-- Selection Details Panel (middle). -->
 		<object name="selectionDetails"
 			type="image"
 			sprite="selectionDetailsPanel"
@@ -93,7 +95,7 @@
 			<include directory="gui/session/selection_panels_middle/"/>
 		</object>
 
-		<!-- Commands Panel (Right of Selection Details) -->
+		<!-- Commands Panel (right). -->
 		<object name="unitCommands"
 			type="image"
 			sprite="unitCommandsPanel"