diff --git a/core/menu/menu.php b/core/menu/menu.php
index 815978cec5..ca379ca991 100644
--- a/core/menu/menu.php
+++ b/core/menu/menu.php
@@ -110,8 +110,8 @@ require_once "resources/paging.php";
 	echo th_order_by('menu_name', $text['label-name'], $order_by, $order);
 	echo th_order_by('menu_language', $text['label-language'], $order_by, $order);
 	echo th_order_by('menu_description', $text['label-description'], $order_by, $order);
-	echo "<td align='right' width='42'>\n";
-	echo "	<a href='menu_edit.php' alt='".$text['button-add']."'>$v_link_label_add</a>\n";
+	echo "<td class='list_control_icons'>";
+	echo "<a href='menu_edit.php' alt='".$text['button-add']."'>$v_link_label_add</a>";
 	echo "</td>\n";
 	echo "<tr>\n";
 
@@ -121,9 +121,9 @@ require_once "resources/paging.php";
 			echo "	<td valign='top' class='".$row_style[$c]."'>".$row['menu_name']."&nbsp;</td>\n";
 			echo "	<td valign='top' class='".$row_style[$c]."'>".$row['menu_language']."&nbsp;</td>\n";
 			echo "	<td valign='top' class='".$row_style[$c]."'>".$row['menu_description']."&nbsp;</td>\n";
-			echo "	<td valign='top' align='right'>\n";
-			echo "		<a href='menu_edit.php?id=".$row['menu_uuid']."' alt='".$text['button-edit']."'>$v_link_label_edit</a>\n";
-			echo "		<a href='menu_delete.php?id=".$row['menu_uuid']."&menu_uuid=".$row['menu_uuid']."' alt='".$text['button-delete']."' onclick=\"return confirm('".$text['confirm-delete']."')\">$v_link_label_delete</a>\n";
+			echo "	<td class='list_control_icons'>";
+			echo 		"<a href='menu_edit.php?id=".$row['menu_uuid']."' alt='".$text['button-edit']."'>$v_link_label_edit</a>";
+			echo 		"<a href='menu_delete.php?id=".$row['menu_uuid']."&menu_uuid=".$row['menu_uuid']."' alt='".$text['button-delete']."' onclick=\"return confirm('".$text['confirm-delete']."')\">$v_link_label_delete</a>";
 			echo "	</td>\n";
 			echo "</tr>\n";
 			if ($c==0) { $c=1; } else { $c=0; }
@@ -137,8 +137,8 @@ require_once "resources/paging.php";
 	echo "	<tr>\n";
 	echo "		<td width='33.3%' nowrap>&nbsp;</td>\n";
 	echo "		<td width='33.3%' align='center' nowrap>$paging_controls</td>\n";
-	echo "		<td width='33.3%' align='right'>\n";
-	echo "			<a href='menu_edit.php' alt='".$text['button-add']."'>$v_link_label_add</a>\n";
+	echo "		<td class='list_control_icons'>";
+	echo 			"<a href='menu_edit.php' alt='".$text['button-add']."'>$v_link_label_add</a>";
 	echo "		</td>\n";
 	echo "	</tr>\n";
  	echo "	</table>\n";
diff --git a/core/menu/menu_edit.php b/core/menu/menu_edit.php
index 60e39e95e1..bcc9519c7f 100644
--- a/core/menu/menu_edit.php
+++ b/core/menu/menu_edit.php
@@ -247,7 +247,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "	</td>";
 	echo "	</tr>";
 	echo "</table>";
-	echo "</div>";
+	echo "</div><br><br>";
 
 //show the menu items
 	require_once "core/menu/menu_item_list.php";
