diff --git a/phpBB/styles/prosilver/template/mcp_topic.html b/phpBB/styles/prosilver/template/mcp_topic.html
index cf7b67e74b..a26238d1aa 100644
--- a/phpBB/styles/prosilver/template/mcp_topic.html
+++ b/phpBB/styles/prosilver/template/mcp_topic.html
@@ -100,7 +100,7 @@
 			<div class="postbody" id="pr{postrow.POST_ID}">
 				<ul class="post-buttons">
 					<li>
-						<a href="{postrow.U_POST_DETAILS}" title="{L_POST_DETAILS}" class="button">
+						<a href="{postrow.U_POST_DETAILS}" title="{L_POST_DETAILS}" class="button button-icon-only">
 							<i class="icon fa-info fa-fw"></i><span class="sr-only">{L_POST_DETAILS}</span>
 						</a>
 					</li>
diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index 7d0d38ec7e..b2bbc45fdf 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -91,10 +91,10 @@
 				<form action="{U_SEARCH}" method="get" id="search">
 				<fieldset>
 					<input name="keywords" id="keywords" type="search" maxlength="128" title="{L_SEARCH_KEYWORDS}" class="inputbox search tiny" size="20" value="{SEARCH_WORDS}" placeholder="{L_SEARCH_MINI}" />
-					<button class="button" type="submit" title="{L_SEARCH}">
+					<button class="button button-search" type="submit" title="{L_SEARCH}">
 						<i class="icon fa-search fa-fw"></i><span class="sr-only">{L_SEARCH}</span>
 					</button>
-					<a href="{U_SEARCH}" class="button" title="{L_SEARCH_ADV}">
+					<a href="{U_SEARCH}" class="button button-search-end" title="{L_SEARCH_ADV}">
 						<i class="icon fa-cog fa-fw"></i><span class="sr-only">{L_SEARCH_ADV}</span>
 					</a>
 					{S_SEARCH_HIDDEN_FIELDS}
diff --git a/phpBB/styles/prosilver/template/pagination.html b/phpBB/styles/prosilver/template/pagination.html
index 4351b1bdd7..7c13f038a4 100644
--- a/phpBB/styles/prosilver/template/pagination.html
+++ b/phpBB/styles/prosilver/template/pagination.html
@@ -1,7 +1,7 @@
 <ul>
 <!-- IF BASE_URL and TOTAL_PAGES > 6 -->
 	<li class="dropdown-container dropdown-button-control dropdown-page-jump page-jump">
-		<a class="button" href="#" class="dropdown-trigger" title="{L_JUMP_TO_PAGE_CLICK}" role="button"><i class="icon fa-level-down fa-rotate-270"></i><span class="sr-only">{PAGE_NUMBER}</span></a>
+		<a class="button button-icon-only dropdown-trigger" href="#" title="{L_JUMP_TO_PAGE_CLICK}" role="button"><i class="icon fa-level-down fa-rotate-270"></i><span class="sr-only">{PAGE_NUMBER}</span></a>
 		<div class="dropdown">
 			<div class="pointer"><div class="pointer-inner"></div></div>
 			<ul class="dropdown-contents">
@@ -16,13 +16,13 @@
 <!-- ENDIF -->
 <!-- BEGIN pagination -->
 	<!-- IF pagination.S_IS_PREV -->
-		<li class="arrow previous"><a class="button" href="{pagination.PAGE_URL}" rel="prev" role="button"><i class="icon fa-chevron-left fa-fw"></i><span class="sr-only">{L_PREVIOUS}</span></a></li>
+		<li class="arrow previous"><a class="button button-icon-only" href="{pagination.PAGE_URL}" rel="prev" role="button"><i class="icon fa-chevron-left fa-fw"></i><span class="sr-only">{L_PREVIOUS}</span></a></li>
 	<!-- ELSEIF pagination.S_IS_CURRENT -->
 	<li class="active"><span>{pagination.PAGE_NUMBER}</span></li>
 	<!-- ELSEIF pagination.S_IS_ELLIPSIS -->
 	<li class="ellipsis" role="separator"><span>{L_ELLIPSIS}</span></li>
 	<!-- ELSEIF pagination.S_IS_NEXT -->
