diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html
index d4088a9b44..04c6ecde3a 100644
--- a/phpBB/adm/style/acp_forums.html
+++ b/phpBB/adm/style/acp_forums.html
@@ -444,7 +444,7 @@
 			<col class="row1" /><col class="row1" /><col class="row2" />
 		<tbody>
 		<!-- BEGIN forums -->
-			<tr data-down="{forums.U_MOVE_DOWN}" data-up="{forums.U_MOVE_UP}">
+			<tr>
 				<td class="folder">{forums.FOLDER_IMAGE}</td>
 				<td class="forum-desc">
 					<!-- IF forums.FORUM_IMAGE --><div style="float: {S_CONTENT_FLOW_BEGIN}; margin-right: 5px;">{forums.FORUM_IMAGE}</div><!-- ENDIF -->
diff --git a/phpBB/adm/style/acp_groups_position.html b/phpBB/adm/style/acp_groups_position.html
index e9858b4018..a32dd1e3a7 100644
--- a/phpBB/adm/style/acp_groups_position.html
+++ b/phpBB/adm/style/acp_groups_position.html
@@ -38,7 +38,7 @@
 	</thead>
 	<tbody>
 	<!-- BEGIN legend -->
-		<tr data-down="{legend.U_MOVE_DOWN}" data-up="{legend.U_MOVE_UP}">
+		<tr>
 			<td><strong<!-- IF legend.GROUP_COLOUR --> style="color: {legend.GROUP_COLOUR}"<!-- ENDIF -->>{legend.GROUP_NAME}</strong></td>
 			<td style="text-align: center;">{legend.GROUP_TYPE}</td>
 			<td class="actions">
@@ -117,7 +117,7 @@
 	</thead>
 	<tbody>
 	<!-- BEGIN teampage -->
-		<tr data-down="{teampage.U_MOVE_DOWN}" data-up="{teampage.U_MOVE_UP}">
+		<tr>
 			<td>
 				<!-- IF teampage.U_CATEGORY -->
 					<a href="{teampage.U_CATEGORY}">{teampage.GROUP_NAME}</a>
diff --git a/phpBB/adm/style/acp_modules.html b/phpBB/adm/style/acp_modules.html
index 1e49198725..f8be80bc57 100644
--- a/phpBB/adm/style/acp_modules.html
+++ b/phpBB/adm/style/acp_modules.html
@@ -149,20 +149,11 @@
 				<td style="width: 5%; text-align: center;">{modules.MODULE_IMAGE}</td>
 				<td><a href="{modules.U_MODULE}">{modules.MODULE_TITLE}</a><!-- IF not modules.MODULE_DISPLAYED --> <span class="small">[{L_HIDDEN_MODULE}]</span><!-- ENDIF --></td>
 				<td style="width: 15%; white-space: nowrap; text-align: center; vertical-align: middle;">&nbsp;<!-- IF modules.MODULE_ENABLED --><a href="{modules.U_DISABLE}">{L_DISABLE}</a><!-- ELSE --><a href="{modules.U_ENABLE}">{L_ENABLE}</a><!-- ENDIF -->&nbsp;</td>
-				<td style="width:90px; white-space: nowrap; text-align: right; vertical-align: middle;">
-					<!-- IF modules.S_FIRST_ROW && not modules.S_LAST_ROW -->
-						{ICON_MOVE_UP_DISABLED}
-						<a href="{modules.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a>
-					<!-- ELSEIF not modules.S_FIRST_ROW && not modules.S_LAST_ROW-->
-						<a href="{modules.U_MOVE_UP}">{ICON_MOVE_UP}</a> 
-						<a href="{modules.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a> 
-					<!-- ELSEIF modules.S_LAST_ROW && not modules.S_FIRST_ROW -->
-						<a href="{modules.U_MOVE_UP}">{ICON_MOVE_UP}</a>	
-						{ICON_MOVE_DOWN_DISABLED}
-					<!-- ELSE -->
-						{ICON_MOVE_UP_DISABLED}
-						{ICON_MOVE_DOWN_DISABLED}
-					<!-- ENDIF -->
+				<td class="actions">
+					<span class="up-disabled" style="display:none;">{ICON_MOVE_UP_DISABLED}</span>
+					<span class="up"><a href="{modules.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a></span>
+					<span class="down-disabled" style="display:none;">{ICON_MOVE_DOWN_DISABLED}</span>
+					<span class="down"><a href="{modules.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a></span>
 					<a href="{modules.U_EDIT}">{ICON_EDIT}</a> 
 					<a href="{modules.U_DELETE}" data-ajax="row_delete">{ICON_DELETE}</a>
 				</td>