Index: binaries/data/mods/public/gui/session/ResearchProgress.xml
===================================================================
--- binaries/data/mods/public/gui/session/ResearchProgress.xml
+++ binaries/data/mods/public/gui/session/ResearchProgress.xml
@@ -1,8 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
-<object size="100%-50 40 100%-10 100%-200" name="researchStartedButtons">
+<?xml version="1.0" encoding="UTF-8"?>
+<object name="researchStartedButtons"
+	size="100%-48 40 100%-10 420"
+>
 	<repeat count="10">
-		<object name="researchStartedButton[n]" hidden="true" style="iconButton" type="button" size="0 0 40 40" tooltip_style="sessionToolTipBottom">
-			<object name="researchStartedIcon[n]" ghost="true" type="image" size="3 3 37 37"/>
+		<object name="researchStartedButton[n]" hidden="true" style="iconButton" type="button" size="0 0 38 38" tooltip_style="sessionToolTipBottom">
+			<object name="researchStartedIcon[n]" ghost="true" type="image" size="3 3 35 35"/>
 			<object name="researchStartedProgressSlider[n]" type="image" sprite="queueProgressSlider" ghost="true" size="3 3 37 37"/>
 			<object name="researchStartedTimeRemaining[n]" ghost="true" style="iconButtonProgress" type="text"/>
 		</object>
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,9 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-<object
-	name="minimapPanel"
-	size="0 100%-212 212 100%"
-	type="image"
+<?xml version="1.0" encoding="UTF-8"?>
+<object name="minimapPanel"
+	size="0 0 100% 100%"
 	sprite="mapPanel"
+	type="image"
 >
 	<!-- MiniMap -->
 	<object name="minimap" size="8 8 100%-8 100%-8" type="minimap" z="20"/>
@@ -17,10 +16,9 @@
 	/>
 
 	<!-- Idle Worker Button -->
-	<object
-		name="idleWorkerButton"
+	<object name="idleWorkerButton"
 		type="button"
-		size="100%-120 100%-120 100%-5 100%-5"
+		size="50%-5 50%-5 100%-5 100%-5"
 		tooltip_style="sessionToolTip"
 		hotkey="selection.idleworker"
 		sprite="stretched:session/minimap-idle.png"
@@ -29,10 +27,9 @@
 	/>
 
 	<!-- Diplomacy Colors Button -->
-	<object
-		name="diplomacyColorsButton"
+	<object name="diplomacyColorsButton"
 		type="button"