-		<li class="arrow next"><a class="button" href="{pagination.PAGE_URL}" rel="next" role="button"><i class="icon fa-chevron-right fa-fw"></i><span class="sr-only">{L_NEXT}</span></a></li>
+		<li class="arrow next"><a class="button button-icon-only" href="{pagination.PAGE_URL}" rel="next" role="button"><i class="icon fa-chevron-right fa-fw"></i><span class="sr-only">{L_NEXT}</span></a></li>
 	<!-- ELSE -->
 		<li><a class="button" href="{pagination.PAGE_URL}" role="button">{pagination.PAGE_NUMBER}</a></li>
 	<!-- ENDIF -->
diff --git a/phpBB/styles/prosilver/template/posting_buttons.html b/phpBB/styles/prosilver/template/posting_buttons.html
index 9e78005c63..2db0f34719 100644
--- a/phpBB/styles/prosilver/template/posting_buttons.html
+++ b/phpBB/styles/prosilver/template/posting_buttons.html
@@ -61,48 +61,48 @@
 
 <!-- EVENT posting_editor_buttons_before -->
 <div id="format-buttons" class="format-buttons">
-	<button type="button" class="button bbcode-b" accesskey="b" name="addbbcode0" value=" B " onclick="bbstyle(0)" title="{L_BBCODE_B_HELP}">
+	<button type="button" class="button button-icon-only bbcode-b" accesskey="b" name="addbbcode0" value=" B " onclick="bbstyle(0)" title="{L_BBCODE_B_HELP}">
 		<i class="icon fa-bold fa-fw"></i>
 	</button>
-	<button type="button" class="button bbcode-i" accesskey="i" name="addbbcode2" value=" i " onclick="bbstyle(2)" title="{L_BBCODE_I_HELP}">
+	<button type="button" class="button button-icon-only bbcode-i" accesskey="i" name="addbbcode2" value=" i " onclick="bbstyle(2)" title="{L_BBCODE_I_HELP}">
 		<i class="icon fa-italic fa-fw"></i>
 	</button>
-	<button type="button" class="button bbcode-u" accesskey="u" name="addbbcode4" value=" u " onclick="bbstyle(4)" title="{L_BBCODE_U_HELP}">
+	<button type="button" class="button button-icon-only bbcode-u" accesskey="u" name="addbbcode4" value=" u " onclick="bbstyle(4)" title="{L_BBCODE_U_HELP}">
 		<i class="icon fa-underline fa-fw"></i>
 	</button>
 	<!-- IF S_BBCODE_QUOTE -->
-	<button type="button" class="button bbcode-quote" accesskey="q" name="addbbcode6" value="Quote" onclick="bbstyle(6)" title="{L_BBCODE_Q_HELP}">
+	<button type="button" class="button button-icon-only bbcode-quote" accesskey="q" name="addbbcode6" value="Quote" onclick="bbstyle(6)" title="{L_BBCODE_Q_HELP}">
 		<i class="icon fa-quote-left fa-fw"></i>
 	</button>
 	<!-- ENDIF -->
-	<button type="button" class="button bbcode-code" accesskey="c" name="addbbcode8" value="Code" onclick="bbstyle(8)" title="{L_BBCODE_C_HELP}">
+	<button type="button" class="button button-icon-only bbcode-code" accesskey="c" name="addbbcode8" value="Code" onclick="bbstyle(8)" title="{L_BBCODE_C_HELP}">
 		<i class="icon fa-code fa-fw"></i>
 	</button>
-	<button type="button" class="button bbcode-list" accesskey="l" name="addbbcode10" value="List" onclick="bbstyle(10)" title="{L_BBCODE_L_HELP}">
+	<button type="button" class="button button-icon-only bbcode-list" accesskey="l" name="addbbcode10" value="List" onclick="bbstyle(10)" title="{L_BBCODE_L_HELP}">
 		<i class="icon fa-list fa-fw"></i>
 	</button>
-	<button type="button" class="button bbcode-list-" accesskey="o" name="addbbcode12" value="List=" onclick="bbstyle(12)" title="{L_BBCODE_O_HELP}">
+	<button type="button" class="button button-icon-only bbcode-list-" accesskey="o" name="addbbcode12" value="List=" onclick="bbstyle(12)" title="{L_BBCODE_O_HELP}">
 		<i class="icon fa-list-ol fa-fw"></i>
 	</button>
