diff --git a/core/default_settings/default_settings.php b/core/default_settings/default_settings.php
index 749d37f08c..94dfa65a6e 100644
--- a/core/default_settings/default_settings.php
+++ b/core/default_settings/default_settings.php
@@ -126,12 +126,9 @@ require_once "resources/paging.php";
 				echo th_order_by('default_setting_value', $text['label-value'], $order_by, $order);
 				echo th_order_by('default_setting_enabled', $text['label-enabled'], $order_by, $order);
 				echo th_order_by('default_setting_description', $text['label-description'], $order_by, $order);
-				echo "<td align='right' width='42'>\n";
+				echo "<td class='list_control_icons'>";
 				if (permission_exists('default_setting_add')) {
-					echo "	<a href='default_setting_edit.php' alt='".$text['button-add']."'>$v_link_label_add</a>\n";
-				}
-				else {
-					echo "	&nbsp;\n";
+					echo "<a href='default_setting_edit.php' alt='".$text['button-add']."'>$v_link_label_add</a>";
 				}
 				echo "</td>\n";
 				echo "</tr>\n";
@@ -166,12 +163,12 @@ require_once "resources/paging.php";
 			echo "	</td>\n";
 			echo "	<td valign='top' class='".$row_style[$c]."'>".$row['default_setting_enabled']."&nbsp;</td>\n";
 			echo "	<td valign='top' class='".$row_style[$c]."'>".$row['default_setting_description']."&nbsp;</td>\n";
-			echo "	<td valign='top' align='right'>\n";
+			echo "	<td class='list_control_icons'>";
 			if (permission_exists('default_setting_edit')) {
-				echo "		<a href='default_setting_edit.php?id=".$row['default_setting_uuid']."' alt='".$text['button-edit']."'>$v_link_label_edit</a>\n";
+				echo "<a href='default_setting_edit.php?id=".$row['default_setting_uuid']."' alt='".$text['button-edit']."'>$v_link_label_edit</a>";
 			}
 			if (permission_exists('default_setting_delete')) {
-				echo "		<a href='default_setting_delete.php?id=".$row['default_setting_uuid']."' alt='".$text['button-delete']."' onclick=\"return confirm('".$text['confirm-delete']."')\">$v_link_label_delete</a>\n";
+				echo "<a href='default_setting_delete.php?id=".$row['default_setting_uuid']."' alt='".$text['button-delete']."' onclick=\"return confirm('".$text['confirm-delete']."')\">$v_link_label_delete</a>";
 			}
 			echo "	</td>\n";
 			echo "</tr>\n";
@@ -187,12 +184,9 @@ 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 "		<td class='list_control_icons'>";
 	if (permission_exists('default_setting_add')) {
-		echo "			<a href='default_setting_edit.php' alt='".$text['button-add']."'>$v_link_label_add</a>\n";
-	}
-	else {
-		echo "			&nbsp;\n";
+		echo 		"<a href='default_setting_edit.php' alt='".$text['button-add']."'>$v_link_label_add</a>";
 	}
 	echo "		</td>\n";
 	echo "	</tr>\n";