diff --git a/app/xmpp/profile_edit.php b/app/xmpp/profile_edit.php
index 586518bb78..35305c78a2 100644
--- a/app/xmpp/profile_edit.php
+++ b/app/xmpp/profile_edit.php
@@ -134,7 +134,7 @@ function hide_advanced_config() {
 				<tr>
 					<td width="30%" valign="top" class="vncell"><?php echo $text['label-advanced']?></td>
 					<td width="70%" class="vtable">
-						<input type="button" onClick="show_advanced_config()" value="<?php echo $text['button-advanced']?>"></input>
+						<input type="button" class="btn" onClick="show_advanced_config()" value="<?php echo $text['button-advanced']?>"></input>
 					</td>
 				</tr>
 			</table>
@@ -143,7 +143,7 @@ function hide_advanced_config() {
 			<table width="100%" border="0" cellpadding="6" cellspacing="0">
 				<tr>
 				<?php if (if_group("superadmin")) { ?>
-					<td class='vncellreq' valign='top' align='left' nowrap='nowrap'>
+					<td width='30%' class='vncellreq' valign='top' align='left' nowrap='nowrap'>
 						<?php echo $text['label-context']?>:
 					</td>
 					<td class='vtable' align='left'>
diff --git a/app/xmpp/profile_list.php b/app/xmpp/profile_list.php
index b98bbec246..b8ad96ad0e 100644
--- a/app/xmpp/profile_list.php
+++ b/app/xmpp/profile_list.php
@@ -16,7 +16,7 @@
 	<th><?php echo $text['label-status']?></th>
 	<th><?php echo $text['label-enabled']?></th>
 	<th><?php echo $text['label-description']?></th>
-<td align='right' width='42'>
+<td class='list_control_icons'>
 	<?php if (permission_exists('xmpp_add')) { ?>
 		<a href='xmpp_profile_edit.php' alt='<?php echo $text['button-add']?>'><?php echo $v_link_label_add; ?></a>
 	<?php } ?>
@@ -36,14 +36,15 @@ foreach($profiles_array as $profile){
 	<td class='<?php echo $row_style[$c]; ?>'><?php echo $profile['status']; ?>&nbsp;</td>
 	<td class='<?php echo $row_style[$c]; ?>'><?php echo $profile['enabled']; ?>&nbsp;</td>
 	<td class='<?php echo $row_style[$c]; ?>'><?php echo $profile['description']; ?>&nbsp;</td>
-	<td align='right' width='42'>
-		<?php if (permission_exists('xmpp_edit')) { ?>
-		<a href='xmpp_profile_edit.php?id=<?php echo $profile['xmpp_profile_uuid']; ?>' alt='<?php echo $text['button-edit']?>'><?php echo $v_link_label_edit; ?></a>
-		<?php } ?>
-		<?php if (permission_exists('xmpp_delete')) { ?>
-		<a href='profile_delete.php?id=<?php echo $profile['xmpp_profile_uuid']; ?>' onclick="return confirm('<?php echo $text['confirm-delete']?>')"
-			alt='<?php echo $text['button-delete']?>'><?php echo $v_link_label_delete; ?></a>
-		<?php } ?>
+	<td class='list_control_icons'>
+		<?php
+		if (permission_exists('xmpp_edit')) {
+			?><a href='xmpp_profile_edit.php?id=<?php echo $profile['xmpp_profile_uuid']; ?>' alt='<?php echo $text['button-edit']?>'><?php echo $v_link_label_edit; ?></a><?php
+		}
+		if (permission_exists('xmpp_delete')) {
+			?><a href='profile_delete.php?id=<?php echo $profile['xmpp_profile_uuid']; ?>' onclick="return confirm('<?php echo $text['confirm-delete']?>')" alt='<?php echo $text['button-delete']?>'><?php echo $v_link_label_delete; ?></a><?php
+		}
+		?>
 	</td>
 </tr>
 <?php
@@ -51,7 +52,7 @@ if ($c==0) { $c=1; } else { $c=0; }
 }
 ?>
 <tr>
-<td colspan='6' align='right' width='42'>
+<td colspan='6' class='list_control_icons'>
 	<?php if (permission_exists('xmpp_add')) { ?>
 		<a href='xmpp_profile_edit.php' alt='<?php echo $text['button-add']?>'><?php echo $v_link_label_add; ?></a>
 	<?php } ?>