-	<button type="button" class="button bbcode-asterisk" accesskey="y" name="addlistitem" value="[*]" onclick="bbstyle(-1)" title="{L_BBCODE_LISTITEM_HELP}">
+	<button type="button" class="button button-icon-only bbcode-asterisk" accesskey="y" name="addlistitem" value="[*]" onclick="bbstyle(-1)" title="{L_BBCODE_LISTITEM_HELP}">
 		<i class="icon fa-asterisk fa-fw"></i>
 	</button>
 	<!-- IF S_BBCODE_IMG -->
-	<button type="button" class="button bbcode-img" accesskey="p" name="addbbcode14" value="Img" onclick="bbstyle(14)" title="{L_BBCODE_P_HELP}">
+	<button type="button" class="button button-icon-only bbcode-img" accesskey="p" name="addbbcode14" value="Img" onclick="bbstyle(14)" title="{L_BBCODE_P_HELP}">
 		<i class="icon fa-image fa-fw"></i>
 	</button>
 	<!-- ENDIF -->
 	<!-- IF S_LINKS_ALLOWED -->
-	<button type="button" class="button bbcode-url" accesskey="w" name="addbbcode16" value="URL" onclick="bbstyle(16)" title="{L_BBCODE_W_HELP}">
+	<button type="button" class="button button-icon-only bbcode-url" accesskey="w" name="addbbcode16" value="URL" onclick="bbstyle(16)" title="{L_BBCODE_W_HELP}">
 		<i class="icon fa-link fa-fw"></i>
 	</button>
 	<!-- ENDIF -->
 	<!-- IF S_BBCODE_FLASH -->
-	<button type="button" class="button bbcode-flash" accesskey="d" name="addbbcode18" value="Flash" onclick="bbstyle(18)" title="{L_BBCODE_D_HELP}">
+	<button type="button" class="button button-icon-only bbcode-flash" accesskey="d" name="addbbcode18" value="Flash" onclick="bbstyle(18)" title="{L_BBCODE_D_HELP}">
 		<i class="icon fa-flash fa-fw"></i>
 	</button>
 	<!-- ENDIF -->
-	<button type="button" class="button bbcode-color" name="bbpalette" id="bbpalette" value="{L_FONT_COLOR}" onclick="change_palette();" title="{L_BBCODE_S_HELP}">
+	<button type="button" class="button button-icon-only bbcode-color" name="bbpalette" id="bbpalette" value="{L_FONT_COLOR}" onclick="change_palette();" title="{L_BBCODE_S_HELP}">
 		<i class="icon fa-tint fa-fw"></i>
 	</button>
 	<select name="addbbcode20" class="bbcode-size" onchange="bbfontstyle('[size=' + this.form.addbbcode20.options[this.form.addbbcode20.selectedIndex].value + ']', '[/size]');this.form.addbbcode20.selectedIndex = 2;" title="{L_BBCODE_F_HELP}">
@@ -120,7 +120,9 @@
 	<!-- EVENT posting_editor_buttons_custom_tags_before -->
 
 	<!-- BEGIN custom_tags -->
-	<button type="button" class="button bbcode-{custom_tags.BBCODE_TAG_CLEAN}" name="addbbcode{custom_tags.BBCODE_ID}" value="{custom_tags.BBCODE_TAG}" onclick="bbstyle({custom_tags.BBCODE_ID})" title="{custom_tags.BBCODE_HELPLINE}"></button>
+	<button type="button" class="button button-secondary bbcode-{custom_tags.BBCODE_TAG_CLEAN}" name="addbbcode{custom_tags.BBCODE_ID}" value="{custom_tags.BBCODE_TAG}" onclick="bbstyle({custom_tags.BBCODE_ID})" title="{custom_tags.BBCODE_HELPLINE}">
+		{custom_tags.BBCODE_TAG}
+	</button>
 	<!-- END custom_tags -->
 </div>
 <!-- EVENT posting_editor_buttons_after -->
