2 files changed, 11 insertions, 6 deletions
diff --git a/phpBB/styles/prosilver/template/ucp_notifications.html b/phpBB/styles/prosilver/template/ucp_notifications.html
index 85edf4629b..558bff7349 100644
--- a/phpBB/styles/prosilver/template/ucp_notifications.html
+++ b/phpBB/styles/prosilver/template/ucp_notifications.html
@@ -118,13 +118,15 @@
 	</div>
 </div>
 
-
-<fieldset class="submit-buttons">
+<!-- IF .notifications -->
+<fieldset class="display-actions">
 	<input type="hidden" name="form_time" value="{FORM_TIME}" />
-	{S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp;
-	<input type="submit" name="submit" value="{L_SUBMIT}" class="button1" />
+	{S_HIDDEN_FIELDS}
+	<input type="submit" name="submit" value="{L_MARK_READ}" class="button1" />
+	<div><a href="#" onclick="$('#ucp input:checkbox').attr('checked', true); return false;">{L_MARK_ALL}</a> &bull; <a href="#" onclick="$('#ucp input:checkbox').attr('checked', false); return false;">{L_UNMARK_ALL}</a></div>
 	{S_FORM_TOKEN}
 </fieldset>
+<!-- ENDIF -->
 
 </form>
 
diff --git a/phpBB/styles/subsilver2/template/ucp_notifications.html b/phpBB/styles/subsilver2/template/ucp_notifications.html
index a2dc90c9f3..c1ca795234 100644
--- a/phpBB/styles/subsilver2/template/ucp_notifications.html
+++ b/phpBB/styles/subsilver2/template/ucp_notifications.html
@@ -111,8 +111,7 @@
 							<td class="cat" colspan="3" align="center">
 								<input type="hidden" name="form_time" value="{FORM_TIME}" />
 								{S_HIDDEN_FIELDS}
-								<input class="btnmain" type="submit" name="submit" value="{L_SUBMIT}" />&nbsp;&nbsp;
-								<input class="btnlite" type="reset" value="{L_RESET}" name="reset" />
+								<input class="btnmain" type="submit" name="submit" value="{L_MARK_READ}" />
 								{S_FORM_TOKEN}
 							</td>
 						</tr>
@@ -141,6 +140,10 @@
 	<!-- ENDIF -->
 </table>
 
+<!-- IF .notifications -->
+<div class="gensmall" style="float: {S_CONTENT_FLOW_END}; padding-top: 2px;"><b><a href="#" onclick="$('#ucp input:checkbox').attr('checked', true); return false;">{L_MARK_ALL}</a> :: <a href="#" onclick="$('#ucp input:checkbox').attr('checked', false); return false;">{L_UNMARK_ALL}</a></b></div>
+<!-- ENDIF -->
+
 </form>
 
 <!-- INCLUDE ucp_footer.html -->