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,7 +209,7 @@
 g_SelectionPanels.Construction = {
 	"getMaxNumberOfItems": function()
 	{
-		return 24 - getNumberOfRightPanelButtons();
+		return 32 - getNumberOfRightPanelButtons();
 	},
 	"getItems": function()
 	{
@@ -398,7 +398,7 @@
 g_SelectionPanels.Gate = {
 	"getMaxNumberOfItems": function()
 	{
-		return 24 - getNumberOfRightPanelButtons();
+		return 32 - getNumberOfRightPanelButtons();
 	},
 	"getItems": function(unitEntStates)
 	{
@@ -439,7 +439,7 @@
 g_SelectionPanels.Pack = {
 	"getMaxNumberOfItems": function()
 	{
-		return 24 - getNumberOfRightPanelButtons();
+		return 32 - getNumberOfRightPanelButtons();
 	},
 	"getItems": function(unitEntStates)
 	{
@@ -922,7 +922,7 @@
 g_SelectionPanels.Training = {
 	"getMaxNumberOfItems": function()
 	{
-		return 24 - getNumberOfRightPanelButtons();
+		return 32 - getNumberOfRightPanelButtons();
 	},
 	"getItems": function()
 	{
@@ -1020,7 +1020,7 @@
 g_SelectionPanels.Upgrade = {
 	"getMaxNumberOfItems": function()
 	{
-		return 24 - getNumberOfRightPanelButtons();
+		return 32 - getNumberOfRightPanelButtons();
 	},
 	"getItems": function(unitEntStates)
 	{
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"?>
 <object name="unitConstructionPanel"
-	size="10 12 100% 100%"
+	size="10 10 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="32">
+			<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>
 	</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"?>
 <object name="unitGatePanel"
-	size="10 12 100% 100%"
+	size="10 10 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="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>
 	</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"?>
 <object name="unitPackPanel"
-	size="10 12 100% 100%"
+	size="10 10 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="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>
 	</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,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <object name="unitQueuePanel"
-	size="4 -56 100% 0"
+	size="0 -56 100% 0"
 	type="image"
 	sprite="queuePanelShader"
 >
@@ -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 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>
 	</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
@@ -3,16 +3,16 @@
 	size="10 100%-102 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="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>
 	</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"?>
 <object name="unitTrainingPanel"
-	size="10 12 100% 100%"
+	size="10 10 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="32">
+			<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>
 	</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"?>
 <object name="unitUpgradePanel"
-	size="10 12 100% 100%"
+	size="10 10 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="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>
 	</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
@@ -97,7 +97,7 @@
 		<object name="unitCommands"
 			type="image"
 			sprite="unitCommandsPanel"
-			size="50%+110 100%-170 50%+512 100%"
+			size="50%+110 100%-205 50%+512 100%"
 			z="20"
 		>
 			<include directory="gui/session/selection_panels_right/"/>
Index: binaries/data/mods/public/gui/session/sprites.xml
===================================================================
--- binaries/data/mods/public/gui/session/sprites.xml
+++ binaries/data/mods/public/gui/session/sprites.xml
@@ -282,7 +282,7 @@
 			texture_size="0 0 4 4"
 			size="0 100%-4 4 100%"
 		/>
-		<image texture="global/border/line_corner_middle_right.png"
+		<image texture="global/border/line_corner_top_middle.png"
 			texture_size="0 0 4 4"
 			size="0 0 4 4"
 		/>