diff --git a/phpBB/styles/prosilver/template/posting_topic_review.html b/phpBB/styles/prosilver/template/posting_topic_review.html
index 01a055c3f5..a58c929bef 100644
--- a/phpBB/styles/prosilver/template/posting_topic_review.html
+++ b/phpBB/styles/prosilver/template/posting_topic_review.html
@@ -28,14 +28,14 @@
 			<ul class="post-buttons">
 			<!-- IF topic_review_row.U_MCP_DETAILS -->
 				<li>
-					<a href="{topic_review_row.U_MCP_DETAILS}" title="{L_POST_DETAILS}" class="button">
+					<a href="{topic_review_row.U_MCP_DETAILS}" title="{L_POST_DETAILS}" class="button button-icon-only">
 						<i class="icon fa-info fa-fw"></i><span class="sr-only">{L_POST_DETAILS}</span>
 					</a>
 				<li>
 			<!-- ENDIF -->
 			<!-- IF topic_review_row.POSTER_QUOTE and topic_review_row.DECODED_MESSAGE -->
 				<li>
-					<a href="#postingbox" onclick="addquote({topic_review_row.POST_ID}, '{topic_review_row.POSTER_QUOTE}', '{LA_WROTE}', {post_id:{topic_review_row.POST_ID},time:{topic_review_row.POST_TIME},user_id:{topic_review_row.USER_ID}});" title="{L_QUOTE} {topic_review_row.POST_AUTHOR}" class="button">
+					<a href="#postingbox" onclick="addquote({topic_review_row.POST_ID}, '{topic_review_row.POSTER_QUOTE}', '{LA_WROTE}', {post_id:{topic_review_row.POST_ID},time:{topic_review_row.POST_TIME},user_id:{topic_review_row.USER_ID}});" title="{L_QUOTE} {topic_review_row.POST_AUTHOR}" class="button button-icon-only">
 						<i class="icon fa-quote-left fa-fw"></i><span class="sr-only">{L_QUOTE} {topic_review_row.POST_AUTHOR}</span>
 					</a>
 				</li>
diff --git a/phpBB/styles/prosilver/template/search_results.html b/phpBB/styles/prosilver/template/search_results.html
index c8ae7e33fa..a64cd962ea 100644
--- a/phpBB/styles/prosilver/template/search_results.html
+++ b/phpBB/styles/prosilver/template/search_results.html
@@ -31,10 +31,10 @@
 			<form method="post" action="{S_SEARCH_ACTION}">
 			<fieldset>
 				<input class="inputbox search tiny" type="search" name="add_keywords" id="add_keywords" value="" placeholder="{L_SEARCH_IN_RESULTS}" />
-				<button class="button" type="submit" title="{L_SEARCH}">
+				<button class="button button-search" type="submit" title="{L_SEARCH}">
 					<i class="icon fa-search fa-fw"></i><span class="sr-only">{L_SEARCH}</span>
 				</button>
-				<a href="{U_SEARCH}" class="button" title="{L_SEARCH_ADV}">
+				<a href="{U_SEARCH}" class="button button-search-end" title="{L_SEARCH_ADV}">
 					<i class="icon fa-cog fa-fw"></i><span class="sr-only">{L_SEARCH_ADV}</span>
 				</a>
 			</fieldset>
diff --git a/phpBB/styles/prosilver/template/ucp_pm_history.html b/phpBB/styles/prosilver/template/ucp_pm_history.html
index d3aed8ffee..b70b23ea91 100644
--- a/phpBB/styles/prosilver/template/ucp_pm_history.html
+++ b/phpBB/styles/prosilver/template/ucp_pm_history.html
@@ -25,7 +25,7 @@
 				<!-- EVENT ucp_pm_history_post_buttons_before -->
 				<!-- IF history_row.U_QUOTE or history_row.MESSAGE_AUTHOR_QUOTE -->
 				<li>
