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
@@ -125,7 +125,7 @@
 g_SelectionPanels.Command = {
 	"getMaxNumberOfItems": function()
 	{
-		return 6;
+		return 12;
 	},
 	"getItems": function(unitEntStates)
 	{
@@ -162,6 +162,7 @@
 
 		data.icon.sprite = "stretched:session/icons/" + data.item.icon;
 
+		let buttonsPerPage = this.getMaxNumberOfItems()/2;
 		let size = data.button.size;
 		// count on square buttons, so size.bottom is the width too
 		let spacer = size.bottom + 1;
@@ -169,9 +170,19 @@
 		size.rleft = 50;
 		size.rright = 50;
 		// offset from the center calculation
-		size.left = (data.i - data.numberOfItems / 2) * spacer;
+		size.left = (data.i % buttonsPerPage - Math.min(data.numberOfItems, buttonsPerPage) / 2) * spacer;
 		size.right = size.left + size.bottom;
 		data.button.size = size;
+
+		data.button.hidden = g_IsFirstCommandPage == (data.i >= this.getMaxNumberOfItems()/2);
+
+		let fitsOnePage = data.numberOfItems <= buttonsPerPage;
+		if (fitsOnePage)
+			g_IsFirstCommandPage = true;
+
+		Engine.GetGUIObjectByName("unitCommandArrowN").hidden = fitsOnePage || !g_IsFirstCommandPage;
+		Engine.GetGUIObjectByName("unitCommandArrowP").hidden = fitsOnePage || g_IsFirstCommandPage;
+
 		return true;
 	}
 };
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
@@ -6,12 +6,18 @@
 	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" size="0 0 100% 100%" style="commandIcon"/>
-		<object name="unitCommandCount[n]" ghost="true" style="groupIconsText" type="text" size="0 0 100% 100%"/>
+		<repeat count="12">
+			<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" size="0 0 100% 100%" style="commandIcon"/>
+				<object name="unitCommandCount[n]" ghost="true" style="groupIconsText" type="text" size="0 0 100% 100%"/>
+			</object>
+		</repeat>
+		<object name="unitCommandArrowN" hidden="false" style="iconButton" type="button"  size="100%-15 0 100%-5 32" tooltip_style="sessionToolTipBottomBold">
+			<action on="Press">g_IsFirstCommandPage = false;</action>
+		</object>
+		<object name="unitCommandArrowP" hidden="true" style="iconButton" type="button"  size="5 0 14 32" tooltip_style="sessionToolTipBottomBold">
+			<action on="Press">g_IsFirstCommandPage = true;</action>
 		</object>
-	</repeat>
 	</object>
 	<!-- shading for unit commands area -->
 	<object z="50" size="4 100% 100%-4 100%" ghost="true" type="image" sprite="bottomEdgedPanelShader"/>
Index: binaries/data/mods/public/gui/session/unit_commands.js
===================================================================
--- binaries/data/mods/public/gui/session/unit_commands.js
+++ binaries/data/mods/public/gui/session/unit_commands.js
@@ -17,6 +17,8 @@
 	"Upgrade": 0
 };
 
+var g_IsFirstCommandPage = true;
+
 /**
  * Set the position of a panel object according to the index,
  * from left to right, from top to bottom.