diff --git a/phpBB/styles/prosilver/template/captcha_default.html b/phpBB/styles/prosilver/template/captcha_default.html
index 02899bcafd..6df124b443 100644
--- a/phpBB/styles/prosilver/template/captcha_default.html
+++ b/phpBB/styles/prosilver/template/captcha_default.html
@@ -12,7 +12,7 @@
 		<dt><label for="confirm_code">{L_CONFIRM_CODE}{L_COLON}</label></dt>
 		<dd class="captcha captcha-image"><img src="{CONFIRM_IMAGE_LINK}" alt="{L_CONFIRM_CODE}" /></dd>
 		<dd><input type="text" name="confirm_code" id="confirm_code" size="8" maxlength="8" tabindex="{$CAPTCHA_TAB_INDEX}" class="inputbox narrow" title="{L_CONFIRM_CODE}" />
-		<!-- IF S_CONFIRM_REFRESH --><input type="submit" name="refresh_vc" id="refresh_vc" class="button2" value="{L_VC_REFRESH}" /><!-- ENDIF -->
+		<!-- IF S_CONFIRM_REFRESH --><input type="submit" name="refresh_vc" id="refresh_vc" class="button1 button button-form-bold" value="{L_VC_REFRESH}" /><!-- ENDIF -->
 		<input type="hidden" name="confirm_id" id="confirm_id" value="{CONFIRM_ID}" /></dd>
 		<dd>{L_CONFIRM_CODE_EXPLAIN}</dd>
 	</dl>
diff --git a/phpBB/styles/prosilver/template/confirm_body.html b/phpBB/styles/prosilver/template/confirm_body.html
index aaea5cfd05..180ccaac59 100644
--- a/phpBB/styles/prosilver/template/confirm_body.html
+++ b/phpBB/styles/prosilver/template/confirm_body.html
@@ -4,8 +4,8 @@
 		<p>{MESSAGE_TEXT}</p>
 
 		<fieldset class="submit-buttons">
-			<input type="button" name="confirm" value="{L_YES}" class="button2" />&nbsp;
-			<input type="button" name="cancel" value="{L_NO}" class="button2" />
+			<input type="button" name="confirm" value="{L_YES}" class="button1 button button-form-bold" />&nbsp;
+			<input type="button" name="cancel" value="{L_NO}" class="button1 button button-form-bold" />
 		</fieldset>
 	</form>
 
@@ -22,8 +22,8 @@
 
 	<fieldset class="submit-buttons">
 		{S_HIDDEN_FIELDS}
-		<input type="submit" name="confirm" value="{L_YES}" class="button2" />&nbsp;
-		<input type="submit" name="cancel" value="{L_NO}" class="button2" />
+		<input type="submit" name="confirm" value="{L_YES}" class="button1 button button-form-bold" />&nbsp;
+		<input type="submit" name="cancel" value="{L_NO}" class="button1 button button-form-bold" />
 	</fieldset>
 
 	</div>
diff --git a/phpBB/styles/prosilver/template/confirm_delete_body.html b/phpBB/styles/prosilver/template/confirm_delete_body.html
index 98974963c0..ecf96d4933 100644
--- a/phpBB/styles/prosilver/template/confirm_delete_body.html
+++ b/phpBB/styles/prosilver/template/confirm_delete_body.html
@@ -18,8 +18,8 @@
 		<!-- ENDIF -->
 
 		<fieldset class="submit-buttons">
-			<input type="button" name="confirm" value="{L_YES}" class="button1" />&nbsp;
-			<input type="button" name="cancel" value="{L_NO}" class="button2" />
+			<input type="button" name="confirm" value="{L_YES}" class="button1 button button-form" />&nbsp;
+			<input type="button" name="cancel" value="{L_NO}" class="button1 button button-form-bold" />
 		</fieldset>
 	</form>
 
@@ -58,8 +58,8 @@
 
 	<fieldset class="submit-buttons">
 		{S_HIDDEN_FIELDS}
-		<input type="submit" name="confirm" value="{L_YES}" class="button1" />&nbsp;
-		<input type="submit" name="cancel" value="{L_NO}" class="button2" />
+		<input type="submit" name="confirm" value="{L_YES}" class="button1 button button-form" />&nbsp;
+		<input type="submit" name="cancel" value="{L_NO}" class="button1 button button-form-bold" />
 	</fieldset>
 
 	</div>
diff --git a/phpBB/styles/prosilver/template/display_options.html b/phpBB/styles/prosilver/template/display_options.html
index a426d08845..1bcaf40087 100644
--- a/phpBB/styles/prosilver/template/display_options.html
+++ b/phpBB/styles/prosilver/template/display_options.html
@@ -11,7 +11,7 @@
 				<label>{L_SORT_BY}{L_COLON} <select name="sk" id="sk">{S_SORT_OPTIONS}</select></label>
 				<label>{L_SORT_DIRECTION}{L_COLON} <select name="sd" id="sd">{S_ORDER_SELECT}</select></label>
 				<hr class="dashed" />
-				<input type="submit" class="button2" name="sort" value="{L_SORT}" />
+				<input type="submit" class="button1 button button-form-bold" name="sort" value="{L_SORT}" />
 			<!-- ELSE -->
 				<label>{L_DISPLAY}{L_COLON} {S_SELECT_SORT_DAYS}</label>
 				<!-- IF S_SELECT_SORT_KEY -->
@@ -19,7 +19,7 @@
 				<label>{L_SORT_DIRECTION}{L_COLON} {S_SELECT_SORT_DIR}</label>
 				<!-- ENDIF -->
 				<hr class="dashed" />
-				<input type="submit" class="button2" name="sort" value="{L_GO}" />
+				<input type="submit" class="button1 button button-form-bold" name="sort" value="{L_GO}" />
 			<!-- ENDIF -->
 			</fieldset>
 		</div>
diff --git a/phpBB/styles/prosilver/template/index_body.html b/phpBB/styles/prosilver/template/index_body.html
index ec5bf35476..2d186aa766 100644
--- a/phpBB/styles/prosilver/template/index_body.html
+++ b/phpBB/styles/prosilver/template/index_body.html
@@ -27,7 +27,7 @@
 			<!-- IF S_AUTOLOGIN_ENABLED -->
 				<span class="responsive-hide">|</span> <label for="autologin">{L_LOG_ME_IN} <input type="checkbox" tabindex="4" name="autologin" id="autologin" /></label>
 			<!-- ENDIF -->
-			<input type="submit" tabindex="5" name="login" value="{L_LOGIN}" class="button2" />
+			<input type="submit" tabindex="5" name="login" value="{L_LOGIN}" class="button1 button button-form-bold" />
 			{S_LOGIN_REDIRECT}
 		</fieldset>
 	</form>
diff --git a/phpBB/styles/prosilver/template/login_body.html b/phpBB/styles/prosilver/template/login_body.html
index ef08035717..b948d6238a 100644
--- a/phpBB/styles/prosilver/template/login_body.html
+++ b/phpBB/styles/prosilver/template/login_body.html
@@ -35,7 +35,7 @@
 		{S_LOGIN_REDIRECT}
 		<dl>
 			<dt>&nbsp;</dt>
-			<dd>{S_HIDDEN_FIELDS}<input type="submit" name="login" tabindex="6" value="{L_LOGIN}" class="button1" /></dd>
+			<dd>{S_HIDDEN_FIELDS}<input type="submit" name="login" tabindex="6" value="{L_LOGIN}" class="button1 button button-form" /></dd>
 		</dl>
 		</fieldset>
 	</div>
@@ -56,7 +56,7 @@
 			<p>{L_LOGIN_INFO}</p>
 			<p><strong><a href="{U_TERMS_USE}">{L_TERMS_USE}</a> | <a href="{U_PRIVACY}">{L_PRIVACY}</a></strong></p>
 			<hr class="dashed" />
-			<p><a href="{U_REGISTER}" class="button2">{L_REGISTER}</a></p>
+			<p><a href="{U_REGISTER}" class="button1 button button-form-bold">{L_REGISTER}</a></p>
 		</div>
 
 		</div>
diff --git a/phpBB/styles/prosilver/template/login_body_oauth.html b/phpBB/styles/prosilver/template/login_body_oauth.html
index 156485d211..a6a2e70052 100644
--- a/phpBB/styles/prosilver/template/login_body_oauth.html
+++ b/phpBB/styles/prosilver/template/login_body_oauth.html
@@ -2,7 +2,7 @@
 	<!-- BEGIN oauth -->
 	<dl>
 		<dt>&nbsp;</dt>
-		<dd><a href="{oauth.REDIRECT_URL}" class="button2">{oauth.SERVICE_NAME}</a></dd>
+		<dd><a href="{oauth.REDIRECT_URL}" class="button1 button button-form-bold">{oauth.SERVICE_NAME}</a></dd>
 	</dl>
 	<!-- END oauth -->
 </div>
diff --git a/phpBB/styles/prosilver/template/login_forum.html b/phpBB/styles/prosilver/template/login_forum.html
index 7fa9736a96..a1239c4349 100644
--- a/phpBB/styles/prosilver/template/login_forum.html
+++ b/phpBB/styles/prosilver/template/login_forum.html
@@ -27,7 +27,7 @@
 			{S_LOGIN_REDIRECT}
 			<dl>
 				<dt>&nbsp;</dt>
-				<dd>{S_HIDDEN_FIELDS}<input type="submit" name="login" id="login" class="button1" value="{L_LOGIN}" tabindex="2" /></dd>
+				<dd>{S_HIDDEN_FIELDS}<input type="submit" name="login" id="login" class="button1 button button-form" value="{L_LOGIN}" tabindex="2" /></dd>
 			</dl>
 		</fieldset>
 	</div>
diff --git a/phpBB/styles/prosilver/template/mcp_approve.html b/phpBB/styles/prosilver/template/mcp_approve.html
index f7874ab90b..2acc4753ab 100644
--- a/phpBB/styles/prosilver/template/mcp_approve.html
+++ b/phpBB/styles/prosilver/template/mcp_approve.html
@@ -19,8 +19,8 @@
 	<!-- ENDIF -->
 
 	<fieldset class="submit-buttons">
-		<input type="button" name="confirm" value="{YES_VALUE}" class="button1" />&nbsp;
-		<input type="button" name="cancel" value="{L_NO}" class="button2" />
+		<input type="button" name="confirm" value="{YES_VALUE}" class="button1 button button-form" />&nbsp;
+		<input type="button" name="cancel" value="{L_NO}" class="button1 button button-form-bold" />
 	</fieldset>
 
 <!-- ELSE -->
@@ -66,8 +66,8 @@
 		</fieldset>
 
 		<fieldset class="submit-buttons">
-			{S_HIDDEN_FIELDS}<input type="submit" name="confirm" value="{YES_VALUE}" class="button1" />&nbsp;
-			<input type="submit" name="cancel" value="{L_NO}" class="button2" />
+			{S_HIDDEN_FIELDS}<input type="submit" name="confirm" value="{YES_VALUE}" class="button1 button button-form" />&nbsp;
+			<input type="submit" name="cancel" value="{L_NO}" class="button1 button button-form-bold" />
 		</fieldset>
 
 	</div>
diff --git a/phpBB/styles/prosilver/template/mcp_ban.html b/phpBB/styles/prosilver/template/mcp_ban.html
index 5b798d9b6c..cbee56a452 100644
--- a/phpBB/styles/prosilver/template/mcp_ban.html
+++ b/phpBB/styles/prosilver/template/mcp_ban.html
@@ -85,8 +85,8 @@
 </div>
 
 <fieldset class="submit-buttons">