-					<a <!-- IF history_row.U_QUOTE -->href="{history_row.U_QUOTE}"<!-- ELSE -->href="#postingbox" onclick="addquote({history_row.MSG_ID}, '{history_row.MESSAGE_AUTHOR_QUOTE}', '{LA_WROTE}', {time:{history_row.MESSAGE_TIME},user_id:{history_row.USER_ID}});"<!-- ENDIF --> title="{L_QUOTE} {history_row.MESSAGE_AUTHOR}" class="button">
+					<a <!-- IF history_row.U_QUOTE -->href="{history_row.U_QUOTE}"<!-- ELSE -->href="#postingbox" onclick="addquote({history_row.MSG_ID}, '{history_row.MESSAGE_AUTHOR_QUOTE}', '{LA_WROTE}', {time:{history_row.MESSAGE_TIME},user_id:{history_row.USER_ID}});"<!-- ENDIF --> title="{L_QUOTE} {history_row.MESSAGE_AUTHOR}" class="button button-icon-only">
 						<i class="icon fa-quote-left fa-fw"></i><span class="sr-only">{L_QUOTE} {history_row.MESSAGE_AUTHOR}</span>
 					</a>
 				</li>
diff --git a/phpBB/styles/prosilver/template/ucp_pm_message_header.html b/phpBB/styles/prosilver/template/ucp_pm_message_header.html
index f629c3d5f1..059110b073 100644
--- a/phpBB/styles/prosilver/template/ucp_pm_message_header.html
+++ b/phpBB/styles/prosilver/template/ucp_pm_message_header.html
@@ -31,7 +31,7 @@
 
 	<!-- IF not S_IS_BOT and U_PRINT_PM -->
 		<div class="dropdown-container dropdown-button-control topic-tools">
-			<span title="{L_PM_TOOLS}" class="button dropdown-trigger dropdown-select">
+			<span title="{L_PM_TOOLS}" class="button button-secondary dropdown-trigger dropdown-select">
 				<i class="icon fa-wrench fa-fw"></i>
 				<span class="caret"><i class="icon fa-sort-down fa-fw"></i></span>
 			</span>
diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
index 049bef1930..a827ae6d6b 100644
--- a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
+++ b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
@@ -90,28 +90,28 @@
 			<!-- EVENT ucp_pm_viewmessage_post_buttons_before -->
 			<!-- IF U_EDIT -->
 				<li>
-					<a href="{U_EDIT}" title="{L_POST_EDIT_PM}" class="button">
+					<a href="{U_EDIT}" title="{L_POST_EDIT_PM}" class="button button-icon-only">
 						<i class="icon fa-pencil fa-fw"></i><span class="sr-only">{L_POST_EDIT_PM}</span>
 					</a>
 				</li>
 			<!-- ENDIF -->
 			<!-- IF U_DELETE -->
 				<li>
-					<a href="{U_DELETE}" title="{L_DELETE_MESSAGE}" class="button">
+					<a href="{U_DELETE}" title="{L_DELETE_MESSAGE}" class="button button-icon-only">
 						<i class="icon fa-times fa-fw"></i><span class="sr-only">{L_DELETE_MESSAGE}</span>
 					</a>
 				</li>
 			<!-- ENDIF -->
 			<!-- IF U_REPORT -->
 				<li>
-					<a href="{U_REPORT}" title="{L_REPORT_PM}" class="button">
+					<a href="{U_REPORT}" title="{L_REPORT_PM}" class="button button-icon-only">
 						<i class="icon fa-exclamation fa-fw"></i><span class="sr-only">{L_REPORT_PM}</span>
 					</a>
 				</li>
 			<!-- ENDIF -->
 			<!-- IF U_QUOTE -->
 				<li>
-					<a href="{U_QUOTE}" title="{L_POST_QUOTE_PM}" class="button">
+					<a href="{U_QUOTE}" title="{L_POST_QUOTE_PM}" class="button button-icon-only">
 						<i class="icon fa-quote-left fa-fw"></i><span class="sr-only">{L_POST_QUOTE_PM}</span>
 					</a>
 				</li>
diff --git a/phpBB/styles/prosilver/template/viewforum_body.html b/phpBB/styles/prosilver/template/viewforum_body.html
index 4689909b28..c146cefc13 100644
--- a/phpBB/styles/prosilver/template/viewforum_body.html
+++ b/phpBB/styles/prosilver/template/viewforum_body.html
@@ -55,11 +55,11 @@
 			<form method="get" id="forum-search" action="{S_SEARCHBOX_ACTION}">
 			<fieldset>
 				<input class="inputbox search tiny" type="search" name="keywords" id="search_keywords" size="20" placeholder="{L_SEARCH_FORUM}" />