diff --git a/core/menu/menu_item_list.php b/core/menu/menu_item_list.php
index d79f68fbcc..333557c945 100644
--- a/core/menu/menu_item_list.php
+++ b/core/menu/menu_item_list.php
@@ -140,12 +140,12 @@ function build_db_child_menu_list ($db, $menu_item_level, $menu_item_uuid, $c) {
 					//}
 					//echo "</td>";
 
-					echo "   <td valign='top' align='right' nowrap>\n";
+					echo "   <td class='list_control_icons'>\n";
 					if (permission_exists('menu_edit')) {
-						echo "		<a href='menu_item_edit.php?id=".$menu_uuid."&menu_item_uuid=".$row2['menu_item_uuid']."&menu_item_parent_uuid=".$row2['menu_item_parent_uuid']."' alt='".$text['button-edit']."'>$v_link_label_edit</a>\n";
+						echo "<a href='menu_item_edit.php?id=".$menu_uuid."&menu_item_uuid=".$row2['menu_item_uuid']."&menu_item_parent_uuid=".$row2['menu_item_parent_uuid']."' alt='".$text['button-edit']."'>$v_link_label_edit</a>";
 					}
 					if (permission_exists('menu_delete')) {
-						echo "		<a href='menu_item_delete.php?id=".$menu_uuid."&menu_item_uuid=".$row2['menu_item_uuid']."' onclick=\"return confirm('".$text['confirm-delete']."')\" alt='".$text['button-delete']."'>$v_link_label_delete</a>\n";
+						echo "<a href='menu_item_delete.php?id=".$menu_uuid."&menu_item_uuid=".$row2['menu_item_uuid']."' onclick=\"return confirm('".$text['confirm-delete']."')\" alt='".$text['button-delete']."'>$v_link_label_delete</a>";
 					}
 					echo "   </td>\n";
 					echo "</tr>";
@@ -216,9 +216,9 @@ $order = $_GET["order"];
 		echo "<th align='left'nowrap>&nbsp; ".$text['label-category']." &nbsp; </th>";
 		echo "<th nowrap>&nbsp; ".$text['label-protected']." &nbsp; </th>";
 		echo "<th nowrap width='70'>&nbsp; ".$text['label-menu_order']." &nbsp; </th>";
-		echo "<td align='right' width='42'>\n";
+		echo "<td class='list_control_icons'>";
 		if (permission_exists('menu_add')) {
-			echo "	<a href='menu_item_edit.php?id=".$menu_uuid."' alt='".$text['button-add']."'>$v_link_label_add</a>\n";
+			echo "<a href='menu_item_edit.php?id=".$menu_uuid."' alt='".$text['button-add']."'>$v_link_label_add</a>";
 		}
 		echo "</td>\n";
 		echo "</tr>";
@@ -296,12 +296,12 @@ $order = $_GET["order"];
 				//}
 				//echo "</td>";
 
-				echo "   <td valign='top' align='right' nowrap>\n";
+				echo "   <td class='list_control_icons'>";
 				if (permission_exists('menu_edit')) {
-					echo "		<a href='menu_item_edit.php?id=".$menu_uuid."&menu_item_uuid=".$row['menu_item_uuid']."&menu_uuid=".$menu_uuid."' alt='".$text['button-edit']."'>$v_link_label_edit</a>\n";
+					echo "<a href='menu_item_edit.php?id=".$menu_uuid."&menu_item_uuid=".$row['menu_item_uuid']."&menu_uuid=".$menu_uuid."' alt='".$text['button-edit']."'>$v_link_label_edit</a>";
 				}
 				if (permission_exists('menu_delete')) {
-					echo "		<a href='menu_item_delete.php?id=".$menu_uuid."&menu_item_uuid=".$row['menu_item_uuid']."&menu_uuid=".$menu_uuid."' onclick=\"return confirm('".$text['confirm-delete']."')\" alt='".$text['button-delete']."'>$v_link_label_delete</a>\n";
+					echo "<a href='menu_item_delete.php?id=".$menu_uuid."&menu_item_uuid=".$row['menu_item_uuid']."&menu_uuid=".$menu_uuid."' onclick=\"return confirm('".$text['confirm-delete']."')\" alt='".$text['button-delete']."'>$v_link_label_delete</a>";
 				}
 				echo "   </td>\n";
 				echo "</tr>";