-	{S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp;
-	<input type="submit" name="bansubmit" value="{L_SUBMIT}" class="button1" />
+	{S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button1 button button-form-bold" />&nbsp;
+	<input type="submit" name="bansubmit" value="{L_SUBMIT}" class="button1 button button-form" />
 	{S_FORM_TOKEN}
 </fieldset>
 
@@ -122,8 +122,8 @@
 	</div>
 
 	<fieldset class="submit-buttons">
-		{S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp;
-		<input type="submit" name="unbansubmit" value="{L_SUBMIT}" class="button1" />
+		{S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button1 button button-form-bold" />&nbsp;
+		<input type="submit" name="unbansubmit" value="{L_SUBMIT}" class="button1 button button-form" />
 	</fieldset>
 
 	<!-- ELSE -->
diff --git a/phpBB/styles/prosilver/template/mcp_forum.html b/phpBB/styles/prosilver/template/mcp_forum.html
index f6c518e1df..a41fea8294 100644
--- a/phpBB/styles/prosilver/template/mcp_forum.html
+++ b/phpBB/styles/prosilver/template/mcp_forum.html
@@ -142,7 +142,7 @@
 		<!-- IF S_CAN_MAKE_ANNOUNCE_GLOBAL --><option value="make_global">{L_MAKE_GLOBAL}</option><!-- ENDIF -->
 		<!-- EVENT mcp_forum_actions_append -->
 	</select>
-	<input class="button2" type="submit" value="{L_SUBMIT}" />
+	<input class="button1 button button-form-bold" type="submit" value="{L_SUBMIT}" />
 	<div><a href="#" onclick="marklist('mcp', 'topic_id_list', true); return false;">{L_MARK_ALL}</a> :: <a href="#" onclick="marklist('mcp', 'topic_id_list', false); return false;">{L_UNMARK_ALL}</a></div>
 	<!-- ENDIF -->
 	{S_FORM_TOKEN}
diff --git a/phpBB/styles/prosilver/template/mcp_front.html b/phpBB/styles/prosilver/template/mcp_front.html
index 97775814db..d401330d74 100644
--- a/phpBB/styles/prosilver/template/mcp_front.html
+++ b/phpBB/styles/prosilver/template/mcp_front.html
@@ -53,8 +53,8 @@
 	<!-- IF .unapproved -->
 	<fieldset class="display-actions">
 		{S_HIDDEN_FIELDS}
-		<input class="button2" type="submit" name="action[disapprove]" value="{L_DISAPPROVE}" />&nbsp;
-		<input class="button1" type="submit" name="action[approve]" value="{L_APPROVE}" />
+		<input class="button1 button button-form-bold" type="submit" name="action[disapprove]" value="{L_DISAPPROVE}" />&nbsp;
+		<input class="button1 button button-form" type="submit" name="action[approve]" value="{L_APPROVE}" />
 		<div><a href="#" onclick="marklist('mcp_queue', 'post_id_list', true); return false;">{L_MARK_ALL}</a> :: <a href="#" onclick="marklist('mcp_queue', 'post_id_list', false); return false;">{L_UNMARK_ALL}</a></div>
 	</fieldset>
 	<!-- ENDIF -->
diff --git a/phpBB/styles/prosilver/template/mcp_logs.html b/phpBB/styles/prosilver/template/mcp_logs.html
index 03216b4f38..d693ca0fed 100644
--- a/phpBB/styles/prosilver/template/mcp_logs.html
+++ b/phpBB/styles/prosilver/template/mcp_logs.html
@@ -8,7 +8,7 @@
 	<div class="inner">
 
 	<div class="action-bar bar-top">
-		{L_SEARCH_KEYWORDS}{L_COLON} <input type="search" class="inputbox autowidth" name="keywords" value="{S_KEYWORDS}" />&nbsp;<input type="submit" class="button2" name="filter" value="{L_SEARCH}" />
+		{L_SEARCH_KEYWORDS}{L_COLON} <input type="search" class="inputbox autowidth" name="keywords" value="{S_KEYWORDS}" />&nbsp;<input type="submit" class="button1 button button-form-bold" name="filter" value="{L_SEARCH}" />
 		<div class="pagination">
 			{TOTAL}
 			<!-- IF .pagination -->
@@ -70,8 +70,8 @@
 
 		<!-- IF S_CLEAR_ALLOWED -->
 			<fieldset class="display-actions">
-				<input class="button2" type="submit" name="action[del_all]" value="{L_DELETE_ALL}" />
-				&nbsp;<input class="button1" type="submit" value="{L_DELETE_MARKED}" name="action[del_marked]" />
+				<input class="button1 button button-form-bold" type="submit" name="action[del_all]" value="{L_DELETE_ALL}" />
+				&nbsp;<input class="button1 button button-form" type="submit" value="{L_DELETE_MARKED}" name="action[del_marked]" />
 
 				<div><a href="#" onclick="marklist('mcp', 'mark', true); return false;">{L_MARK_ALL}</a> :: <a href="#" onclick="marklist('mcp', 'mark', false); return false;">{L_UNMARK_ALL}</a></div>
 			</fieldset>
diff --git a/phpBB/styles/prosilver/template/mcp_move.html b/phpBB/styles/prosilver/template/mcp_move.html
index 45a9ae83bc..d8e39f5b99 100644
--- a/phpBB/styles/prosilver/template/mcp_move.html
+++ b/phpBB/styles/prosilver/template/mcp_move.html
@@ -23,8 +23,8 @@
 	<!-- ENDIF -->
 
 	<fieldset class="submit-buttons">
-		<input type="button" name="confirm" value="{YES_VALUE}" class="button1" />&nbsp;
-		<input type="button" name="cancel" value="{L_NO}" class="button2" />
+		<input type="button" name="confirm" value="{YES_VALUE}" class="button1 button button-form" />&nbsp;
+		<input type="button" name="cancel" value="{L_NO}" class="button1 button button-form-bold" />
 	</fieldset>
 
 <!-- ELSE -->
@@ -56,8 +56,8 @@
 		</fieldset>
 
 		<fieldset class="submit-buttons">
-			{S_HIDDEN_FIELDS}<input type="submit" name="confirm" value="{YES_VALUE}" class="button1" />&nbsp;
-			<input type="submit" name="cancel" value="{L_NO}" class="button2" />
+			{S_HIDDEN_FIELDS}<input type="submit" name="confirm" value="{YES_VALUE}" class="button1 button button-form" />&nbsp;
+			<input type="submit" name="cancel" value="{L_NO}" class="button1 button button-form-bold" />
 			{S_FORM_TOKEN}
 		</fieldset>
 
diff --git a/phpBB/styles/prosilver/template/mcp_notes_front.html b/phpBB/styles/prosilver/template/mcp_notes_front.html
index 11f362376d..ee985a53da 100644
--- a/phpBB/styles/prosilver/template/mcp_notes_front.html
+++ b/phpBB/styles/prosilver/template/mcp_notes_front.html
@@ -19,8 +19,8 @@
 </div>
 
 <fieldset class="submit-buttons">
-	<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp;
-	<input type="submit" name="submituser" value="{L_SUBMIT}" class="button1" />
+	<input type="reset" value="{L_RESET}" name="reset" class="button1 button button-form-bold" />&nbsp;
+	<input type="submit" name="submituser" value="{L_SUBMIT}" class="button1 button button-form" />
 	{S_FORM_TOKEN}
 </fieldset>
 </form>
diff --git a/phpBB/styles/prosilver/template/mcp_notes_user.html b/phpBB/styles/prosilver/template/mcp_notes_user.html
index 62d0562a46..6d318dda97 100644
--- a/phpBB/styles/prosilver/template/mcp_notes_user.html
+++ b/phpBB/styles/prosilver/template/mcp_notes_user.html
@@ -42,8 +42,8 @@
 </div>
 
 <fieldset class="submit-buttons">
-	{S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp;
-	<input type="submit" name="action[add_feedback]" value="{L_SUBMIT}" class="button1" />
+	{S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button1 button button-form-bold" />&nbsp;
+	<input type="submit" name="action[add_feedback]" value="{L_SUBMIT}" class="button1 button button-form" />
 	{S_FORM_TOKEN}
 </fieldset>
 
@@ -51,7 +51,7 @@
 	<div class="inner">
 
 	<div class="action-bar bar-top">
-		{L_SEARCH_KEYWORDS}{L_COLON} <input type="search" class="inputbox autowidth" name="keywords" value="{S_KEYWORDS}" />&nbsp;<input type="submit" class="button2" name="filter" value="{L_SEARCH}" />
+		{L_SEARCH_KEYWORDS}{L_COLON} <input type="search" class="inputbox autowidth" name="keywords" value="{S_KEYWORDS}" />&nbsp;<input type="submit" class="button1 button button-form-bold" name="filter" value="{L_SEARCH}" />
 		<div class="pagination">
 			{TOTAL_REPORTS}
 			<!-- IF .pagination -->
@@ -108,8 +108,8 @@
 
 <!-- IF S_CLEAR_ALLOWED -->
 <fieldset class="display-actions">
-	<input class="button2" type="submit" name="action[del_all]" value="{L_DELETE_ALL}" />
-	&nbsp;<input class="button1" type="submit" name="action[del_marked]" value="{L_DELETE_MARKED}" />
+	<input class="button1 button button-form-bold" type="submit" name="action[del_all]" value="{L_DELETE_ALL}" />
+	&nbsp;<input class="button1 button button-form" type="submit" name="action[del_marked]" value="{L_DELETE_MARKED}" />
 </fieldset>
 
 <fieldset class="display-actions">
diff --git a/phpBB/styles/prosilver/template/mcp_post.html b/phpBB/styles/prosilver/template/mcp_post.html
index a0de554e21..b218bb1d0c 100644
--- a/phpBB/styles/prosilver/template/mcp_post.html
+++ b/phpBB/styles/prosilver/template/mcp_post.html
@@ -32,9 +32,9 @@
 
 	<fieldset class="submit-buttons">
 		<!-- IF not S_REPORT_CLOSED -->
-			<input class="button1" type="submit" value="{L_CLOSE_REPORT}" name="action[close]" /> &nbsp;
+			<input class="button1 button button-form" type="submit" value="{L_CLOSE_REPORT}" name="action[close]" /> &nbsp;
 		<!-- ENDIF -->
-		<input class="button2" type="submit" value="{L_DELETE_REPORT}" name="action[delete]" />
+		<input class="button1 button button-form-bold" type="submit" value="{L_DELETE_REPORT}" name="action[delete]" />
 		<input type="hidden" name="report_id_list[]" value="{REPORT_ID}" />
 		{S_FORM_TOKEN}
 	</fieldset>
@@ -80,8 +80,8 @@
 			<form method="post" id="mcp_approve" action="{U_APPROVE_ACTION}">
 
 			<p class="post-notice unapproved">
-				<input class="button2" type="submit" value="{L_DISAPPROVE}" name="action[disapprove]" /> &nbsp;
-				<input class="button1" type="submit" value="{L_APPROVE}" name="action[approve]" />
+				<input class="button1 button button-form-bold" type="submit" value="{L_DISAPPROVE}" name="action[disapprove]" /> &nbsp;
+				<input class="button1 button button-form" type="submit" value="{L_APPROVE}" name="action[approve]" />
 				<!-- IF not S_FIRST_POST --><input type="hidden" name="mode" value="unapproved_posts" /><!-- ENDIF -->
 				<input type="hidden" name="post_id_list[]" value="{POST_ID}" />
 				{S_FORM_TOKEN}
@@ -91,8 +91,8 @@
 			<form method="post" id="mcp_approve" action="{U_APPROVE_ACTION}">
 
 			<p class="post-notice deleted">
-				<!-- IF S_CAN_DELETE_POST --><input class="button2" type="submit" value="{L_DELETE}" name="action[delete]" /> &nbsp;<!-- ENDIF -->
-				<input class="button1" type="submit" value="{L_RESTORE}" name="action[restore]" />
+				<!-- IF S_CAN_DELETE_POST --><input class="button1 button button-form-bold" type="submit" value="{L_DELETE}" name="action[delete]" /> &nbsp;<!-- ENDIF -->
+				<input class="button1 button button-form" type="submit" value="{L_RESTORE}" name="action[restore]" />
 				<!-- IF not S_FIRST_POST --><input type="hidden" name="mode" value="deleted_posts" /><!-- ENDIF -->
 				<input type="hidden" name="post_id_list[]" value="{POST_ID}" />
 				{S_FORM_TOKEN}
@@ -155,10 +155,10 @@
 			<fieldset>
 			<dl>
 				<dt><label>{L_CHANGE_POSTER}{L_COLON}</label></dt>
-				<!-- IF S_USER_SELECT --><dd><select name="u">{S_USER_SELECT}</select> <input type="submit" class="button2" name="action[chgposter_ip]" value="{L_CONFIRM}" /></dd><!-- ENDIF -->
+				<!-- IF S_USER_SELECT --><dd><select name="u">{S_USER_SELECT}</select> <input type="submit" class="button1 button button-form-bold" name="action[chgposter_ip]" value="{L_CONFIRM}" /></dd><!-- ENDIF -->
 				<dd style="margin-top:3px;">
 					<input class="inputbox autowidth" type="text" name="username" value="" />
-					<input type="submit" class="button2" name="action[chgposter]" value="{L_CONFIRM}" />
+					<input type="submit" class="button1 button button-form-bold" name="action[chgposter]" value="{L_CONFIRM}" />
 					<br />
 					<span>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</span>
 				</dd>
@@ -179,7 +179,7 @@
 				<dd><select name="action">
 					<!-- IF S_CAN_LOCK_POST --><!-- IF S_POST_LOCKED --><option value="unlock_post">{L_UNLOCK_POST} [{L_UNLOCK_POST_EXPLAIN}]</option><!-- ELSE --><option value="lock_post">{L_LOCK_POST} [{L_LOCK_POST_EXPLAIN}]</option><!-- ENDIF --><!-- ENDIF -->
 					<!-- IF S_CAN_DELETE_POST --><option value="delete_post">{L_DELETE_POST}</option><!-- ENDIF -->
-					</select> <input class="button2" type="submit" value="{L_SUBMIT}" />
+					</select> <input class="button1 button button-form-bold" type="submit" value="{L_SUBMIT}" />
 				</dd>
 			</dl>
 			{S_FORM_TOKEN}
@@ -224,8 +224,8 @@
 
 				<!-- IF S_CLEAR_ALLOWED -->
 					<fieldset class="submit-buttons">
-						<input class="button2" type="submit" name="action[del_all]" value="{L_DELETE_ALL}" />&nbsp;
-						<input class="button2" type="submit" name="action[del_marked]" value="{L_DELETE_MARKED}" />
+						<input class="button1 button button-form-bold" type="submit" name="action[del_all]" value="{L_DELETE_ALL}" />&nbsp;
+						<input class="button1 button button-form-bold" type="submit" name="action[del_marked]" value="{L_DELETE_MARKED}" />
 					</fieldset>
 				<!-- ENDIF -->
 			<!-- ENDIF -->
@@ -238,8 +238,8 @@
 			</fieldset>
 
 			<fieldset class="submit-buttons">
-				<input class="button1" type="submit" name="action[add_feedback]" value="{L_SUBMIT}" />&nbsp;
-				<input class="button2" type="reset" value="{L_RESET}" />
+				<input class="button1 button button-form" type="submit" name="action[add_feedback]" value="{L_SUBMIT}" />&nbsp;
+				<input class="button1 button button-form-bold" type="reset" value="{L_RESET}" />
 				{S_FORM_TOKEN}
 			</fieldset>
 			</form>
diff --git a/phpBB/styles/prosilver/template/mcp_queue.html b/phpBB/styles/prosilver/template/mcp_queue.html
index ee69bf448d..a0fa8ee839 100644
--- a/phpBB/styles/prosilver/template/mcp_queue.html
+++ b/phpBB/styles/prosilver/template/mcp_queue.html
@@ -4,7 +4,7 @@
 
 <fieldset class="forum-selection">
 	<label for="fo">{L_FORUM}{L_COLON} <select name="f" id="fo">{S_FORUM_OPTIONS}</select></label>
-	<input type="submit" name="sort" value="{L_GO}" class="button2" />
+	<input type="submit" name="sort" value="{L_GO}" class="button1 button button-form-bold" />
 	{S_FORM_TOKEN}
 </fieldset>
 
@@ -103,11 +103,11 @@
 <!-- IF .postrow -->
 	<fieldset class="display-actions">
 		<!-- IF S_RESTORE -->
-		<input class="button2" type="submit" name="action[delete]" value="{L_DELETE}" />&nbsp;
-		<input class="button1" type="submit" name="action[restore]" value="{L_RESTORE}" />
+		<input class="button1 button button-form-bold" type="submit" name="action[delete]" value="{L_DELETE}" />&nbsp;
+		<input class="button1 button button-form" type="submit" name="action[restore]" value="{L_RESTORE}" />
 		<!-- ELSE -->
-		<input class="button2" type="submit" name="action[disapprove]" value="{L_DISAPPROVE}" />&nbsp;
-		<input class="button1" type="submit" name="action[approve]" value="{L_APPROVE}" />
+		<input class="button1 button button-form-bold" type="submit" name="action[disapprove]" value="{L_DISAPPROVE}" />&nbsp;
+		<input class="button1 button button-form" type="submit" name="action[approve]" value="{L_APPROVE}" />
 		<!-- ENDIF -->
 		<div>
 			<!-- IF S_TOPICS -->
diff --git a/phpBB/styles/prosilver/template/mcp_reports.html b/phpBB/styles/prosilver/template/mcp_reports.html
index e7e0a5c9ba..9b7d8963d4 100644
--- a/phpBB/styles/prosilver/template/mcp_reports.html
+++ b/phpBB/styles/prosilver/template/mcp_reports.html
@@ -5,7 +5,7 @@
 <!-- IF not S_PM -->
 <fieldset class="forum-selection">
 	<label for="fo">{L_FORUM}{L_COLON} <select name="f" id="fo">{S_FORUM_OPTIONS}</select></label>
-	<input type="submit" name="sort" value="{L_GO}" class="button2" />
+	<input type="submit" name="sort" value="{L_GO}" class="button1 button button-form-bold" />
 	{S_FORM_TOKEN}
 </fieldset>
 <!-- ENDIF -->
@@ -102,8 +102,8 @@
 
 <!-- IF .postrow -->
 	<fieldset class="display-actions">
-		<input class="button2" type="submit" value="{L_DELETE_REPORTS}" name="action[delete]" />
-		<!-- IF not S_CLOSED -->&nbsp;<input class="button1" type="submit" name="action[close]" value="{L_CLOSE_REPORTS}" /><!-- ENDIF -->
+		<input class="button1 button button-form-bold" type="submit" value="{L_DELETE_REPORTS}" name="action[delete]" />
+		<!-- IF not S_CLOSED -->&nbsp;<input class="button1 button button-form" type="submit" name="action[close]" value="{L_CLOSE_REPORTS}" /><!-- ENDIF -->
 		<div><a href="#" onclick="marklist('mcp', 'report_id_list', true); return false;">{L_MARK_ALL}</a> :: <a href="#" onclick="marklist('mcp', 'report_id_list', false); return false;">{L_UNMARK_ALL}</a></div>
 	</fieldset>
 <!-- ENDIF -->
diff --git a/phpBB/styles/prosilver/template/mcp_topic.html b/phpBB/styles/prosilver/template/mcp_topic.html
index d64c9c9a21..20473d058c 100644
--- a/phpBB/styles/prosilver/template/mcp_topic.html
+++ b/phpBB/styles/prosilver/template/mcp_topic.html
@@ -38,7 +38,7 @@
 	</dl>
 	<dl>
 		<dt><label>{L_DISPLAY_POSTS}{L_COLON}</label></dt>
-		<dd>{S_SELECT_SORT_DAYS}&nbsp;&nbsp;<label>{L_SORT_BY} {S_SELECT_SORT_KEY}</label><label>{S_SELECT_SORT_DIR}</label> <input type="submit" name="sort" value="{L_GO}" class="button2" /></dd>
+		<dd>{S_SELECT_SORT_DAYS}&nbsp;&nbsp;<label>{L_SORT_BY} {S_SELECT_SORT_KEY}</label><label>{S_SELECT_SORT_DIR}</label> <input type="submit" name="sort" value="{L_GO}" class="button1 button button-form-bold" /></dd>
 	</dl>
 	</fieldset>
 
@@ -184,7 +184,7 @@
 		<!-- IF S_CAN_SPLIT --><option value="split_all"<!-- IF S_SPLIT_VIEW --> selected="selected"<!-- ENDIF -->>{L_SPLIT_POSTS}</option><option value="split_beyond">{L_SPLIT_AFTER}</option><!-- ENDIF -->
 		<!-- IF S_CAN_SYNC --><option value="resync">{L_RESYNC}</option><!-- ENDIF -->
 	</select>&nbsp;
-	<input class="button1" type="submit" name="mcp_topic_submit" value="{L_SUBMIT}" />
+	<input class="button1 button button-form" type="submit" name="mcp_topic_submit" value="{L_SUBMIT}" />
 	<div><a href="#" onclick="marklist('mcp', 'post', true); return false;">{L_MARK_ALL}</a> :: <a href="#" onclick="marklist('mcp', 'post', false); return false;">{L_UNMARK_ALL}</a></div>
 {S_HIDDEN_FIELDS}
 {S_FORM_TOKEN}
diff --git a/phpBB/styles/prosilver/template/mcp_warn_front.html b/phpBB/styles/prosilver/template/mcp_warn_front.html
index 9b188b52ac..5514f3069f 100644
--- a/phpBB/styles/prosilver/template/mcp_warn_front.html
+++ b/phpBB/styles/prosilver/template/mcp_warn_front.html
@@ -21,8 +21,8 @@
 </div>
 
 <fieldset class="submit-buttons">
-	<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp;
-	<input type="submit" name="submituser" value="{L_SUBMIT}" class="button1" />
+	<input type="reset" value="{L_RESET}" name="reset" class="button1 button button-form-bold" />&nbsp;
+	<input type="submit" name="submituser" value="{L_SUBMIT}" class="button1 button button-form" />
 	{S_FORM_TOKEN}
 </fieldset>
 </form>
diff --git a/phpBB/styles/prosilver/template/mcp_warn_post.html b/phpBB/styles/prosilver/template/mcp_warn_post.html
index 5e39480658..6c5b67f501 100644
--- a/phpBB/styles/prosilver/template/mcp_warn_post.html
+++ b/phpBB/styles/prosilver/template/mcp_warn_post.html
@@ -69,8 +69,8 @@
 <!-- EVENT mcp_warn_post_add_warning_field_after -->
 
 <fieldset class="submit-buttons">
-	<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp;
-	<input type="submit" name="action[add_warning]" value="{L_SUBMIT}" class="button1" />
+	<input type="reset" value="{L_RESET}" name="reset" class="button1 button button-form-bold" />&nbsp;
+	<input type="submit" name="action[add_warning]" value="{L_SUBMIT}" class="button1 button button-form" />
 	{S_FORM_TOKEN}
 </fieldset>
 </form>
diff --git a/phpBB/styles/prosilver/template/mcp_warn_user.html b/phpBB/styles/prosilver/template/mcp_warn_user.html
index f4dbf2819e..8f7391e7b8 100644
--- a/phpBB/styles/prosilver/template/mcp_warn_user.html
+++ b/phpBB/styles/prosilver/template/mcp_warn_user.html
@@ -53,8 +53,8 @@
 <!-- EVENT mcp_warn_user_add_warning_field_after -->
 
 <fieldset class="submit-buttons">
-	<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp;
-	<input type="submit" name="action[add_warning]" value="{L_SUBMIT}" class="button1" />
+	<input type="reset" value="{L_RESET}" name="reset" class="button1 button button-form-bold" />&nbsp;
+	<input type="submit" name="action[add_warning]" value="{L_SUBMIT}" class="button1 button button-form" />
 	{S_FORM_TOKEN}
 </fieldset>
 </form>
diff --git a/phpBB/styles/prosilver/template/memberlist_body.html b/phpBB/styles/prosilver/template/memberlist_body.html
index 255e6746e1..4c47a5d511 100644
--- a/phpBB/styles/prosilver/template/memberlist_body.html
+++ b/phpBB/styles/prosilver/template/memberlist_body.html
@@ -125,7 +125,7 @@
 
 <!-- IF S_IN_SEARCH_POPUP and not S_SELECT_SINGLE -->
 <fieldset class="display-actions">
-	<input type="submit" name="submit" value="{L_SELECT_MARKED}" class="button2" />
+	<input type="submit" name="submit" value="{L_SELECT_MARKED}" class="button1 button button-form-bold" />
 	<div><a href="#" onclick="marklist('results', 'user', true); return false;">{L_MARK_ALL}</a> &bull; <a href="#" onclick="marklist('results', 'user', false); return false;">{L_UNMARK_ALL}</a></div>
 </fieldset>
 <!-- ENDIF -->
@@ -139,7 +139,7 @@
 <fieldset class="display-options">
 	<label for="sk">{L_SELECT_SORT_METHOD}{L_COLON} <select name="sk" id="sk">{S_MODE_SELECT}</select></label>
 	<label for="sd">{L_ORDER} <select name="sd" id="sd">{S_ORDER_SELECT}</select></label>
-	<input type="submit" name="sort" value="{L_SUBMIT}" class="button2" />
+	<input type="submit" name="sort" value="{L_SUBMIT}" class="button1 button button-form-bold" />
 </fieldset>
 <!-- ENDIF -->
 
diff --git a/phpBB/styles/prosilver/template/memberlist_email.html b/phpBB/styles/prosilver/template/memberlist_email.html
index eea699da08..29a886e2a8 100644
--- a/phpBB/styles/prosilver/template/memberlist_email.html
+++ b/phpBB/styles/prosilver/template/memberlist_email.html
@@ -95,7 +95,7 @@
 	<div class="inner">
 	<div class="content">
 		<fieldset class="submit-buttons">
-			<input type="submit" tabindex="6" name="submit" class="button1" value="{L_SEND_EMAIL}" />
+			<input type="submit" tabindex="6" name="submit" class="button1 button button-form" value="{L_SEND_EMAIL}" />
 		</fieldset>
 	</div>
 	</div>
diff --git a/phpBB/styles/prosilver/template/memberlist_im.html b/phpBB/styles/prosilver/template/memberlist_im.html
index 874607d913..f91454aacb 100644
--- a/phpBB/styles/prosilver/template/memberlist_im.html
+++ b/phpBB/styles/prosilver/template/memberlist_im.html
@@ -26,7 +26,7 @@
 		</dl>
 		<dl class="fields2">
 			<dt>&nbsp;</dt>
-			<dd><input class="button1" name="submit" type="submit" value="{L_IM_SEND}" /></dd>
+			<dd><input class="button1 button button-form" name="submit" type="submit" value="{L_IM_SEND}" /></dd>
 		</dl>
 	<!-- ELSE IF S_NO_SEND_JABBER -->
 		<dl class="fields2">
diff --git a/phpBB/styles/prosilver/template/memberlist_search.html b/phpBB/styles/prosilver/template/memberlist_search.html
index b1c7a81709..ecdb9fa281 100644
--- a/phpBB/styles/prosilver/template/memberlist_search.html
+++ b/phpBB/styles/prosilver/template/memberlist_search.html
@@ -76,8 +76,8 @@
 	<hr />
 
 	<fieldset class="submit-buttons">
-		<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp;
-		<input type="submit" name="submit" value="{L_SEARCH}" class="button1" />
+		<input type="reset" value="{L_RESET}" name="reset" class="button1 button button-form-bold" />&nbsp;
+		<input type="submit" name="submit" value="{L_SEARCH}" class="button1 button button-form" />
 		{S_FORM_TOKEN}
 	</fieldset>
 
diff --git a/phpBB/styles/prosilver/template/memberlist_view.html b/phpBB/styles/prosilver/template/memberlist_view.html
index a7439bc759..568cb92ae9 100644
--- a/phpBB/styles/prosilver/template/memberlist_view.html
+++ b/phpBB/styles/prosilver/template/memberlist_view.html
@@ -35,7 +35,7 @@
 		<!-- ENDIF -->
 		<!-- IF S_USER_INACTIVE --><dt>{L_USER_IS_INACTIVE}{L_COLON}</dt> <dd>{USER_INACTIVE_REASON}</dd><!-- ENDIF -->
 		<!-- IF AGE !== '' --><dt>{L_AGE}{L_COLON}</dt> <dd>{AGE}</dd><!-- ENDIF -->
-		<!-- IF S_GROUP_OPTIONS --><dt>{L_USERGROUPS}{L_COLON}</dt> <dd><select name="g">{S_GROUP_OPTIONS}</select> <input type="submit" name="submit" value="{L_GO}" class="button2" /></dd><!-- ENDIF -->
+		<!-- IF S_GROUP_OPTIONS --><dt>{L_USERGROUPS}{L_COLON}</dt> <dd><select name="g">{S_GROUP_OPTIONS}</select> <input type="submit" name="submit" value="{L_GO}" class="button1 button button-form-bold" /></dd><!-- ENDIF -->
 		<!-- EVENT memberlist_view_non_contact_custom_fields_before -->
 		<!-- BEGIN custom_fields -->
 			<!-- IF not custom_fields.S_PROFILE_CONTACT -->
diff --git a/phpBB/styles/prosilver/template/pagination.html b/phpBB/styles/prosilver/template/pagination.html
index 5d484517ad..4e7297dafc 100644
--- a/phpBB/styles/prosilver/template/pagination.html
+++ b/phpBB/styles/prosilver/template/pagination.html
@@ -8,7 +8,7 @@
 				<li>{L_JUMP_TO_PAGE}{L_COLON}</li>
 				<li class="page-jump-form">
 					<input type="number" name="page-number" min="1" max="999999" title="{L_JUMP_PAGE}" class="inputbox tiny" data-per-page="{PER_PAGE}" data-base-url="{BASE_URL|e('html_attr')}" data-start-name="{START_NAME}" />
-					<input class="button2" value="{L_GO}" type="button" />
+					<input class="button1 button button-form-bold" value="{L_GO}" type="button" />
 				</li>
 			</ul>
 		</div>
diff --git a/phpBB/styles/prosilver/template/posting_attach_body.html b/phpBB/styles/prosilver/template/posting_attach_body.html
index 618ac95656..a7e20530cd 100644
--- a/phpBB/styles/prosilver/template/posting_attach_body.html
+++ b/phpBB/styles/prosilver/template/posting_attach_body.html
@@ -8,7 +8,7 @@
 		<dt><label for="fileupload">{L_FILENAME}{L_COLON}</label></dt>
 		<dd>
 			<input type="file" name="fileupload" id="fileupload" class="inputbox autowidth" />
-			<input type="submit" name="add_file" value="{L_ADD_FILE}" class="button2" onclick="upload = true;" />
+			<input type="submit" name="add_file" value="{L_ADD_FILE}" class="button1 button button-form-bold" onclick="upload = true;" />
 		</dd>
 	</dl>
 	<dl>
@@ -18,7 +18,7 @@
 	</fieldset>
 
 	<div id="attach-panel-multi" class="attach-panel-multi">
-		<input type="button" class="button2" value="{L_PLUPLOAD_ADD_FILES}" id="add_files" />
+		<input type="button" class="button1 button button-form-bold" value="{L_PLUPLOAD_ADD_FILES}" id="add_files" />
 	</div>
 
 	<div class="panel<!-- IF not .attach_row --> hidden<!-- ENDIF --> file-list-container" id="file-list-container">
@@ -37,8 +37,8 @@
 							<td class="attach-name">
 								<span class="file-name ellipsis-text"></span>
 								<span class="attach-controls">
-									<input type="button" value="{L_PLACE_INLINE}" class="button2 hidden file-inline-bbcode" />&nbsp;
-									<input type="button" value="{L_DELETE_FILE}" class="button2 file-delete" />
+									<input type="button" value="{L_PLACE_INLINE}" class="button1 button button-form-bold hidden file-inline-bbcode" />&nbsp;
+									<input type="button" value="{L_DELETE_FILE}" class="button1 button button-form-bold file-delete" />
 								</span>
 								<span class="clear"></span>
 							</td>
@@ -60,8 +60,8 @@
 							<td class="attach-name">
 								<span class="file-name ellipsis-text"><a href="{attach_row.U_VIEW_ATTACHMENT}">{attach_row.FILENAME}</a></span>
 								<span class="attach-controls">
-									<!-- IF S_INLINE_ATTACHMENT_OPTIONS --><input type="button" value="{L_PLACE_INLINE}" class="button2 file-inline-bbcode" />&nbsp; <!-- ENDIF -->
-									<input type="submit" name="delete_file[{attach_row.ASSOC_INDEX}]" value="{L_DELETE_FILE}" class="button2 file-delete" />
+									<!-- IF S_INLINE_ATTACHMENT_OPTIONS --><input type="button" value="{L_PLACE_INLINE}" class="button1 button button-form-bold file-inline-bbcode" />&nbsp; <!-- ENDIF -->
+									<input type="submit" name="delete_file[{attach_row.ASSOC_INDEX}]" value="{L_DELETE_FILE}" class="button1 button button-form-bold file-delete" />
 								</span>
 								<span class="clear"></span>
 							</td>
diff --git a/phpBB/styles/prosilver/template/posting_editor.html b/phpBB/styles/prosilver/template/posting_editor.html
index d963c98e08..49fff3fb08 100644
--- a/phpBB/styles/prosilver/template/posting_editor.html
+++ b/phpBB/styles/prosilver/template/posting_editor.html
@@ -94,10 +94,10 @@
 			{S_HIDDEN_ADDRESS_FIELD}
 			{S_HIDDEN_FIELDS}
 			<!-- EVENT posting_editor_submit_buttons -->
-			<!-- IF S_HAS_DRAFTS --><input type="submit" accesskey="d" tabindex="8" name="load" value="{L_LOAD_DRAFT}" class="button2" onclick="load_draft = true;" />&nbsp; <!-- ENDIF -->
-			<!-- IF S_SAVE_ALLOWED --><input type="submit" accesskey="k" tabindex="7" name="save" value="{L_SAVE_DRAFT}" class="button2" />&nbsp; <!-- ENDIF -->
-			<input type="submit" tabindex="5" name="preview" value="{L_PREVIEW}" class="button1"<!-- IF not S_PRIVMSGS --> onclick="document.getElementById('postform').action += '#preview';"<!-- ENDIF --> />&nbsp;
-			<input type="submit" accesskey="s" tabindex="6" name="post" value="{L_SUBMIT}" class="button1 default-submit-action" />&nbsp;
+			<!-- IF S_HAS_DRAFTS --><input type="submit" accesskey="d" tabindex="8" name="load" value="{L_LOAD_DRAFT}" class="button1 button button-form-bold" onclick="load_draft = true;" />&nbsp; <!-- ENDIF -->
+			<!-- IF S_SAVE_ALLOWED --><input type="submit" accesskey="k" tabindex="7" name="save" value="{L_SAVE_DRAFT}" class="button1 button button-form-bold" />&nbsp; <!-- ENDIF -->
+			<input type="submit" tabindex="5" name="preview" value="{L_PREVIEW}" class="button1 button button-form"<!-- IF not S_PRIVMSGS --> onclick="document.getElementById('postform').action += '#preview';"<!-- ENDIF --> />&nbsp;
+			<input type="submit" accesskey="s" tabindex="6" name="post" value="{L_SUBMIT}" class="button1 button button-form default-submit-action" />&nbsp;
 
 		</fieldset>
 
diff --git a/phpBB/styles/prosilver/template/posting_layout.html b/phpBB/styles/prosilver/template/posting_layout.html
index bca9195f0e..985f92b23d 100644
--- a/phpBB/styles/prosilver/template/posting_layout.html
+++ b/phpBB/styles/prosilver/template/posting_layout.html
@@ -51,7 +51,7 @@
 
 			<dl>
 				<dt>&nbsp;</dt>
-				<dd><input class="button1" type="submit" name="post" value="{L_CONFIRM}" /> <input class="button2" type="submit" name="cancel_unglobalise" value="{L_CANCEL}" /></dd>
+				<dd><input class="button1 button button-form" type="submit" name="post" value="{L_CONFIRM}" /> <input class="button1 button button-form-bold" type="submit" name="cancel_unglobalise" value="{L_CANCEL}" /></dd>
 			</dl>
 		</fieldset>
 
diff --git a/phpBB/styles/prosilver/template/posting_pm_header.html b/phpBB/styles/prosilver/template/posting_pm_header.html
index 032d8c6a6f..02c7d80558 100644
--- a/phpBB/styles/prosilver/template/posting_pm_header.html
+++ b/phpBB/styles/prosilver/template/posting_pm_header.html
@@ -13,8 +13,8 @@
 			<dl class="pmlist">
 				<dt><label><strong>{L_TO_ADD_MASS}{L_COLON}</strong><textarea id="username_list" name="username_list" class="inputbox" cols="50" rows="2" tabindex="1"></textarea></label></dt>
 				<dd class="recipients">
-				<input type="submit" name="add_to" value="{L_ADD}" class="button2" tabindex="1" />
-				<input type="submit" name="add_bcc" value="{L_ADD_BCC}" class="button2" tabindex="1" />
+				<input type="submit" name="add_to" value="{L_ADD}" class="button1 button button-form-bold" tabindex="1" />
+				<input type="submit" name="add_bcc" value="{L_ADD_BCC}" class="button1 button button-form-bold" tabindex="1" />
 				<!-- EVENT posting_pm_header_find_username_before -->
 				<span><a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a></span>
 				<!-- EVENT posting_pm_header_find_username_after -->
@@ -31,7 +31,7 @@
 					<ul class="recipients">
 						<!-- BEGIN to_recipient -->
 						<li>
-							<!-- IF not S_EDIT_POST --><input type="submit" name="remove_{to_recipient.TYPE}[{to_recipient.UG_ID}]" value="x" class="button2" /><!-- ENDIF -->
+							<!-- IF not S_EDIT_POST --><input type="submit" name="remove_{to_recipient.TYPE}[{to_recipient.UG_ID}]" value="x" class="button1 button button-form-bold" /><!-- ENDIF -->
 							<!-- IF to_recipient.IS_GROUP --><a href="{to_recipient.U_VIEW}"><strong>{to_recipient.NAME}</strong></a><!-- ELSE -->{to_recipient.NAME_FULL}<!-- ENDIF -->
 						</li>
 						<!-- END to_recipient -->
@@ -48,7 +48,7 @@
 					<ul class="recipients">
 						<!-- BEGIN bcc_recipient -->
 						<li>
-							<!-- IF not S_EDIT_POST --><input type="submit" name="remove_{bcc_recipient.TYPE}[{bcc_recipient.UG_ID}]" value="x" class="button2" /><!-- ENDIF -->
+							<!-- IF not S_EDIT_POST --><input type="submit" name="remove_{bcc_recipient.TYPE}[{bcc_recipient.UG_ID}]" value="x" class="button1 button button-form-bold" /><!-- ENDIF -->
 							<!-- IF bcc_recipient.IS_GROUP --><a href="{bcc_recipient.U_VIEW}"><strong>{bcc_recipient.NAME}</strong></a><!-- ELSE -->{bcc_recipient.NAME_FULL}<!-- ENDIF -->
 						</li>
 						<!-- END bcc_recipient -->
@@ -62,7 +62,7 @@
 			<dl>
 				<dt><label for="username_list">{L_TO_ADD}{L_COLON}</label><!-- IF not S_EDIT_POST --><br /><span><a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false">{L_FIND_USERNAME}</a></span><!-- ENDIF --></dt>
 				<!-- IF not S_EDIT_POST -->
-				<dd><input class="inputbox" type="text" name="username_list" id="username_list" size="20" value="" /> <input type="submit" name="add_to" value="{L_ADD}" class="button2" /></dd>
+				<dd><input class="inputbox" type="text" name="username_list" id="username_list" size="20" value="" /> <input type="submit" name="add_to" value="{L_ADD}" class="button1 button button-form-bold" /></dd>
 				<!-- ENDIF -->
 				<!-- IF .to_recipient -->
 					<dd class="recipients">
@@ -70,7 +70,7 @@
 						<!-- BEGIN to_recipient -->
 						<li>
 							<!-- IF to_recipient.IS_GROUP --><a href="{to_recipient.U_VIEW}"><strong>{to_recipient.NAME}</strong></a><!-- ELSE -->{to_recipient.NAME_FULL}<!-- ENDIF -->&nbsp;
-							<!-- IF not S_EDIT_POST --><input type="submit" name="remove_{to_recipient.TYPE}[{to_recipient.UG_ID}]" value="x" class="button2" /><!-- ENDIF -->
+							<!-- IF not S_EDIT_POST --><input type="submit" name="remove_{to_recipient.TYPE}[{to_recipient.UG_ID}]" value="x" class="button1 button button-form-bold" /><!-- ENDIF -->
 						</li>
 						<!-- END to_recipient -->
 					</dd>
diff --git a/phpBB/styles/prosilver/template/quickreply_editor.html b/phpBB/styles/prosilver/template/quickreply_editor.html
index 9839494491..86cc2a7654 100644
--- a/phpBB/styles/prosilver/template/quickreply_editor.html
+++ b/phpBB/styles/prosilver/template/quickreply_editor.html
@@ -18,8 +18,8 @@
 				<fieldset class="submit-buttons">
 					{S_FORM_TOKEN}
 					{QR_HIDDEN_FIELDS}
-					<input type="submit" accesskey="f" tabindex="6" name="preview" value="{L_FULL_EDITOR}" class="button2" id="qr_full_editor" />&nbsp;
-					<input type="submit" accesskey="s" tabindex="7" name="post" value="{L_SUBMIT}" class="button1" />&nbsp;
+					<input type="submit" accesskey="f" tabindex="6" name="preview" value="{L_FULL_EDITOR}" class="button1 button button-form-bold" id="qr_full_editor" />&nbsp;
+					<input type="submit" accesskey="s" tabindex="7" name="post" value="{L_SUBMIT}" class="button1 button button-form" />&nbsp;
 				</fieldset>
 		</div>
 	</div>
diff --git a/phpBB/styles/prosilver/template/report_body.html b/phpBB/styles/prosilver/template/report_body.html
index 285e8ec8d7..6fb7af7ad2 100644
--- a/phpBB/styles/prosilver/template/report_body.html
+++ b/phpBB/styles/prosilver/template/report_body.html
@@ -42,8 +42,8 @@
 
 	<div class="content">
 		<fieldset class="submit-buttons">
-			<input type="submit" name="submit" class="button1" value="{L_SUBMIT}" />&nbsp;
-			<input type="submit" name="cancel" class="button2" value="{L_CANCEL}" />
+			<input type="submit" name="submit" class="button1 button button-form" value="{L_SUBMIT}" />&nbsp;
+			<input type="submit" name="cancel" class="button1 button button-form-bold" value="{L_CANCEL}" />
 			{S_FORM_TOKEN}
 		</fieldset>
 	</div>
diff --git a/phpBB/styles/prosilver/template/search_body.html b/phpBB/styles/prosilver/template/search_body.html
index 618e2680ba..b194175892 100644
--- a/phpBB/styles/prosilver/template/search_body.html
+++ b/phpBB/styles/prosilver/template/search_body.html
@@ -93,8 +93,8 @@
 	<div class="inner">
 
 	<fieldset class="submit-buttons">
-		{S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp;
-		<input type="submit" name="submit" value="{L_SEARCH}" class="button1" />
+		{S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button1 button button-form-bold" />&nbsp;
+		<input type="submit" name="submit" value="{L_SEARCH}" class="button1 button button-form" />
 	</fieldset>
 
 	</div>
diff --git a/phpBB/styles/prosilver/template/timezone_option.html b/phpBB/styles/prosilver/template/timezone_option.html
index 728dc9487a..01786d5ef4 100644
--- a/phpBB/styles/prosilver/template/timezone_option.html
+++ b/phpBB/styles/prosilver/template/timezone_option.html
@@ -8,7 +8,7 @@
 				<option value="{timezone_date.VALUE}"<!-- IF timezone_date.SELECTED --> selected="selected"<!-- ENDIF -->>{timezone_date.TITLE}</option>
 			<!-- END timezone_date -->
 		</select>
-		<input type="button" id="tz_select_date_suggest" class="button2" style="display: none;" timezone-preselect="<!-- IF S_TZ_PRESELECT -->true<!-- ELSE -->false<!-- ENDIF -->" data-l-suggestion="{L_TIMEZONE_DATE_SUGGESTION}" value="{L_TIMEZONE_DATE_SUGGESTION}" />
+		<input type="button" id="tz_select_date_suggest" class="button1 button button-form-bold" style="display: none;" timezone-preselect="<!-- IF S_TZ_PRESELECT -->true<!-- ELSE -->false<!-- ENDIF -->" data-l-suggestion="{L_TIMEZONE_DATE_SUGGESTION}" value="{L_TIMEZONE_DATE_SUGGESTION}" />
 	</dd>
 	<!-- ENDIF -->
 	<dd>
diff --git a/phpBB/styles/prosilver/template/ucp_agreement.html b/phpBB/styles/prosilver/template/ucp_agreement.html
index 943774c6ec..57f902df62 100644
--- a/phpBB/styles/prosilver/template/ucp_agreement.html
+++ b/phpBB/styles/prosilver/template/ucp_agreement.html
@@ -46,10 +46,10 @@
 		<div class="inner">
 		<fieldset class="submit-buttons">
 			<!-- IF S_SHOW_COPPA -->
-			<strong><a href="{U_COPPA_NO}" class="button1">{L_COPPA_NO}</a></strong>&nbsp; <a href="{U_COPPA_YES}" class="button2">{L_COPPA_YES}</a>
+			<strong><a href="{U_COPPA_NO}" class="button1 button button-form">{L_COPPA_NO}</a></strong>&nbsp; <a href="{U_COPPA_YES}" class="button1 button button-form-bold">{L_COPPA_YES}</a>
 			<!-- ELSE -->
-			<input type="submit" name="agreed" id="agreed" value="{L_AGREE}" class="button1" />&nbsp;
-			<input type="submit" name="not_agreed" value="{L_NOT_AGREE}" class="button2" />
+			<input type="submit" name="agreed" id="agreed" value="{L_AGREE}" class="button1 button button-form" />&nbsp;
+			<input type="submit" name="not_agreed" value="{L_NOT_AGREE}" class="button1 button button-form-bold" />
 			<!-- ENDIF -->
 			{S_HIDDEN_FIELDS}
 			{S_FORM_TOKEN}
@@ -66,7 +66,7 @@
 			<h2 class="sitename-title">{SITENAME} - {AGREEMENT_TITLE}</h2>
 			<p>{AGREEMENT_TEXT}</p>
 			<hr class="dashed" />
-			<p><a href="{U_BACK}" class="button2">{L_BACK}</a></p>
+			<p><a href="{U_BACK}" class="button1 button button-form-bold">{L_BACK}</a></p>
 		</div>
 		</div>
 	</div>
diff --git a/phpBB/styles/prosilver/template/ucp_attachments.html b/phpBB/styles/prosilver/template/ucp_attachments.html
index 696f621116..c13ef0713a 100644
--- a/phpBB/styles/prosilver/template/ucp_attachments.html
+++ b/phpBB/styles/prosilver/template/ucp_attachments.html
@@ -73,7 +73,7 @@
 
 <!-- IF S_ATTACHMENT_ROWS -->
 	<fieldset class="display-actions">
-		<input class="button2" type="submit" name="delete" value="{L_DELETE_MARKED}" />
+		<input class="button1 button button-form-bold" type="submit" name="delete" value="{L_DELETE_MARKED}" />
 		<div><a href="#" onclick="marklist('ucp', 'attachment', true); return false;">{L_MARK_ALL}</a> &bull; <a href="#" onclick="marklist('ucp', 'attachment', false); return false;">{L_UNMARK_ALL}</a></div>
 		{S_FORM_TOKEN}
 	</fieldset>
diff --git a/phpBB/styles/prosilver/template/ucp_auth_link_oauth.html b/phpBB/styles/prosilver/template/ucp_auth_link_oauth.html
index 18316613b0..27124197cd 100644
--- a/phpBB/styles/prosilver/template/ucp_auth_link_oauth.html
+++ b/phpBB/styles/prosilver/template/ucp_auth_link_oauth.html
@@ -10,7 +10,7 @@
 				</dl>
 				<dl>
 					<dt>&nbsp;</dt>
-					<dd><input type="submit" name="submit" tabindex="6" value="{L_UCP_AUTH_LINK_UNLINK}" class="button1" /></dd>
+					<dd><input type="submit" name="submit" tabindex="6" value="{L_UCP_AUTH_LINK_UNLINK}" class="button1 button button-form" /></dd>
 				</dl>
 			<!-- ELSE -->
 				<dl>
@@ -18,7 +18,7 @@
 				</dl>
 				<dl>
 					<dt>&nbsp;</dt>
-					<dd><input type="submit" name="submit" tabindex="6" value="{L_UCP_AUTH_LINK_LINK}" class="button1" /></dd>
+					<dd><input type="submit" name="submit" tabindex="6" value="{L_UCP_AUTH_LINK_LINK}" class="button1 button button-form" /></dd>
 				</dl>
 			<!-- ENDIF -->
 		</fieldset>
diff --git a/phpBB/styles/prosilver/template/ucp_avatar_options.html b/phpBB/styles/prosilver/template/ucp_avatar_options.html
index 2cf9488ed0..8987fecc72 100644
--- a/phpBB/styles/prosilver/template/ucp_avatar_options.html
+++ b/phpBB/styles/prosilver/template/ucp_avatar_options.html
@@ -39,8 +39,8 @@
 	</div>
 <!-- IF not S_GROUP_MANAGE -->
 	<fieldset class="submit-buttons">
-		<input type="reset" value="{L_RESET}" name="reset" class="button2" /> &nbsp;
-		<input type="submit" name="submit" value="{L_SUBMIT}" class="button1" />
+		<input type="reset" value="{L_RESET}" name="reset" class="button1 button button-form-bold" /> &nbsp;
+		<input type="submit" name="submit" value="{L_SUBMIT}" class="button1 button button-form" />
 	</fieldset>
 <!-- ENDIF -->
 	</div>
diff --git a/phpBB/styles/prosilver/template/ucp_avatar_options_local.html b/phpBB/styles/prosilver/template/ucp_avatar_options_local.html
index e431b7425e..ee17902ed5 100644
--- a/phpBB/styles/prosilver/template/ucp_avatar_options_local.html
+++ b/phpBB/styles/prosilver/template/ucp_avatar_options_local.html
@@ -4,7 +4,7 @@
 <option value="{avatar_local_cats.NAME}"<!-- IF avatar_local_cats.SELECTED --> selected="selected"<!-- ENDIF -->>{avatar_local_cats.NAME}</option>
 <!-- END avatar_local_cats -->
 </select></label>
-<input type="submit" value="{L_GO}" name="avatar_local_go" class="button2" />
+<input type="submit" value="{L_GO}" name="avatar_local_go" class="button1 button button-form-bold" />
 
 <div id="gallery" class="gallery">
 <!-- BEGIN avatar_local_row -->
diff --git a/phpBB/styles/prosilver/template/ucp_groups_manage.html b/phpBB/styles/prosilver/template/ucp_groups_manage.html
index f2b4f003e0..514f12562a 100644
--- a/phpBB/styles/prosilver/template/ucp_groups_manage.html
+++ b/phpBB/styles/prosilver/template/ucp_groups_manage.html
@@ -74,8 +74,8 @@
 
 <fieldset class="submit-buttons">
 	{S_HIDDEN_FIELDS}
-	<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp;
-	<input type="submit" name="update" value="{L_SUBMIT}" class="button1" />
+	<input type="reset" value="{L_RESET}" name="reset" class="button1 button button-form-bold" />&nbsp;
+	<input type="submit" name="update" value="{L_SUBMIT}" class="button1 button button-form" />
 	{S_FORM_TOKEN}
 </fieldset>
 
@@ -172,7 +172,7 @@
 
 <fieldset class="display-actions">
 	<select name="action"><option value="">{L_SELECT_OPTION}</option>{S_ACTION_OPTIONS}</select>
-	<input class="button2" type="submit" name="update" value="{L_SUBMIT}" />
+	<input class="button1 button button-form-bold" type="submit" name="update" value="{L_SUBMIT}" />
 	<div><a href="#" onclick="marklist('ucp', 'mark', true); return false;">{L_MARK_ALL}</a> &bull; <a href="#" onclick="marklist('ucp', 'mark', false); return false;">{L_UNMARK_ALL}</a></div>
 </fieldset>
 
@@ -202,7 +202,7 @@
 </div>
 
 <fieldset class="submit-buttons">
-	<input class="button1" type="submit" name="addusers" value="{L_SUBMIT}" />
+	<input class="button1 button button-form" type="submit" name="addusers" value="{L_SUBMIT}" />
 	{S_FORM_TOKEN}
 </fieldset>
 
diff --git a/phpBB/styles/prosilver/template/ucp_groups_membership.html b/phpBB/styles/prosilver/template/ucp_groups_membership.html
index e824a7b867..e25e636391 100644
--- a/phpBB/styles/prosilver/template/ucp_groups_membership.html
+++ b/phpBB/styles/prosilver/template/ucp_groups_membership.html
@@ -149,7 +149,7 @@
 	<fieldset>
 		<!-- IF S_CHANGE_DEFAULT -->
 		<div class="left-box">
-			<input class="button2" type="submit" name="change_default" value="{L_CHANGE_DEFAULT_GROUP}" />
+			<input class="button1 button button-form-bold" type="submit" name="change_default" value="{L_CHANGE_DEFAULT_GROUP}" />
 			{S_FORM_TOKEN}
 		</div>
 		<!-- ENDIF -->
@@ -162,7 +162,7 @@
 				<option value="resign">{L_RESIGN_SELECTED}</option>
 				<option value="demote">{L_DEMOTE_SELECTED}</option>
 			</select>&nbsp;
-			<input class="button2" type="submit" name="submit" value="{L_SUBMIT}" />
+			<input class="button1 button button-form-bold" type="submit" name="submit" value="{L_SUBMIT}" />
 			{S_FORM_TOKEN}
 		</div>
 		<!-- ENDIF -->
diff --git a/phpBB/styles/prosilver/template/ucp_header.html b/phpBB/styles/prosilver/template/ucp_header.html
index 98d2eee1a0..9ebb404dd9 100644
--- a/phpBB/styles/prosilver/template/ucp_header.html
+++ b/phpBB/styles/prosilver/template/ucp_header.html
@@ -69,11 +69,11 @@
 				<dt>{L_FRIENDS}</dt>
 
 				<!-- BEGIN friends_online -->
-					<dd class="friend-online" title="{L_FRIENDS_ONLINE}">{friends_online.USERNAME_FULL} <!-- IF S_SHOW_PM_BOX --> <input type="submit" name="add_to[{friends_online.USER_ID}]" value="{L_ADD}" class="button2" /><!-- ENDIF --><!-- IF friends_online.S_LAST_ROW and .friends_offline --><hr /><!-- ENDIF --></dd>
+					<dd class="friend-online" title="{L_FRIENDS_ONLINE}">{friends_online.USERNAME_FULL} <!-- IF S_SHOW_PM_BOX --> <input type="submit" name="add_to[{friends_online.USER_ID}]" value="{L_ADD}" class="button1 button button-form-bold" /><!-- ENDIF --><!-- IF friends_online.S_LAST_ROW and .friends_offline --><hr /><!-- ENDIF --></dd>
 				<!-- END friends_online -->
 
 				<!-- BEGIN friends_offline -->
-					<dd class="friend-offline" title="{L_FRIENDS_OFFLINE}">{friends_offline.USERNAME_FULL} <!-- IF S_SHOW_PM_BOX --><input type="submit" name="add_to[{friends_offline.USER_ID}]" value="{L_ADD}" class="button2" /><!-- ENDIF --></dd>
+					<dd class="friend-offline" title="{L_FRIENDS_OFFLINE}">{friends_offline.USERNAME_FULL} <!-- IF S_SHOW_PM_BOX --><input type="submit" name="add_to[{friends_offline.USER_ID}]" value="{L_ADD}" class="button1 button button-form-bold" /><!-- ENDIF --></dd>
 				<!-- END friends_offline -->
 			</dl>
 
diff --git a/phpBB/styles/prosilver/template/ucp_login_link.html b/phpBB/styles/prosilver/template/ucp_login_link.html
index be173318cb..10d2d377ec 100644
--- a/phpBB/styles/prosilver/template/ucp_login_link.html
+++ b/phpBB/styles/prosilver/template/ucp_login_link.html
@@ -18,7 +18,7 @@
 			<fieldset class="fields1">
 				<dl>
 					<dt>&nbsp;</dt>
-					<dd>{S_HIDDEN_FIELDS}<input type="submit" name="register" tabindex="1" value="{L_REGISTER}" class="button1" /></dd>
+					<dd>{S_HIDDEN_FIELDS}<input type="submit" name="register" tabindex="1" value="{L_REGISTER}" class="button1 button button-form" /></dd>
 				</dl>
 			</fieldset>
 		</form>
@@ -46,7 +46,7 @@
 				{S_LOGIN_REDIRECT}
 				<dl>
 					<dt>&nbsp;</dt>
-					<dd>{S_HIDDEN_FIELDS}<input type="submit" name="login" tabindex="5" value="{L_LOGIN}" class="button1" /></dd>
+					<dd>{S_HIDDEN_FIELDS}<input type="submit" name="login" tabindex="5" value="{L_LOGIN}" class="button1 button button-form" /></dd>
 				</dl>
 			</fieldset>
 		</form>
diff --git a/phpBB/styles/prosilver/template/ucp_main_bookmarks.html b/phpBB/styles/prosilver/template/ucp_main_bookmarks.html
index 25647afe1a..d14ae23425 100644
--- a/phpBB/styles/prosilver/template/ucp_main_bookmarks.html
+++ b/phpBB/styles/prosilver/template/ucp_main_bookmarks.html
@@ -114,7 +114,7 @@
 
 <!-- IF .topicrow and not S_NO_DISPLAY_BOOKMARKS -->
 	<fieldset class="display-actions">
-		<input type="submit" name="unbookmark" value="{L_REMOVE_BOOKMARK_MARKED}" class="button2" />
+		<input type="submit" name="unbookmark" value="{L_REMOVE_BOOKMARK_MARKED}" class="button1 button button-form-bold" />
 		<div><a href="#" onclick="marklist('ucp', '', true); return false;">{L_MARK_ALL}</a> &bull; <a href="#" onclick="marklist('ucp', '', false); return false;">{L_UNMARK_ALL}</a></div>
 		{S_FORM_TOKEN}
 	</fieldset>
diff --git a/phpBB/styles/prosilver/template/ucp_main_drafts.html b/phpBB/styles/prosilver/template/ucp_main_drafts.html
index 52ad5b503b..25eb5ce2d1 100644
--- a/phpBB/styles/prosilver/template/ucp_main_drafts.html
+++ b/phpBB/styles/prosilver/template/ucp_main_drafts.html
@@ -16,8 +16,8 @@
 	</div>
 
 			<fieldset class="submit-buttons">
-				{S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp;
-				<input type="submit" name="submit" value="{L_SAVE}" class="button1" />
+				{S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button1 button button-form-bold" />&nbsp;
+				<input type="submit" name="submit" value="{L_SAVE}" class="button1 button button-form" />
 				{S_FORM_TOKEN}
 			</fieldset>
 
@@ -66,7 +66,7 @@
 
 	<!-- IF .draftrow -->
 		<fieldset class="display-actions">
-			<input class="button2" type="submit" name="delete" value="{L_DELETE_MARKED}" />
+			<input class="button1 button button-form-bold" type="submit" name="delete" value="{L_DELETE_MARKED}" />
 			<div><a href="#" onclick="marklist('postform', '', true); return false;">{L_MARK_ALL}</a> &bull; <a href="#" onclick="marklist('postform', '', false); return false;">{L_UNMARK_ALL}</a></div>
 			{S_FORM_TOKEN}
 		</fieldset>
diff --git a/phpBB/styles/prosilver/template/ucp_main_subscribed.html b/phpBB/styles/prosilver/template/ucp_main_subscribed.html
index d8de7fd093..ec1500ffac 100644
--- a/phpBB/styles/prosilver/template/ucp_main_subscribed.html
+++ b/phpBB/styles/prosilver/template/ucp_main_subscribed.html
@@ -160,7 +160,7 @@
 
 <!-- IF .topicrow or .forumrow -->
 	<fieldset class="display-actions">
-		<input type="submit" name="unwatch" value="{L_UNWATCH_MARKED}" class="button2" />
+		<input type="submit" name="unwatch" value="{L_UNWATCH_MARKED}" class="button1 button button-form-bold" />
 		<div><a href="#" onclick="marklist('ucp', 't', true); marklist('ucp', 'f', true); return false;">{L_MARK_ALL}</a> &bull; <a href="#" onclick="marklist('ucp', 't', false); marklist('ucp', 'f', false); return false;">{L_UNMARK_ALL}</a></div>
 		{S_FORM_TOKEN}
 	</fieldset>
diff --git a/phpBB/styles/prosilver/template/ucp_notifications.html b/phpBB/styles/prosilver/template/ucp_notifications.html
index 32efae17fd..634187e0ca 100644
--- a/phpBB/styles/prosilver/template/ucp_notifications.html
+++ b/phpBB/styles/prosilver/template/ucp_notifications.html
@@ -109,7 +109,7 @@
 <fieldset class="display-actions">
 	<input type="hidden" name="form_time" value="{FORM_TIME}" />
 	{S_HIDDEN_FIELDS}
-	<input type="submit" name="submit" value="<!-- IF MODE == 'notification_options' -->{L_SUBMIT}<!-- ELSE -->{L_MARK_READ}<!-- ENDIF -->" class="button1" />
+	<input type="submit" name="submit" value="<!-- IF MODE == 'notification_options' -->{L_SUBMIT}<!-- ELSE -->{L_MARK_READ}<!-- ENDIF -->" class="button1 button button-form" />
 	<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>
diff --git a/phpBB/styles/prosilver/template/ucp_pm_options.html b/phpBB/styles/prosilver/template/ucp_pm_options.html
index 247be8b6fd..4c971243b1 100644
--- a/phpBB/styles/prosilver/template/ucp_pm_options.html
+++ b/phpBB/styles/prosilver/template/ucp_pm_options.html
@@ -14,7 +14,7 @@
 
 	<ol class="def-rules">
 	<!-- BEGIN rule -->
-		<li><div class="right-box"><input type="submit" name="delete_rule[{rule.RULE_ID}]" value="{L_DELETE_RULE}" class="button2" /></div><strong>{L_IF}</strong> {rule.CHECK} <em>{rule.RULE}</em> <!-- IF rule.STRING --><strong>{rule.STRING}</strong> | <!-- ENDIF -->{rule.ACTION}<!-- IF rule.FOLDER -->{L_COLON} {rule.FOLDER}<!-- ENDIF --><div style="clear: both;"></div></li>
+		<li><div class="right-box"><input type="submit" name="delete_rule[{rule.RULE_ID}]" value="{L_DELETE_RULE}" class="button1 button button-form-bold" /></div><strong>{L_IF}</strong> {rule.CHECK} <em>{rule.RULE}</em> <!-- IF rule.STRING --><strong>{rule.STRING}</strong> | <!-- ENDIF -->{rule.ACTION}<!-- IF rule.FOLDER -->{L_COLON} {rule.FOLDER}<!-- ENDIF --><div style="clear: both;"></div></li>
 	<!-- BEGINELSE -->
 		<li><strong>{L_NO_RULES_DEFINED}</strong></li>
 	<!-- END rule -->
@@ -28,22 +28,22 @@
 		<dl>
 			<dt><label<!-- IF S_CHECK_SELECT --> for="check_option"<!-- ENDIF -->>{L_IF}{L_COLON}</label></dt>
 			<dd>
-				<!-- IF S_CHECK_SELECT --><select name="check_option" id="check_option">{S_CHECK_OPTIONS}</select> <input type="submit" name="next" value="{L_NEXT_STEP}" class="button2" /><!-- ELSE -->{CHECK_CURRENT}<input type="hidden" name="check_option" value="{CHECK_OPTION}" /><!-- ENDIF -->
+				<!-- IF S_CHECK_SELECT --><select name="check_option" id="check_option">{S_CHECK_OPTIONS}</select> <input type="submit" name="next" value="{L_NEXT_STEP}" class="button1 button button-form-bold" /><!-- ELSE -->{CHECK_CURRENT}<input type="hidden" name="check_option" value="{CHECK_OPTION}" /><!-- ENDIF -->
 			</dd>
 		</dl>
 	<!-- ENDIF -->
 
 	<!-- IF S_RULE_DEFINED -->
 		<dl>
-			<dt><!-- IF S_RULE_SELECT --><input type="submit" name="back[rule]" value="{L_PREVIOUS_STEP}" class="button2" /><!-- ELSE --><label>&nbsp;</label><!-- ENDIF --></dt>
-			<dd><!-- IF S_RULE_SELECT --><select name="rule_option" id="rule_option">{S_RULE_OPTIONS}</select> <input type="submit" name="next" value="{L_NEXT_STEP}" class="button2" /><!-- ELSE --><em>{RULE_CURRENT}</em><input type="hidden" name="rule_option" value="{RULE_OPTION}" /><!-- ENDIF --></dd>
+			<dt><!-- IF S_RULE_SELECT --><input type="submit" name="back[rule]" value="{L_PREVIOUS_STEP}" class="button1 button button-form-bold" /><!-- ELSE --><label>&nbsp;</label><!-- ENDIF --></dt>
+			<dd><!-- IF S_RULE_SELECT --><select name="rule_option" id="rule_option">{S_RULE_OPTIONS}</select> <input type="submit" name="next" value="{L_NEXT_STEP}" class="button1 button button-form-bold" /><!-- ELSE --><em>{RULE_CURRENT}</em><input type="hidden" name="rule_option" value="{RULE_OPTION}" /><!-- ENDIF --></dd>
 		</dl>
 	<!-- ENDIF -->
 
 	<!-- IF S_COND_DEFINED -->
 		<!-- IF S_COND_SELECT or COND_CURRENT -->
 			<dl>
-				<dt><!-- IF S_COND_SELECT --><input type="submit" name="back[cond]" value="{L_PREVIOUS_STEP}" class="button2" /><!-- ELSE --><label>&nbsp;</label><!-- ENDIF --></dt>
+				<dt><!-- IF S_COND_SELECT --><input type="submit" name="back[cond]" value="{L_PREVIOUS_STEP}" class="button1 button button-form-bold" /><!-- ELSE --><label>&nbsp;</label><!-- ENDIF --></dt>
 				<dd>
 					<!-- IF S_COND_SELECT -->
 						<!-- IF S_TEXT_CONDITION -->
@@ -53,7 +53,7 @@
 						<!-- ELSEIF S_GROUP_CONDITION -->
 							<input type="hidden" name="rule_string" value="{CURRENT_STRING}" /><!-- IF S_GROUP_OPTIONS --><select name="rule_group_id">{S_GROUP_OPTIONS}</select><!-- ELSE -->{L_NO_GROUPS}<!-- ENDIF -->
 						<!-- ENDIF -->
-						<input type="submit" name="next" value="{L_NEXT_STEP}" class="button2" />
+						<input type="submit" name="next" value="{L_NEXT_STEP}" class="button1 button button-form-bold" />
 					<!-- ELSE -->
 						<strong>{COND_CURRENT}</strong><input type="hidden" name="rule_string" value="{CURRENT_STRING}" /><input type="hidden" name="rule_user_id" value="{CURRENT_USER_ID}" /><input type="hidden" name="rule_group_id" value="{CURRENT_GROUP_ID}" />
 					<!-- ENDIF -->
@@ -68,8 +68,8 @@
 
 	<!-- IF S_ACTION_DEFINED -->
 		<dl>
-			<dt><!-- IF S_ACTION_SELECT --><input type="submit" name="back[action]" value="{L_PREVIOUS_STEP}" class="button2" /><!-- ELSE --><label>&nbsp;</label><!-- ENDIF --></dt>
-			<dd><!-- IF S_ACTION_SELECT --> <select name="action_option">{S_ACTION_OPTIONS}</select> <input type="submit" name="add_rule" value="{L_ADD_RULE}" class="button1" /><!-- ELSE -->{ACTION_CURRENT}<input type="hidden" name="action_option" value="{ACTION_OPTION}" /><!-- ENDIF --></dd>
+			<dt><!-- IF S_ACTION_SELECT --><input type="submit" name="back[action]" value="{L_PREVIOUS_STEP}" class="button1 button button-form-bold" /><!-- ELSE --><label>&nbsp;</label><!-- ENDIF --></dt>
+			<dd><!-- IF S_ACTION_SELECT --> <select name="action_option">{S_ACTION_OPTIONS}</select> <input type="submit" name="add_rule" value="{L_ADD_RULE}" class="button1 button button-form" /><!-- ELSE -->{ACTION_CURRENT}<input type="hidden" name="action_option" value="{ACTION_OPTION}" /><!-- ENDIF --></dd>
 		</dl>
 	<!-- ENDIF -->
 
@@ -82,7 +82,7 @@
 	<!-- IF not S_MAX_FOLDER_ZERO -->
 	<dl>
 		<dt><label for="foldername">{L_ADD_FOLDER}{L_COLON}</label></dt>
-		<dd><!-- IF S_MAX_FOLDER_REACHED -->{L_MAX_FOLDER_REACHED}<!-- ELSE --><input type="text" class="inputbox medium" name="foldername" id="foldername" size="30" maxlength="30" /> <input class="button2" type="submit" name="addfolder" value="{L_ADD}" /><!-- ENDIF --></dd>
+		<dd><!-- IF S_MAX_FOLDER_REACHED -->{L_MAX_FOLDER_REACHED}<!-- ELSE --><input type="text" class="inputbox medium" name="foldername" id="foldername" size="30" maxlength="30" /> <input class="button1 button button-form-bold" type="submit" name="addfolder" value="{L_ADD}" /><!-- ENDIF --></dd>
 	</dl>
 	<!-- IF S_FOLDER_OPTIONS --><hr class="dashed" /><!-- ENDIF -->
 	<!-- ENDIF -->
@@ -94,7 +94,7 @@
 			<dt><label for="rename_folder_id">{L_RENAME_FOLDER}{L_COLON}</label></dt>
 			<dd><select name="rename_folder_id" id="rename_folder_id">{S_FOLDER_OPTIONS}</select></dd>
 			<dt><label for="new_folder_name">{L_NEW_FOLDER_NAME}{L_COLON}</label></dt>
-			<dd><input type="text" class="inputbox tiny" name="new_folder_name" id="new_folder_name" maxlength="30" /> <input class="button2" type="submit" name="rename_folder" value="{L_RENAME}" /></dd>
+			<dd><input type="text" class="inputbox tiny" name="new_folder_name" id="new_folder_name" maxlength="30" /> <input class="button1 button button-form-bold" type="submit" name="rename_folder" value="{L_RENAME}" /></dd>
 		</dl>
 		<hr class="dashed" />
 		<dl>
@@ -102,7 +102,7 @@
 			<dd><select name="remove_folder_id" id="remove_folder_id">{S_FOLDER_OPTIONS}</select></dd>
 			<dd style="margin-top: 3px;"><label for="remove_action1"><input type="radio" name="remove_action" id="remove_action1" value="1" checked="checked" /> {L_MOVE_DELETED_MESSAGES_TO}{L_COLON}</label> <select name="move_to">{S_TO_FOLDER_OPTIONS}</select></dd>
 			<dd style="margin-top: 3px;"><label for="remove_action2"><input type="radio" name="remove_action" id="remove_action2" value="2" /> {L_DELETE_MESSAGES_IN_FOLDER}</label></dd>
-			<dd style="margin-top: 3px;"><input class="button2" type="submit" name="remove_folder" value="{L_REMOVE}" /></dd>
+			<dd style="margin-top: 3px;"><input class="button1 button button-form-bold" type="submit" name="remove_folder" value="{L_REMOVE}" /></dd>
 		</dl>
 	<!-- ENDIF -->
 
@@ -119,7 +119,7 @@
 	<dl>
 		<dt><label>{L_DEFAULT_ACTION}{L_COLON}</label><br /><span>{L_DEFAULT_ACTION_EXPLAIN}</span></dt>
 		<dd>{DEFAULT_ACTION}</dd>
-		<dd><input class="button2" type="submit" name="fullfolder" value="{L_CHANGE}" /></dd>
+		<dd><input class="button1 button button-form-bold" type="submit" name="fullfolder" value="{L_CHANGE}" /></dd>
 	</dl>
 	</fieldset>
 
diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html b/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html
index a290313df7..f4556c4555 100644
--- a/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html
+++ b/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html
@@ -24,8 +24,8 @@
 	</div>
 	<fieldset class="submit-buttons">
 		<input type="hidden" name="export_option" value="CSV" />
-		<input class="button1" type="submit" name="submit_export" value="{L_EXPORT_FOLDER}" />&nbsp;
-		<input class="button2" type="reset" value="{L_RESET}" name="reset" />&nbsp;
+		<input class="button1 button button-form" type="submit" name="submit_export" value="{L_EXPORT_FOLDER}" />&nbsp;
+		<input class="button1 button button-form-bold" type="reset" value="{L_RESET}" name="reset" />&nbsp;
 		{S_FORM_TOKEN}
 	</fieldset>
 	</form>
@@ -100,8 +100,8 @@
 
 	<!-- IF FOLDER_CUR_MESSAGES neq 0 -->
 		<fieldset class="display-actions">
-			<div class="left-box"><label for="export_option">{L_EXPORT_FOLDER}{L_COLON} <select name="export_option" id="export_option"><option value="CSV">{L_EXPORT_AS_CSV}</option><option value="CSV_EXCEL">{L_EXPORT_AS_CSV_EXCEL}</option><option value="XML">{L_EXPORT_AS_XML}</option></select></label> <input class="button2" type="submit" name="submit_export" value="{L_GO}" /><br /></div>
-			<select name="mark_option">{S_MARK_OPTIONS}{S_MOVE_MARKED_OPTIONS}</select> <input class="button2" type="submit" name="submit_mark" value="{L_GO}" />
+			<div class="left-box"><label for="export_option">{L_EXPORT_FOLDER}{L_COLON} <select name="export_option" id="export_option"><option value="CSV">{L_EXPORT_AS_CSV}</option><option value="CSV_EXCEL">{L_EXPORT_AS_CSV_EXCEL}</option><option value="XML">{L_EXPORT_AS_XML}</option></select></label> <input class="button1 button button-form-bold" type="submit" name="submit_export" value="{L_GO}" /><br /></div>
+			<select name="mark_option">{S_MARK_OPTIONS}{S_MOVE_MARKED_OPTIONS}</select> <input class="button1 button button-form-bold" type="submit" name="submit_mark" value="{L_GO}" />
 			<div><a href="#" onclick="marklist('viewfolder', 'marked_msg', true); return false;">{L_MARK_ALL}</a> &bull; <a href="#" onclick="marklist('viewfolder', 'marked_msg', false); return false;">{L_UNMARK_ALL}</a></div>
 		</fieldset>
 
diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
index 4295867c05..4c0166957e 100644
--- a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
+++ b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
@@ -171,7 +171,7 @@
 <!-- IF S_VIEW_MESSAGE -->
 <fieldset class="display-options">
 
-	<!-- IF S_MARK_OPTIONS --><label for="mark_option"><select name="mark_option" id="mark_option">{S_MARK_OPTIONS}</select></label>&nbsp;<input class="button2" type="submit" name="submit_mark" value="{L_GO}" /><!-- ENDIF -->
+	<!-- IF S_MARK_OPTIONS --><label for="mark_option"><select name="mark_option" id="mark_option">{S_MARK_OPTIONS}</select></label>&nbsp;<input class="button1 button button-form-bold" type="submit" name="submit_mark" value="{L_GO}" /><!-- ENDIF -->
 	<!-- IF U_PREVIOUS_PM -->
 		<a href="{U_PREVIOUS_PM}" class="left-box arrow-{S_CONTENT_FLOW_BEGIN}">
 			<i class="icon fa-angle-{S_CONTENT_FLOW_BEGIN} fa-fw icon-black" aria-hidden="true"></i><span>{L_VIEW_PREVIOUS_PM}</span>
@@ -182,7 +182,7 @@
 			<i class="icon fa-angle-{S_CONTENT_FLOW_END} fa-fw icon-black" aria-hidden="true"></i><span>{L_VIEW_NEXT_PM}</span>
 		</a>
 	<!-- ENDIF -->
-	<!-- IF not S_UNREAD and not S_SPECIAL_FOLDER --><label for="dest_folder"><!-- IF S_VIEW_MESSAGE -->{L_MOVE_TO_FOLDER}{L_COLON} <!-- ELSE -->{L_MOVE_MARKED_TO_FOLDER}<!-- ENDIF --> <select name="dest_folder" id="dest_folder">{S_TO_FOLDER_OPTIONS}</select></label> <input class="button2" type="submit" name="move_pm" value="{L_GO}" /><!-- ENDIF -->
+	<!-- IF not S_UNREAD and not S_SPECIAL_FOLDER --><label for="dest_folder"><!-- IF S_VIEW_MESSAGE -->{L_MOVE_TO_FOLDER}{L_COLON} <!-- ELSE -->{L_MOVE_MARKED_TO_FOLDER}<!-- ENDIF --> <select name="dest_folder" id="dest_folder">{S_TO_FOLDER_OPTIONS}</select></label> <input class="button1 button button-form-bold" type="submit" name="move_pm" value="{L_GO}" /><!-- ENDIF -->
 	<input type="hidden" name="marked_msg_id[]" value="{MSG_ID}" />
 	<input type="hidden" name="cur_folder_id" value="{CUR_FOLDER_ID}" />
 	<input type="hidden" name="p" value="{MSG_ID}" />
diff --git a/phpBB/styles/prosilver/template/ucp_prefs_personal.html b/phpBB/styles/prosilver/template/ucp_prefs_personal.html
index 4cd9f6655b..46e9679926 100644
--- a/phpBB/styles/prosilver/template/ucp_prefs_personal.html
+++ b/phpBB/styles/prosilver/template/ucp_prefs_personal.html
@@ -79,8 +79,8 @@
 </div>
 
 <fieldset class="submit-buttons">
-	{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="reset" value="{L_RESET}" name="reset" class="button1 button button-form-bold" />&nbsp;
+	<input type="submit" name="submit" value="{L_SUBMIT}" class="button1 button button-form" />
 	{S_FORM_TOKEN}
 </fieldset>
 </form>
diff --git a/phpBB/styles/prosilver/template/ucp_prefs_post.html b/phpBB/styles/prosilver/template/ucp_prefs_post.html
index 169d41bf72..97a5da0a85 100644
--- a/phpBB/styles/prosilver/template/ucp_prefs_post.html
+++ b/phpBB/styles/prosilver/template/ucp_prefs_post.html
@@ -44,8 +44,8 @@
 </div>
 
 <fieldset class="submit-buttons">
-	{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="reset" value="{L_RESET}" name="reset" class="button1 button button-form-bold" />&nbsp;
+	<input type="submit" name="submit" value="{L_SUBMIT}" class="button1 button button-form" />
 	{S_FORM_TOKEN}
 </fieldset>
 </form>
diff --git a/phpBB/styles/prosilver/template/ucp_prefs_view.html b/phpBB/styles/prosilver/template/ucp_prefs_view.html
index 4b7142fbea..e28679aa96 100644
--- a/phpBB/styles/prosilver/template/ucp_prefs_view.html
+++ b/phpBB/styles/prosilver/template/ucp_prefs_view.html
@@ -89,8 +89,8 @@
 </div>
 
 <fieldset class="submit-buttons">
-	{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="reset" value="{L_RESET}" name="reset" class="button1 button button-form-bold" />&nbsp;
+	<input type="submit" name="submit" value="{L_SUBMIT}" class="button1 button button-form" />
 	{S_FORM_TOKEN}
 </fieldset>
 </form>
diff --git a/phpBB/styles/prosilver/template/ucp_profile_autologin_keys.html b/phpBB/styles/prosilver/template/ucp_profile_autologin_keys.html
index 65909b7068..3f63c5b3c0 100644
--- a/phpBB/styles/prosilver/template/ucp_profile_autologin_keys.html
+++ b/phpBB/styles/prosilver/template/ucp_profile_autologin_keys.html
@@ -34,7 +34,7 @@
 
 <!-- IF .sessions -->
 	<fieldset class="display-actions">
-		{S_HIDDEN_FIELDS}<input type="submit" name="submit" value="{L_DELETE_MARKED}" class="button2" />
+		{S_HIDDEN_FIELDS}<input type="submit" name="submit" value="{L_DELETE_MARKED}" class="button1 button button-form-bold" />
 		<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>
diff --git a/phpBB/styles/prosilver/template/ucp_profile_profile_info.html b/phpBB/styles/prosilver/template/ucp_profile_profile_info.html
index 69eda8c42c..c5dc0f88a6 100644
--- a/phpBB/styles/prosilver/template/ucp_profile_profile_info.html
+++ b/phpBB/styles/prosilver/template/ucp_profile_profile_info.html
@@ -42,8 +42,8 @@
 </div>
 
 <fieldset class="submit-buttons">
-	{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="reset" value="{L_RESET}" name="reset" class="button1 button button-form-bold" />&nbsp;
+	<input type="submit" name="submit" value="{L_SUBMIT}" class="button1 button button-form" />
 	{S_FORM_TOKEN}
 </fieldset>
 </form>
diff --git a/phpBB/styles/prosilver/template/ucp_profile_reg_details.html b/phpBB/styles/prosilver/template/ucp_profile_reg_details.html
index f62d3cf37d..8d7c6728a7 100644
--- a/phpBB/styles/prosilver/template/ucp_profile_reg_details.html
+++ b/phpBB/styles/prosilver/template/ucp_profile_reg_details.html
@@ -50,8 +50,8 @@
 </div>
 
 <fieldset class="submit-buttons">
-	{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="reset" value="{L_RESET}" name="reset" class="button1 button button-form-bold" />&nbsp;
+	<input type="submit" name="submit" value="{L_SUBMIT}" class="button1 button button-form" />
 	{S_FORM_TOKEN}
 </fieldset>
 </form>
diff --git a/phpBB/styles/prosilver/template/ucp_profile_signature.html b/phpBB/styles/prosilver/template/ucp_profile_signature.html
index 614f6f440d..41bd3ee2c6 100644
--- a/phpBB/styles/prosilver/template/ucp_profile_signature.html
+++ b/phpBB/styles/prosilver/template/ucp_profile_signature.html
@@ -41,9 +41,9 @@
 
 <fieldset class="submit-buttons">
 	{S_HIDDEN_FIELDS}
-	<input type="reset" name="reset" value="{L_RESET}" class="button2" />&nbsp;
-	<input type="submit" name="preview" value="{L_PREVIEW}" class="button2" />&nbsp;
-	<input type="submit" name="submit" value="{L_SUBMIT}" class="button1" />
+	<input type="reset" name="reset" value="{L_RESET}" class="button1 button button-form-bold" />&nbsp;
+	<input type="submit" name="preview" value="{L_PREVIEW}" class="button1 button button-form-bold" />&nbsp;
+	<input type="submit" name="submit" value="{L_SUBMIT}" class="button1 button button-form" />
 	{S_FORM_TOKEN}
 </fieldset>
 </form>
diff --git a/phpBB/styles/prosilver/template/ucp_register.html b/phpBB/styles/prosilver/template/ucp_register.html
index 38413addba..0b9897abf6 100644
--- a/phpBB/styles/prosilver/template/ucp_register.html
+++ b/phpBB/styles/prosilver/template/ucp_register.html
@@ -96,8 +96,8 @@
 
 	<fieldset class="submit-buttons">
 		{S_HIDDEN_FIELDS}
-		<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp;
-		<input type="submit" tabindex="9" name="submit" id="submit" value="{L_SUBMIT}" class="button1 default-submit-action" />
+		<input type="reset" value="{L_RESET}" name="reset" class="button1 button button-form-bold" />&nbsp;
+		<input type="submit" tabindex="9" name="submit" id="submit" value="{L_SUBMIT}" class="button1 button button-form default-submit-action" />
 		{S_FORM_TOKEN}
 	</fieldset>
 
diff --git a/phpBB/styles/prosilver/template/ucp_remind.html b/phpBB/styles/prosilver/template/ucp_remind.html
index 0ab1251d9e..57d5d5a260 100644
--- a/phpBB/styles/prosilver/template/ucp_remind.html
+++ b/phpBB/styles/prosilver/template/ucp_remind.html
@@ -19,7 +19,7 @@
 		</dl>
 		<dl>
 			<dt>&nbsp;</dt>
-			<dd>{S_HIDDEN_FIELDS}<input type="submit" name="submit" id="submit" class="button1" value="{L_SUBMIT}" tabindex="2" />&nbsp; <input type="reset" value="{L_RESET}" name="reset" class="button2" /></dd>
+			<dd>{S_HIDDEN_FIELDS}<input type="submit" name="submit" id="submit" class="button1 button button-form" value="{L_SUBMIT}" tabindex="2" />&nbsp; <input type="reset" value="{L_RESET}" name="reset" class="button1 button button-form-bold" /></dd>
 		</dl>
 		{S_FORM_TOKEN}
 		</fieldset>
diff --git a/phpBB/styles/prosilver/template/ucp_resend.html b/phpBB/styles/prosilver/template/ucp_resend.html
index 7713efe521..48827d811b 100644
--- a/phpBB/styles/prosilver/template/ucp_resend.html
+++ b/phpBB/styles/prosilver/template/ucp_resend.html
@@ -20,7 +20,7 @@
 		</dl>
 		<dl>
 			<dt>&nbsp;</dt>
-			<dd>{S_HIDDEN_FIELDS}{S_FORM_TOKEN}<input type="submit" name="submit" id="submit" class="button1" value="{L_SUBMIT}" tabindex="2" />&nbsp; <input type="reset" value="{L_RESET}" name="reset" class="button2" /></dd>
+			<dd>{S_HIDDEN_FIELDS}{S_FORM_TOKEN}<input type="submit" name="submit" id="submit" class="button1 button button-form" value="{L_SUBMIT}" tabindex="2" />&nbsp; <input type="reset" value="{L_RESET}" name="reset" class="button1 button button-form-bold" /></dd>
 		</dl>
 		</fieldset>
 	</div>
diff --git a/phpBB/styles/prosilver/template/ucp_zebra_foes.html b/phpBB/styles/prosilver/template/ucp_zebra_foes.html
index 2a0f6e0dea..efd7a0613d 100644
--- a/phpBB/styles/prosilver/template/ucp_zebra_foes.html
+++ b/phpBB/styles/prosilver/template/ucp_zebra_foes.html
@@ -32,8 +32,8 @@
 </div>
 
 <fieldset class="submit-buttons">
-	{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="reset" value="{L_RESET}" name="reset" class="button1 button button-form-bold" />&nbsp;
+	<input type="submit" name="submit" value="{L_SUBMIT}" class="button1 button button-form" />
 	{S_FORM_TOKEN}
 </fieldset>
 </form>
diff --git a/phpBB/styles/prosilver/template/ucp_zebra_friends.html b/phpBB/styles/prosilver/template/ucp_zebra_friends.html
index e584d876b8..1478fb9546 100644
--- a/phpBB/styles/prosilver/template/ucp_zebra_friends.html
+++ b/phpBB/styles/prosilver/template/ucp_zebra_friends.html
@@ -34,8 +34,8 @@
 </div>
 
 <fieldset class="submit-buttons">
-	{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="reset" value="{L_RESET}" name="reset" class="button1 button button-form-bold" />&nbsp;
+	<input type="submit" name="submit" value="{L_SUBMIT}" class="button1 button button-form" />
 	{S_FORM_TOKEN}
 </fieldset>
 </form>
diff --git a/phpBB/styles/prosilver/template/viewforum_body.html b/phpBB/styles/prosilver/template/viewforum_body.html
index 867fd84112..7071366106 100644
--- a/phpBB/styles/prosilver/template/viewforum_body.html
+++ b/phpBB/styles/prosilver/template/viewforum_body.html
@@ -111,7 +111,7 @@
 				</dl>
 				<dl>
 					<dt>&nbsp;</dt>
-					<dd><input type="submit" name="login" tabindex="5" value="{L_LOGIN}" class="button1" /></dd>
+					<dd><input type="submit" name="login" tabindex="5" value="{L_LOGIN}" class="button1 button button-form" /></dd>
 				</dl>
 				{S_LOGIN_REDIRECT}
 				</fieldset>
diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html
index 522151cf7d..6d58b2a690 100644
--- a/phpBB/styles/prosilver/template/viewtopic_body.html
+++ b/phpBB/styles/prosilver/template/viewtopic_body.html
@@ -105,7 +105,7 @@
 			<!-- IF S_CAN_VOTE -->
 				<dl style="border-top: none;" class="poll_vote">
 					<dt>&nbsp;</dt>
-					<dd class="resultbar"><input type="submit" name="update" value="{L_SUBMIT_VOTE}" class="button1" /></dd>
+					<dd class="resultbar"><input type="submit" name="update" value="{L_SUBMIT_VOTE}" class="button1 button button-form" /></dd>
 				</dl>
 			<!-- ENDIF -->
 
@@ -297,8 +297,8 @@
 				<p class="post-notice unapproved">
 					<span><i class="icon fa-question icon-red fa-fw" aria-hidden="true"></i></span>
 					<strong>{L_POST_UNAPPROVED_ACTION}</strong>
-					<input class="button2" type="submit" value="{L_DISAPPROVE}" name="action[disapprove]" />
-					<input class="button1" type="submit" value="{L_APPROVE}" name="action[approve]" />
+					<input class="button1 button button-form-bold" type="submit" value="{L_DISAPPROVE}" name="action[disapprove]" />
+					<input class="button1 button button-form" type="submit" value="{L_APPROVE}" name="action[approve]" />
 					<input type="hidden" name="post_id_list[]" value="{postrow.POST_ID}" />
 					{S_FORM_TOKEN}
 				</p>
@@ -308,9 +308,9 @@
 				<p class="post-notice deleted">
 					<strong>{L_POST_DELETED_ACTION}</strong>
 					<!-- IF postrow.S_DELETE_PERMANENT -->
-						<input class="button2" type="submit" value="{L_DELETE}" name="action[delete]" />
+						<input class="button1 button button-form-bold" type="submit" value="{L_DELETE}" name="action[delete]" />
 					<!-- ENDIF -->
-					<input class="button1" type="submit" value="{L_RESTORE}" name="action[restore]" />
+					<input class="button1 button button-form" type="submit" value="{L_RESTORE}" name="action[restore]" />
 					<input type="hidden" name="post_id_list[]" value="{postrow.POST_ID}" />
 					{S_FORM_TOKEN}
 				</p>
diff --git a/phpBB/styles/prosilver/theme/buttons.css b/phpBB/styles/prosilver/theme/buttons.css
index 0a6619b499..9fed9e128b 100644
--- a/phpBB/styles/prosilver/theme/buttons.css
+++ b/phpBB/styles/prosilver/theme/buttons.css
@@ -40,6 +40,16 @@
 
 /* Posting page styles
 ---------------------------------------- */
+.button-form,
+.button-form-bold {
+	font-family: 'Lucida Grande', Verdana, Helvetica, Arial, sans-serif;
+	border-radius: 0;
+}
+
+.button-form-bold {
+	font-weight: 700;
+}
+
 .button-search,
 .button-search-end {
 	border-radius: 0;
diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css
index 139e691d85..11b0fd758e 100644
--- a/phpBB/styles/prosilver/theme/colours.css
+++ b/phpBB/styles/prosilver/theme/colours.css
@@ -650,6 +650,29 @@ dd.profile-warnings {
 	color: #8f8f8f;
 }
 
+.button-form,
+.button-form-bold {
+	border-color: #666666;
+	-webkit-box-shadow: none;
+	box-shadow: none;
+	color: #333333;
+}
+
+.button-form:hover,
+.button-form-bold:hover {
+	border-color: #d31141;
+	color: #d31141;
+	text-shadow: none;
+}
+
+.button-form:focus,
+.button-form-bold:focus {
+	border-color: #0a8ed0;
+	color: #0a8ed0;
+	text-shadow: none;
+}
+
+
 .button-secondary:focus,
 .button-secondary:hover,
 .button:focus .icon,
@@ -1238,63 +1261,6 @@ fieldset.quick-login input.inputbox {
 	color: transparent;
 }
 
-
-/* form button styles */
-
-a.button1,
-input.button1,
-input.button3,
-a.button2,
-input.button2 {
-	background-color: #efefef; /* old browsers */ /* ff3.6+ */
-	background-image: linear-gradient(to bottom, #d2d2d2 0%, #efefef 100%); /* w3c */
-	color: #000000;
-	filter: progid:dximagetransform.microsoft.gradient(startcolorstr='#d2d2d2', endcolorstr='#efefef', gradienttype=0); /* ie6-9 */
-}
-
-a.button1,
-input.button1 {
-	border-color: #666666;
-}
-
-input.button3 {
-	background-image: none;
-}
-
-/* alternative button */
-a.button2,
-input.button2,
-input.button3 {
-	border-color: #666666;
-}
-
-/* <a> button in the style of the form buttons */
-a.button1,
-a.button2 {
-	color: #000000;
-}
-
-/* hover states */
-a.button1:hover,
-input.button1:hover,
-a.button2:hover,
-input.button2:hover,
-input.button3:hover {
-	background-color: #d2d2d2; /* old browsers */ /* ff3.6+ */
-	background-image: linear-gradient(to bottom, #efefef 0%, #d2d2d2 100%); /* w3c */
-	border-color: #d31141;
-	color: #d31141;
-	filter: progid:dximagetransform.microsoft.gradient(startcolorstr='#efefef', endcolorstr='#d2d2d2', gradienttype=0); /* ie6-9 */
-}
-
-/* focus states */
-input.button1:focus,
-input.button2:focus,
-input.button3:focus {
-	border-color: #11a3ea;
-	color: #0f4987;
-}
-
 input.disabled {
 	color: #666666;
 }
@@ -1387,4 +1353,3 @@ li.notification-disapproved strong {
 	color: #ffffff;
 }
 /* stylelint-enable */
-
diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index 009d31ecab..f3947dd4fe 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -850,12 +850,6 @@ fieldset.fields1 dd.recipients {
 	margin-left: 1em;
 }
 
-fieldset.fields1 ul.recipients input.button2 {
-	font-size: 0.8em;
-	margin-right: 0;
-	padding: 0;
-}
-
 fieldset.fields1 dl.pmlist > dt {
 	width: auto !important;
 }
diff --git a/phpBB/styles/prosilver/theme/forms.css b/phpBB/styles/prosilver/theme/forms.css
index f4985f5508..5d24c7511c 100644
--- a/phpBB/styles/prosilver/theme/forms.css
+++ b/phpBB/styles/prosilver/theme/forms.css
@@ -341,41 +341,6 @@ input[type='search']::-webkit-search-cancel-button {
 	cursor: pointer;
 }
 
-/* Form button styles
----------------------------------------- */
-input.button1,
-input.button2 {
-	font-size: 1em;
-}
-
-a.button1,
-input.button1,
-input.button3,
-a.button2,
-input.button2 {
-	font-family: 'Lucida Grande', Verdana, Helvetica, Arial, sans-serif;
-	line-height: 1.5;
-	background: transparent none repeat-x top left;
-	width: auto !important;
-	padding-top: 1px;
-	padding-bottom: 1px;
-}
-
-a.button1,
-input.button1 {
-	font-weight: bold;
-	border: 1px solid transparent;
-}
-
-input.button3 {
-	font-variant: small-caps;
-	line-height: 5px;
-	background-image: none;
-	height: 12px;
-	margin: 0;
-	padding: 0;
-}
-
 input[type='button'],
 input[type='submit'],
 input[type='reset'],
@@ -384,41 +349,10 @@ input[type='radio'] {
 	cursor: pointer;
 }
 
-/* Alternative button */
-a.button2,
-input.button2,
-input.button3 {
-	border: 1px solid transparent;
-}
-
-/* <a> button in the style of the form buttons */
-a.button1,
-a.button2 {
-	text-decoration: none;
-	vertical-align: text-bottom;
-	padding: 0 3px;
-}
-
-/* Hover states */
-a.button1:hover,
-input.button1:hover,
-a.button2:hover,
-input.button2:hover,
-input.button3:hover {
-	border: 1px solid transparent;
-}
-
 input.disabled {
 	font-weight: normal;
 }
 
-/* Focus states */
-input.button1:focus,
-input.button2:focus,
-input.button3:focus {
-	outline-style: none;
-}
-
 /* Topic and forum Search */
 .search-box {
 	float: left;