-				<button class="button" type="submit" title="{L_SEARCH}">
-					<i class="icon fa-search fa-fw"></i><span>{L_SEARCH}</span>
+				<button class="button button-search" type="submit" title="{L_SEARCH}">
+					<i class="icon fa-search fa-fw"></i><span class="sr-only">{L_SEARCH}</span>
 				</button>
-				<a href="{U_SEARCH}" class="button" title="{L_SEARCH_ADV}">
-					<i class="icon fa-cog fa-fw"></i><span>{L_SEARCH_ADV}</span>
+				<a href="{U_SEARCH}" class="button button-search-end" title="{L_SEARCH_ADV}">
+					<i class="icon fa-cog fa-fw"></i><span class="sr-only">{L_SEARCH_ADV}</span>
 				</a>
 				{S_SEARCH_LOCAL_HIDDEN_FIELDS}
 			</fieldset>
diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html
index 2e99b233ba..c8b874a2d3 100644
--- a/phpBB/styles/prosilver/template/viewtopic_body.html
+++ b/phpBB/styles/prosilver/template/viewtopic_body.html
@@ -48,10 +48,10 @@
 			<form method="get" id="topic-search" action="{S_SEARCHBOX_ACTION}">
 			<fieldset>
 				<input class="inputbox search tiny"  type="search" name="keywords" id="search_keywords" size="20" placeholder="{L_SEARCH_TOPIC}" />
-				<button class="button" type="submit" title="{L_SEARCH}">
+				<button class="button button-search" type="submit" title="{L_SEARCH}">
 					<i class="icon fa-search fa-fw"></i><span class="sr-only">{L_SEARCH}</span>
 				</button>
-				<a href="{U_SEARCH}" class="button" title="{L_SEARCH_ADV}">
+				<a href="{U_SEARCH}" class="button button-search-end" title="{L_SEARCH_ADV}">
 					<i class="icon fa-cog fa-fw"></i><span class="sr-only">{L_SEARCH_ADV}</span>
 				</a>
 				{S_SEARCH_LOCAL_HIDDEN_FIELDS}
@@ -232,42 +232,42 @@
 					<!-- EVENT viewtopic_body_post_buttons_before -->
 					<!-- IF postrow.U_EDIT -->
 						<li>
-							<a href="{postrow.U_EDIT}" title="{L_EDIT_POST}" class="button icon-button">
+							<a href="{postrow.U_EDIT}" title="{L_EDIT_POST}" class="button button-icon-only">
 								<i class="icon fa-pencil fa-fw"></i><span class="sr-only">{L_BUTTON_EDIT}</span>
 							</a>
 						</li>
 					<!-- ENDIF -->
 					<!-- IF postrow.U_DELETE -->
 						<li>
-							<a href="{postrow.U_DELETE}" title="{L_DELETE_POST}" class="button icon-button">
+							<a href="{postrow.U_DELETE}" title="{L_DELETE_POST}" class="button button-icon-only">
 								<i class="icon fa-times fa-fw"></i><span class="sr-only">{L_DELETE_POST}</span>
 							</a>
 						</li>
 					<!-- ENDIF -->
 					<!-- IF postrow.U_REPORT -->
 						<li>
-							<a href="{postrow.U_REPORT}" title="{L_REPORT_POST}" class="button icon-button">
+							<a href="{postrow.U_REPORT}" title="{L_REPORT_POST}" class="button button-icon-only">
 								<i class="icon fa-exclamation fa-fw"></i><span class="sr-only">{L_REPORT_POST}</span>
 							</a>
 						</li>
 					<!-- ENDIF -->
 					<!-- IF postrow.U_WARN -->
 						<li>
-							<a href="{postrow.U_WARN}" title="{L_WARN_USER}" class="button icon-button">
+							<a href="{postrow.U_WARN}" title="{L_WARN_USER}" class="button button-icon-only">
 								<i class="icon fa-exclamation-triangle fa-fw"></i><span class="sr-only">{L_WARN_USER}</span>
 							</a>
 						</li>
 					<!-- ENDIF -->
 					<!-- IF postrow.U_INFO -->
 						<li>