-		size="4 100%-120 119 100%-5"
+		size="5 50%-5 50%+5 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
@@ -79,9 +79,9 @@
 g_SelectionPanels.Barter = {
 	"getMaxNumberOfItems": function()
 	{
-		return 4;
+		return 5;
 	},
-	"rowLength": 4,
+	"rowLength": 5,
 	"conflictsWith": ["Garrison"],
 	"getItems": function(unitEntStates)
 	{
@@ -209,8 +209,9 @@
 g_SelectionPanels.Construction = {
 	"getMaxNumberOfItems": function()
 	{
-		return 24 - getNumberOfRightPanelButtons();
+		return 40 - getNumberOfRightPanelButtons();
 	},
+	"rowLength": 10,
 	"getItems": function()
 	{
 		return getAllBuildableEntitiesFromSelection();
@@ -283,9 +284,9 @@
 g_SelectionPanels.Formation = {
 	"getMaxNumberOfItems": function()
 	{
-		return 16;
+		return 15;
 	},
-	"rowLength": 4,
+	"rowLength": 5,
 	"conflictsWith": ["Garrison"],
 	"getItems": function(unitEntStates)
 	{
@@ -298,7 +299,7 @@
 		if (!g_AvailableFormations.has(unitEntStates[0].player))
 			g_AvailableFormations.set(unitEntStates[0].player, Engine.GuiInterfaceCall("GetAvailableFormations", unitEntStates[0].player));
 
-		return g_AvailableFormations.get(unitEntStates[0].player).filter(formation => unitEntStates.some(state => !!state.identity &&  state.identity.formations.indexOf(formation) != -1));
+		return g_AvailableFormations.get(unitEntStates[0].player).filter(formation => unitEntStates.some(state => !!state.identity && state.identity.formations.indexOf(formation) != -1));
 	},
 	"setupButton": function(data)
 	{
@@ -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 = [];
@@ -761,7 +765,7 @@
 				addResearchToQueue(data.item.researchFacilityId, t);
 			})(tech);
 
-			button.onPressRight = (t => function () {
+			button.onPressRight = (t => function() {
 				showTemplateDetails(
 					t,
 					GetTemplateData(data.unitEntStates.find(state => state.id == data.item.researchFacilityId).template).nativeCiv);
@@ -922,8 +926,9 @@
 g_SelectionPanels.Training = {
 	"getMaxNumberOfItems": function()
 	{
-		return 24 - getNumberOfRightPanelButtons();
+		return 40 - getNumberOfRightPanelButtons();
 	},
+	"rowLength": 10,
 	"getItems": function()
 	{
 		return getAllTrainableEntitiesFromSelection();
@@ -1019,8 +1024,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%-44 100%-4 100%-4"
 	type="text"
 >
-	<object size="100%-110 2 100% 100%-2">
+	<object size="100%-118 1 100% 100%">
 		<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,12 @@
-<?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">
+<?xml version="1.0" encoding="UTF-8"?>
+<object name="unitBarterPanel"
+	size="6 6 100% 100%"
+	hidden="true"
+	hotkey="session.massbarter"
+>
+	<repeat count="5">
+		<object size="0 0 38 38">
 			<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,12 +1,13 @@
-<?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="6 6 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"/>
+		<repeat count="15">
+			<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>
 </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,19 @@
-<?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="20 6 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,14 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Stance Selection -->
+<?xml version="1.0" encoding="UTF-8"?>
 <object name="unitStancePanel"
 	style="TranslucentPanel"
-	size="4 100%-43 100%-4 100%-4"
+	size="4 100%-44 100%-4 100%-4"
 	type="text"
 >
-	<object size="1 2 100% 100%">
+	<object size="2 1 100% 100%">
 		<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,40 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Unit details for Multiple Units -->
-<object size="50%-112 0 50%+112 100%" name="detailsAreaMultiple">
-
-	<object name="unitSelectionPanel"
-		size="20 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>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Details panel for multiple entities. -->
+<object name="detailsAreaMultiple"
+	size="6 6 100%-6 100%-44"
+>
+	<object name="unitSelectionPanel">
+		<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%-35 4 100%-3 36" type="image" sprite="groupsIcon">
+		<object type="text" style="largeCenteredOutlinedText" name="numberOfUnits" tooltip_style="sessionToolTipBold"/>
+	</object>
+	<!-- Status bars. -->
+	<object size= "100%-35 40 100%-3 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,21 +1,23 @@
-<?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 name="detailsAreaSingle"
+	size="4 4 100%-4 100%-44"
+>
 
 	<!-- 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 -->
-			<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"/>
+			<!-- Placeholders storing the position for the bars. -->
+			<object size="96 1 100% 24" name="sectionPosTop" hidden="true"/>
+			<object size="96 11 100% 34" name="sectionPosMiddle" hidden="true"/>
+			<object size="96 32 100% 55" name="sectionPosBottom" hidden="true"/>
 
 			<!-- 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 +31,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,20 +56,20 @@
 			</object>
 		</object>
 
-		<object size="0 63 100% 99" type="image" sprite="edgedPanelShader">
+		<object size="0 59 100% 95" type="image" sprite="edgedPanelShader">
 			<!-- Attack and Resistance -->
-			<object size="90 -2 126 34" name="attackAndResistanceStats" type="image" sprite="stretched:session/icons/stances/defensive.png" tooltip_style="sessionToolTipInstantly">
+			<object size="96 0 128 32" name="attackAndResistanceStats" type="image" sprite="stretched:session/icons/stances/defensive.png" tooltip_style="sessionToolTipInstantly">
 				<translatableAttribute id="tooltip">Attack and Resistance</translatableAttribute>
 			</object>
 
 			<!-- Resource carrying icon/counter -->
 			<!-- Used also for number of gatherers/builders -->
-			<object size="100%-98 -2 100%-36 34" type="text" name="resourceCarryingText" style="CarryingTextRight"/>
-			<object size="100%-36 -2 100% 34" type="image" name="resourceCarryingIcon" tooltip_style="sessionToolTip"/>
+			<object size="100%-96 0 100%-36 32" type="text" name="resourceCarryingText" style="CarryingTextRight"/>
+			<object size="100%-32 0 100% 32" type="image" name="resourceCarryingIcon" tooltip_style="sessionToolTip"/>
 		</object>
 
 		<!-- Big unit icon -->
-		<object size="-8 -8 88 88" type="button" name="iconBorder" sprite="iconBorder" tooltip_style="sessionToolTip">
+		<object size="0 0 96 96" type="button" name="iconBorder" sprite="iconBorder" tooltip_style="sessionToolTip">
 			<object size="1 1 100%-1 100%-1" type="image" name="icon" ghost="true"/>
 
 			<!-- Experience bar -->
@@ -89,34 +91,30 @@
 					<object type="image" size="0 0 16 16" z="200" tooltip_style="sessionToolTip"/>
 				</repeat>
 			</object>
-
 		</object>
 	</object>
 
+	<!-- Names and civilization emblem etc. (This must come before the attack and resistance icon to avoid clipping issues.) -->
+	<object size="0 92 100% 100%" name="statsArea" type="image" sprite="edgedPanelShader">
 
-	<!-- Names (this must come before the attack and resistance icon to avoid clipping issues) -->
-	<object size="2 96 100%-2 100%-36" name="statsArea" type="image" sprite="edgedPanelShader">
-
-		<!-- These images are used to clip off the top and bottom of the civ icon -->
-		<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 -->
-			<object size="0 0 100% 20" name="specific" ghost="true" type="text" style="SpecificNameCentered"/>
-
-			<!-- Generic Name -->
-			<object size="0 15 100% 36" name="generic" ghost="true" type="text" style="GenericNameCentered"/>
+		<!-- Specific and generic names. -->
+		<object z="30">
+			<object size="0 2 100% 22" name="specific" ghost="true" type="text" style="SpecificNameCentered"/>
+			<object size="0 17 100% 37" name="generic" ghost="true" type="text" style="GenericNameCentered"/>
 		</object>
 
-		<!-- Player Name and Civ -->
-		<object size="0 40 100% 100%">
+		<!-- Civilization tooltip. -->
+		<object size="0 38 100% 62" tooltip_style="sessionToolTip">
+			<!-- Images to clip off the top and bottom of the civilization emblem. -->
+			<object z="20" size="0 50%-64 100% 50%-12" ghost="true" type="image" sprite="remove"/>
+			<object z="20" size="0 50%+12 100% 50%+64" ghost="true" type="image" sprite="remove"/>
+			<!-- Civilization emblem. -->
 			<object size="50%-64 50%-64 50%+64 50%+64" name="playerCivIcon" type="image" ghost="true"/>
+			<!-- Player color band. -->
 			<object name="playerColorBackground" type="image" sprite="playerColorBackground" ghost="true"/>
 			<object type="image" sprite="bottomEdgedPanelShader" ghost="true"/>
-			<object size="0 0 100% 100%-5" name="player" type="text" style="largeCenteredOutlinedText" tooltip_style="sessionToolTip"/>
+			<!-- Player name. -->
+			<object size="0 50%-10 100% 50%+10" z="30" name="player" type="text" style="largeCenteredOutlinedText"/>
 		</object>
 	</object>
-
 </object>
-
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,16 @@
-<?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"
+	size="0 100%-40 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,16 @@
-<?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"
+	size="0 100%-40 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="2 2 40 40" tooltip_style="sessionToolTipBottom">
+				<object name="unitQueueIcon[n]" ghost="true" type="image" size="3 3 35 35"/>
+				<object name="unitQueueProgressSlider[n]" type="image" sprite="queueProgressSlider" ghost="true" size="3 3 35 35" 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,36 +68,37 @@
 	<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%-200 50%-312 100%">
+			<include directory="gui/session/minimap/"/>
+		</object>
 
-		<!-- Supplemental Details Panel (Left of Selection Details) -->
-		<object
-			size="50%-304 100%-170 50%-110 100%"
-			name="supplementalSelectionDetails"
-			type="image"
+		<!-- Supplemental Details Panel (left). -->
+		<object name="supplementalSelectionDetails"
+			size="50%-316 100%-166 50%-110 100%"
 			sprite="supplementalDetailsPanel"
+			type="image"
 			z="20"
 		>
 			<include directory="gui/session/selection_panels_left/"/>
 		</object>
 
-		<!-- Selection Details Panel (Middle) -->
+		<!-- Selection Details Panel (middle). -->
 		<object name="selectionDetails"
-			type="image"
+			size="50%-114 100%-200 50%+114 100%"
 			sprite="selectionDetailsPanel"
-			size="50%-114 100%-205 50%+114 100%"
+			type="image"
 		>
 			<include directory="gui/session/selection_panels_middle/"/>
 		</object>
 
-		<!-- Commands Panel (Right of Selection Details) -->
+		<!-- Commands Panel (right). -->
 		<object name="unitCommands"
-			type="image"
+			size="50%+110 100%-166 50%+512 100%"
 			sprite="unitCommandsPanel"
-			size="50%+110 100%-170 50%+512 100%"
+			type="image"
 			z="20"
 		>
 			<include directory="gui/session/selection_panels_right/"/>
Index: binaries/data/mods/public/gui/session/session_objects/selection_group_icons.xml
===================================================================
--- binaries/data/mods/public/gui/session/session_objects/selection_group_icons.xml
+++ binaries/data/mods/public/gui/session/session_objects/selection_group_icons.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
-<object
-	name="unitGroupPanel"
-	size="0% 50%-216 0%+36 50%+144"
+<?xml version="1.0" encoding="UTF-8"?>
+<object name="unitGroupPanel"
+	size="0 50%-228 38 50%+152"
 >
 	<repeat count="10">
-		<object name="unitGroupButton[n]" size="0 0 36 36" type="button" style="iconButton" tooltip_style="sessionToolTipBottomBold">
+		<object name="unitGroupButton[n]" size="0 0 38 38" type="button" style="iconButton" tooltip_style="sessionToolTipBottomBold">
 			<translatableAttribute id="tooltip">Click to select grouped units, double-click to focus the grouped units and right-click to disband the group.</translatableAttribute>
-			<object name="unitGroupIcon[n]" size="3 3 33 33" type="image" sprite="groupsIcon" ghost="true"/>
+			<object name="unitGroupIcon[n]" size="3 3 35 35" type="image" sprite="groupsIcon" ghost="true"/>
 			<object name="unitGroupLabel[n]" type="text" style="largeCenteredOutlinedText" ghost="true"/>
 		</object>
 	</repeat>
Index: binaries/data/mods/public/gui/session/trade/BarterButton.xml
===================================================================
--- binaries/data/mods/public/gui/session/trade/BarterButton.xml
+++ binaries/data/mods/public/gui/session/trade/BarterButton.xml
@@ -1,17 +1,14 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <object>
-
 	<!-- Sell -->
-	<object style="iconButton" type="button" size="0 0 42 42" tooltip_style="sessionToolTipBottomBold" hidden="true">
-		<object type="image" ghost="true" size="3 3 100%-3 100%-3"/>
+	<object style="iconButton" type="button" size="0 0 38 38" tooltip_style="sessionToolTipBottomBold" hidden="true">
+		<object type="image" ghost="true" size="3 3 35 35"/>
 		<object type="text" ghost="true" style="resourceText" size="0 0 100% 50%"/>
-		<object type="image" ghost="true" hidden="true" size="3 3 100%-3 100%-3" sprite="stretched:session/icons/corners.png"/>
+		<object type="image" ghost="true" hidden="true" size="3 3 35 35" sprite="stretched:session/icons/corners.png"/>
 	</object>
-
 	<!-- Buy -->
-	<object style="iconButton" type="button" size="0 43 42 85" tooltip_style="sessionToolTipBottomBold" hidden="true">
-		<object type="image" ghost="true" size="3 3 100%-3 100%-3"/>
+	<object style="iconButton" type="button" size="0 42 38 80" tooltip_style="sessionToolTipBottomBold" hidden="true">
+		<object type="image" ghost="true" size="3 3 35 35"/>
 		<object ghost="true" style="resourceText" type="text" size="0 0 100% 50%"/>
 	</object>
-
 </object>