diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php
index 76f8988fb9..a14f79f9fd 100644
--- a/phpBB/includes/ucp/ucp_profile.php
+++ b/phpBB/includes/ucp/ucp_profile.php
@@ -679,8 +679,6 @@ class ucp_profile
 				while ($row = $db->sql_fetchrow($result))
 				{
 					$template->assign_block_vars('sessions', array(
-						'errors' => $error,
-
 						'KEY' => $row['key_id'],
 						'IP' => $row['last_ip'],
 						'LOGIN_TIME' => $user->format_date($row['last_login']),
@@ -693,6 +691,8 @@ class ucp_profile
 		}
 
 		$template->assign_vars(array(
+			'ERROR'		=> (sizeof($error)) ? implode('<br />', $error) : '',
+
 			'L_TITLE'	=> $user->lang['UCP_PROFILE_' . strtoupper($mode)],
 
 			'S_HIDDEN_FIELDS'	=> $s_hidden_fields,
diff --git a/phpBB/styles/prosilver/template/ucp_notifications.html b/phpBB/styles/prosilver/template/ucp_notifications.html
index 2712e53034..b400a3c8b1 100644
--- a/phpBB/styles/prosilver/template/ucp_notifications.html
+++ b/phpBB/styles/prosilver/template/ucp_notifications.html
@@ -11,11 +11,13 @@
 		<!-- IF MODE == 'notification_options' -->
 			<table class="table1">
 				<thead>
-					<th>{L_NOTIFICATION_TYPE}</th>
-					<!-- BEGIN notification_methods -->
-						<th class="mark">{notification_methods.NAME}</th>
-					<!-- END notification_methods -->
-					<th class="mark">{L_NOTIFICATIONS}</th>
+					<tr>
+						<th>{L_NOTIFICATION_TYPE}</th>
+						<!-- BEGIN notification_methods -->
+							<th class="mark">{notification_methods.NAME}</th>
+						<!-- END notification_methods -->
+						<th class="mark">{L_NOTIFICATIONS}</th>
+					</tr>
 				</thead>
 				<tbody>
 				<!-- BEGIN notification_types -->
diff --git a/phpBB/styles/prosilver/template/ucp_profile_autologin_keys.html b/phpBB/styles/prosilver/template/ucp_profile_autologin_keys.html
index bf97434bac..6fec0b8aed 100644
--- a/phpBB/styles/prosilver/template/ucp_profile_autologin_keys.html
+++ b/phpBB/styles/prosilver/template/ucp_profile_autologin_keys.html
@@ -5,47 +5,41 @@
 <h2>{L_TITLE}</h2>
 <div class="panel">
 	<div class="inner">
-
-	<!-- IF .errors -->
-	<p class="error">
-		<!-- BEGIN errors -->
-			{errors} <br />
-		<!-- END errors -->
-	</p>
-	<!-- ENDIF -->
-
-	<p>{L_PROFILE_AUTOLOGIN_KEYS}</p><br />
-	<table class="table1">
-	<thead>
-	<tr>
-		<th>{L_MARK}</th>
-		<th>{L_LOGIN_KEY}</th>
-		<th>{L_IP}</th>
-		<th>{L_LOGIN_TIME}</th>
-	</tr>
-	</thead>
-	<tbody>
-	<!-- BEGIN sessions -->
-		<!-- IF sessions.S_ROW_COUNT is even --><tr class="bg1"><!-- ELSE --><tr class="bg2"><!-- ENDIF -->
-			<td style="text-align: center"><input type="checkbox" name="keys[]" value="{sessions.KEY}" id="{sessions.KEY}"/></td>
-			<td><label for="{sessions.KEY}">{sessions.KEY}</label></td>
-			<td style="text-align: center">{sessions.IP}</td>
-			<td style="text-align: center">{sessions.LOGIN_TIME}</td>
-		</tr>
-	<!-- BEGINELSE -->
-		<tr><td colspan="4" class="bg1" style="text-align: center">{L_PROFILE_NO_AUTOLOGIN_KEYS}</td></tr>
-	<!-- END sessions -->
-	</tbody>
-	</table>
+		<p>{L_PROFILE_AUTOLOGIN_KEYS}</p>
+		<!-- IF ERROR --><p class="error">{ERROR}</p><!-- ENDIF -->
+		<table class="table1">
+			<thead>
+				<tr>
+					<th>{L_LOGIN_KEY}</th>
+					<th>{L_IP}</th>
+					<th>{L_LOGIN_TIME}</th>
+					<th class="mark">{L_MARK}</th>
+				</tr>
+			</thead>
+			<tbody>
+			<!-- BEGIN sessions -->
+				<!-- IF sessions.S_ROW_COUNT is even --><tr class="bg1"><!-- ELSE --><tr class="bg2"><!-- ENDIF -->
+					<td><label for="{sessions.KEY}">{sessions.KEY}</label></td>
+					<td style="text-align: center">{sessions.IP}</td>
+					<td style="text-align: center">{sessions.LOGIN_TIME}</td>
+					<td style="text-align: center" class="mark"><input type="checkbox" name="keys[]" value="{sessions.KEY}" id="{sessions.KEY}" /></td>
+				</tr>
+			<!-- BEGINELSE -->
+				<tr><td colspan="4" class="bg1" style="text-align: center">{L_PROFILE_NO_AUTOLOGIN_KEYS}</td></tr>
+			<!-- END sessions -->
+			</tbody>
+		</table>
 	</div>
 </div>
 
 <!-- IF .sessions -->
-	<fieldset class="submit-buttons">
-		{S_HIDDEN_FIELDS}<input type="submit" name="submit" value="{L_DELETE}" class="button1" />
+	<fieldset class="display-actions">
+		{S_HIDDEN_FIELDS}<input type="submit" name="submit" value="{L_DELETE_MARKED}" class="button2" />
+		<div><a href="#" onclick="$('#ucp input:checkbox').prop('checked', true); return false;">{L_MARK_ALL}</a> &bull; <a href="#" onclick="$('#ucp input:checkbox').prop('checked', false); return false;">{L_UNMARK_ALL}</a></div>
 		{S_FORM_TOKEN}
 	</fieldset>
 <!-- ENDIF -->
+
 </form>
 
 <!-- INCLUDE ucp_footer.html -->
diff --git a/phpBB/styles/subsilver2/template/ucp_profile_autologin_keys.html b/phpBB/styles/subsilver2/template/ucp_profile_autologin_keys.html
index 1dab9acb9c..3f63319b59 100644
--- a/phpBB/styles/subsilver2/template/ucp_profile_autologin_keys.html
+++ b/phpBB/styles/subsilver2/template/ucp_profile_autologin_keys.html
@@ -2,15 +2,12 @@
 
 <table class="tablebg" width="100%" cellspacing="1">
 <tr>
-	<th colspan="4" valign="middle">{L_TITLE}</th>
+	<th colspan="4">{L_TITLE}</th>
 </tr>
-<!-- IF .errors -->
+
+<!-- IF ERROR -->
 	<tr>
-		<td class="row3" colspan="2" align="center"><span class="gensmall error">
-			<!-- BEGIN errors -->
-				{errors} <br />
-			<!-- END errors -->
-		</td>
+		<td class="row3" colspan="4" align="center"><span class="genmed error">{ERROR}</span></td>
 	</tr>
 <!-- ENDIF -->
 
@@ -18,17 +15,17 @@
 	<td colspan="4" class="row1">{L_PROFILE_AUTOLOGIN_KEYS}</td>
 </tr>
 <tr>
-	<th>{L_MARK}</th>
 	<th>{L_LOGIN_KEY}</th>
 	<th>{L_IP}</th>
 	<th>{L_LOGIN_TIME}</th>
+	<th>{L_MARK}</th>
 </tr>
 <!-- BEGIN sessions -->
 	<!-- IF sessions.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-		<td class="genmed" style="text-align: center"><input type="checkbox" name="keys[]" value="{sessions.KEY}" id="{sessions.KEY}"/></td>
 		<td class="genmed"><label for="{sessions.KEY}">{sessions.KEY}</label></td>
 		<td class="genmed" style="text-align: center">{sessions.IP}</td>
 		<td class="genmed" style="text-align: center">{sessions.LOGIN_TIME}</td>
+		<td class="genmed" style="text-align: center"><input type="checkbox" name="keys[]" value="{sessions.KEY}" id="{sessions.KEY}"/></td>
 	</tr>
 <!-- BEGINELSE -->
 	<tr>
@@ -38,12 +35,16 @@
 
 <!-- IF .sessions -->
 	<tr>
-		<td class="cat" colspan="4" align="center">
-			{S_HIDDEN_FIELDS}<input class="btnmain" type="submit" name="submit" value="{L_DELETE}" />
+		<td class="cat" colspan="4" align="{S_CONTENT_FLOW_END}">
+			{S_HIDDEN_FIELDS}<input class="btnlite" type="submit" name="submit" value="{L_DELETE_MARKED}" />
 			{S_FORM_TOKEN}
 		</td>
 	</tr>
 <!-- ENDIF -->
 </table>
 
+<!-- IF .sessions -->
+	<div class="gensmall" style="float: {S_CONTENT_FLOW_END}; padding-top: 2px;"><b><a href="#" onclick="marklist('ucp', 'keys', true); return false;">{L_MARK_ALL}</a> :: <a href="#" onclick="marklist('ucp', 'keys', false); return false;">{L_UNMARK_ALL}</a></b></div>
+<!-- ENDIF -->
+
 <!-- INCLUDE ucp_footer.html -->