-							<a href="{postrow.U_INFO}" title="{L_INFORMATION}" class="button icon-button">
+							<a href="{postrow.U_INFO}" title="{L_INFORMATION}" class="button button-icon-only">
 								<i class="icon fa-info fa-fw"></i><span class="sr-only">{L_INFORMATION}</span>
 							</a>
 						</li>
 					<!-- ENDIF -->
 					<!-- IF postrow.U_QUOTE -->
 						<li>
-							<a href="{postrow.U_QUOTE}" title="{L_REPLY_WITH_QUOTE}" class="button icon-button">
+							<a href="{postrow.U_QUOTE}" title="{L_REPLY_WITH_QUOTE}" class="button button-icon-only">
 								<i class="icon fa-quote-left fa-fw"></i><span class="sr-only">{L_QUOTE}</span>
 							</a>
 						</li>
@@ -405,7 +405,7 @@
 
 	<!-- IF .quickmod -->
 	<div class="quickmod dropdown-container dropdown-container-left dropdown-up dropdown-{S_CONTENT_FLOW_END} dropdown-button-control" id="quickmod">
-		<span title="{L_QUICK_MOD}" class="button dropdown-trigger dropdown-select">
+		<span title="{L_QUICK_MOD}" class="button button-secondary dropdown-trigger dropdown-select">
 			<i class="icon fa-gavel fa-fw"></i><span class="sr-only">{L_QUICK_MOD}</span>
 			<span class="caret"><i class="icon fa-sort-down fa-fw"></i></span>
 		</span>
diff --git a/phpBB/styles/prosilver/template/viewtopic_topic_tools.html b/phpBB/styles/prosilver/template/viewtopic_topic_tools.html
index 55f742e944..c967717d3a 100644
--- a/phpBB/styles/prosilver/template/viewtopic_topic_tools.html
+++ b/phpBB/styles/prosilver/template/viewtopic_topic_tools.html
@@ -1,6 +1,6 @@
 <!-- IF not S_IS_BOT and (U_WATCH_TOPIC or U_BOOKMARK_TOPIC or U_BUMP_TOPIC or U_EMAIL_TOPIC or U_PRINT_TOPIC or S_DISPLAY_TOPIC_TOOLS) -->
 	<div class="dropdown-container dropdown-button-control topic-tools">
-		<span title="{L_PM_TOOLS}" class="button dropdown-trigger dropdown-select">
+		<span title="{L_PM_TOOLS}" class="button button-secondary dropdown-trigger dropdown-select">
 			<i class="icon fa-wrench fa-fw"></i>
 			<span class="caret"><i class="icon fa-sort-down fa-fw"></i></span>
 		</span>
diff --git a/phpBB/styles/prosilver/theme/bidi.css b/phpBB/styles/prosilver/theme/bidi.css
index 4a9a5bc1bc..ca7982b456 100644
--- a/phpBB/styles/prosilver/theme/bidi.css
+++ b/phpBB/styles/prosilver/theme/bidi.css
@@ -907,17 +907,17 @@ li.breadcrumbs span:first-child > a {
 	padding: 3px;
 }
 
