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
@@ -101,10 +101,19 @@
 	}
 };
 
+/**
+ * The command buttons are grouped by pages the size of this variable.
+ */
+var g_CommandButtonsPerPage = 6;
+
+/**
+ * The current command buttons page.
+ */
+var g_OpenCommandPage = 1;
 g_SelectionPanels.Command = {
 	"getMaxNumberOfItems": function()
 	{
-		return 6;
+		return 18;
 	},
 	"getItems": function(unitEntStates)
 	{
@@ -141,14 +150,24 @@
 
 		data.icon.sprite = "stretched:session/icons/" + data.item.icon;
 
+		let numberOfPages = Math.ceil(data.numberOfItems / g_CommandButtonsPerPage);
 		let size = data.button.size;
 		// relative to the center ( = 50%)
 		size.rleft = 50;
 		size.rright = 50;
 		// offset from the center calculation, count on square buttons, so size.bottom is the width too
-		size.left = (data.i - data.numberOfItems / 2) * (size.bottom + 1);
+		size.left = (data.i % g_CommandButtonsPerPage - Math.min(data.numberOfItems, g_CommandButtonsPerPage) / 2) *
+			(size.bottom + 1);
 		size.right = size.left + size.bottom;
 		data.button.size = size;
+
+		if (g_OpenCommandPage > numberOfPages)
+			g_OpenCommandPage = numberOfPages;
+
+		data.button.hidden = g_OpenCommandPage != Math.ceil((data.i + 1) / g_CommandButtonsPerPage);
+		Engine.GetGUIObjectByName("unitCommandArrowN").hidden = g_OpenCommandPage == numberOfPages;
+		Engine.GetGUIObjectByName("unitCommandArrowP").hidden = g_OpenCommandPage == 1;
+
 		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,24 @@
 	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"/>
+		<repeat count="24">
+			<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 name="unitCommandArrowN" hidden="false" type="button" style="iconButton" sprite="stretched:session/icons/arrow_right.png" sprite_over="stretched:session/icons/arrow_right_highlight.png" size="100%-15 0 100%-5 32" tooltip_style="sessionToolTipBottomBold">
+			<action on="Press">
+				++g_OpenCommandPage;
+				updateSelectionDetails();
+			</action>
+		</object>
+		<object name="unitCommandArrowP" hidden="true" type="button" style="iconButton" sprite="stretched:session/icons/arrow_left.png" sprite_over="stretched:session/icons/arrow_left_highlight.png" size="5 0 14 32" tooltip_style="sessionToolTipBottomBold">
+			<action on="Press">
+				--g_OpenCommandPage;
+				updateSelectionDetails();
+			</action>
 		</object>
-	</repeat>
 	</object>
 	<!-- shading for unit commands area -->
 	<object z="50" size="4 100% 100%-4 100%" ghost="true" type="image" sprite="bottomEdgedPanelShader"/>