-.rtl .search-box .button {
+.rtl .button-search,
+.button-search-end {
 	float: right;
 }
 
-.rtl .search-box a.button {
+.button-search-end {
 	border-left-width: 1px;
 	border-right-width: 0;
-	border-radius: 4px 0 0 4px;
 }
 
-.rtl .search-header a.button {
+.rtl .search-header .button-search-end {
 	border: 0;
 }
 
diff --git a/phpBB/styles/prosilver/theme/buttons.css b/phpBB/styles/prosilver/theme/buttons.css
index 57a08491e1..726639ff92 100644
--- a/phpBB/styles/prosilver/theme/buttons.css
+++ b/phpBB/styles/prosilver/theme/buttons.css
@@ -25,6 +25,7 @@
 .button:focus,
 .button:hover {
  	text-decoration: none;
+ 	outline: none;
 }
 
 .caret {
@@ -37,6 +38,37 @@
 	vertical-align: top;
 }
 
+/* Posting page styles
+----------------------------------------*/
+.button-search,
+.button-search-end  {
+	float: left;
+	border-radius: 0;
+	margin: 0;
+	padding: 2px 5px;
+}
+
+.button-search-end {
+	border-left-width: 0;
+	border-radius: 0 4px 4px 0;
+}
+
+.search-header .button-search,
+.search-header .button-search-end {
+	border-top-width: 0;
+	border-bottom-width: 0;
+	padding: 3px 5px;
+}
+
+.search-header .button-search-end {
+	border-right-width: 0;
+}
+
+.button-icon-only {
+	padding-left: 3px;
+	padding-right: 3px;
+}
+
 /* Poster contact icons
 ----------------------------------------*/
 .contact-icons.dropdown-contents {
diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css
index 852a2843fd..77c17b568e 100644
--- a/phpBB/styles/prosilver/theme/colours.css
+++ b/phpBB/styles/prosilver/theme/colours.css
@@ -606,7 +606,8 @@ Colours and backgrounds for buttons.css
 	color: #D31141;
 }
 
-.button:hover, .dropdown-visible .dropdown-select, .nojs .dropdown-container:hover .dropdown-select {
+.button:hover,
+.button:focus {
 	border-color: #0A8ED0;
 	background-color: #FFFFFF; /* Old browsers */ /* FF3.6+ */
 	background-image: -webkit-linear-gradient(top, #E9E9E9 0%, #FFFFFF 100%);
@@ -615,13 +616,22 @@ Colours and backgrounds for buttons.css
 	text-shadow: 1px 1px 0 #FFFFFF, -1px -1px 0 #FFFFFF, -1px -1px 0 rgba(188, 42, 77, 0.2);
 }
 
-.button i {
+
+.button .icon,
+.button-secondary {
 	color: #8f8f8f;
 }
 
-.button:focus i,
-.button:hover i {
-	color: #1878cb;
+.button-secondary:focus,
+.button-secondary:hover,
+.button:focus .icon,
+.button:hover .icon {
+	color: #0A8ED0;
+}
+
+.button-search:hover,
+.button-search-end:hover {
+	border-color: #C7C3BF;
 }
 
 .caret	{ border-color: #DADADA; }
@@ -683,9 +693,7 @@ Colours and backgrounds for buttons.css
 
 .search-box .inputbox,
 .search-box .inputbox:hover,
-.search-box .inputbox:focus,
-.search-box .button:focus,
-.search-box .button:hover {
+.search-box .inputbox:focus {
 	border-color: #C7C3BF;
 }
 
diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index 78321878c2..b2eebe36f1 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -803,6 +803,10 @@ fieldset.fields1 dl.pmlist dd.recipients {
 	float: left;
 }
 
+.action-bar .button-search {
+	margin-right: 0;
+}
+
 /* Pagination
 ---------------------------------------- */
 .pagination {
diff --git a/phpBB/styles/prosilver/theme/forms.css b/phpBB/styles/prosilver/theme/forms.css
index fbea5f3a72..371a56fca5 100644
--- a/phpBB/styles/prosilver/theme/forms.css
+++ b/phpBB/styles/prosilver/theme/forms.css
@@ -142,6 +142,12 @@ dd textarea {
 	width: 95%;
 }
 
+/* Browser-specific tweaks */
+button::-moz-focus-inner {
+	padding: 0;
+	border: 0
+}
+
 /* Quick-login on index page */
 fieldset.quick-login {
 	margin-top: 5px;
@@ -378,22 +384,6 @@ input.button1:focus, input.button2:focus, input.button3:focus {
 	box-sizing: border-box;
 }
 
-.search-box .button {
-	float: left;
-	border-radius: 0;
-	margin: 0;
-	padding: 2px 5px;
-}
-
-.search-box a.button {
-	border-left-width: 0;
-	border-radius: 0 4px 4px 0;
-}
-
-.search-box .button span {
-	font-size: 0;
-}
-
 /* Search box (header)
 --------------------------------------------- */
 .search-header {
@@ -406,12 +396,6 @@ input.button1:focus, input.button2:focus, input.button3:focus {
 
 .search-header .inputbox { border: 0; }
 
-.search-header .button {
-	border-top-width: 0;
-	border-bottom-width: 0;
-	padding: 3px 5px;
-}
-
 .navbar .linklist > li.responsive-search { display: none; }
 
 input.search {