diff --git a/phpBB/assets/javascript/core.js b/phpBB/assets/javascript/core.js
index 9eba80542c..296c5b0ef9 100644
--- a/phpBB/assets/javascript/core.js
+++ b/phpBB/assets/javascript/core.js
@@ -15,7 +15,7 @@ var dark = $('#darkenwrapper');
 var loadingIndicator = $('#loading_indicator');
 var phpbbAlertTimer = null;
 
-var isTouch = (window && typeof window.ontouchstart !== 'undefined');
+phpbb.isTouch = (window && typeof window.ontouchstart !== 'undefined');
 
 /**
  * Display a loading screen
@@ -1011,7 +1011,7 @@ phpbb.resizeTextArea = function(items, options) {
 		resetCallback: function(item) { }
 	};
 
-	if (isTouch) return;
+	if (phpbb.isTouch) return;
 
 	if (arguments.length > 1) {
 		configuration = $.extend(configuration, options);
diff --git a/phpBB/styles/prosilver/template/forum_fn.js b/phpBB/styles/prosilver/template/forum_fn.js
index 1594d73517..a4ede51f4b 100644
--- a/phpBB/styles/prosilver/template/forum_fn.js
+++ b/phpBB/styles/prosilver/template/forum_fn.js
@@ -681,7 +681,7 @@ function parse_document(container)
 	/**
 	* Responsive link lists
 	*/
-	container.find('.linklist:not(.navlinks, [data-skip-responsive]), .postbody ul.profile-icons:not([data-skip-responsive])').each(function() {
+	container.find('.linklist:not(.navlinks, [data-skip-responsive]), .postbody .post-buttons:not([data-skip-responsive])').each(function() {
 		var $this = $(this),
 			$body = $('body'),
 			filterSkip = '.breadcrumbs, [data-skip-responsive]',
@@ -769,6 +769,11 @@ function parse_document(container)
 				menu.prepend(clone.not('.rightside'));
 				menu.find('li.leftside, li.rightside').removeClass('leftside rightside');
 				menu.find('.inputbox').parents('li:first').css('white-space', 'normal');
+
+				if ($this.hasClass('post-buttons')) {
+					$('.button', menu).removeClass('button icon-button');
+					$('.responsive-menu-link', item).addClass('button icon-button').prepend('<span></span>');
+				}
 				copied = true;
 			}
 			else {
@@ -914,6 +919,8 @@ function parse_document(container)
 	$(document).ready(function() {
 		// Swap .nojs and .hasjs
 		$('#phpbb.nojs').toggleClass('nojs hasjs');
+		$('#phpbb').toggleClass('hastouch', phpbb.isTouch);
+		$('#phpbb.hastouch').removeClass('notouch');
 
 		// Focus forms
 		$('form[data-focus]:first').each(function() {
diff --git a/phpBB/styles/prosilver/template/mcp_post.html b/phpBB/styles/prosilver/template/mcp_post.html
index 2b4ebec5c8..10ec6f3ea9 100644
--- a/phpBB/styles/prosilver/template/mcp_post.html
+++ b/phpBB/styles/prosilver/template/mcp_post.html
@@ -50,13 +50,20 @@
 	<div class="postbody">
 		<h3><a href="{U_VIEW_POST}">{POST_SUBJECT}</a></h3>
 
-		<!-- IF U_EDIT -->
-		<ul class="profile-icons">
-			<li class="edit-icon"><a href="{U_EDIT}" title="{L_EDIT_POST}"><span>{L_EDIT_POST}</span></a></li>
+		<ul class="post-buttons">
+			<li id="expand">
+				<a href="#post_details" onclick="viewableArea(getElementById('post_details'), true); var rev_text = getElementById('expand').getElementsByTagName('a').item(0).firstChild; if (rev_text.data.trim() == '{LA_EXPAND_VIEW}'){rev_text.data = '{LA_COLLAPSE_VIEW}'; } else if (rev_text.data.trim() == '{LA_COLLAPSE_VIEW}'){rev_text.data = '{LA_EXPAND_VIEW}';} return false;">
+					{L_EXPAND_VIEW}
+				</a>
+			</li>
+			<!-- IF U_EDIT -->
+				<li>
+					<a href="{U_EDIT}" title="{L_EDIT_POST}" class="button icon-button edit-icon">
+						<span>{L_EDIT_POST}</span>
+					</a>
+				</li>
+			<!-- ENDIF -->
 		</ul>
-		<!-- ENDIF -->
-
-		<span class="right-box" id="expand"><a href="#post_details" onclick="viewableArea(getElementById('post_details'), true); var rev_text = getElementById('expand').getElementsByTagName('a').item(0).firstChild; if (rev_text.data == '{LA_EXPAND_VIEW}'){rev_text.data = '{LA_COLLAPSE_VIEW}'; } else if (rev_text.data == '{LA_COLLAPSE_VIEW}'){rev_text.data = '{LA_EXPAND_VIEW}'}; return false;">{L_EXPAND_VIEW}</a></span>
 
 		<!-- IF S_PM -->
 		<p class="author">
diff --git a/phpBB/styles/prosilver/template/mcp_topic.html b/phpBB/styles/prosilver/template/mcp_topic.html
index bfe18579a6..19ee123eba 100644
--- a/phpBB/styles/prosilver/template/mcp_topic.html
+++ b/phpBB/styles/prosilver/template/mcp_topic.html
@@ -96,7 +96,18 @@
 			<div class="inner">
 
 			<div class="postbody" id="pr{postrow.POST_ID}">
-				<ul class="profile-icons"><li class="info-icon"><a href="{postrow.U_POST_DETAILS}" title="{L_POST_DETAILS}"><span>{L_POST_DETAILS}</span></a></li><li><label for="post_id_list_select_{postrow.POST_ID}">{L_SELECT}{L_COLON} <input type="checkbox" id="post_id_list_select_{postrow.POST_ID}" name="post_id_list[]" value="{postrow.POST_ID}"<!-- IF postrow.S_CHECKED --> checked="checked"<!-- ENDIF --> /></label></li></ul>
+				<ul class="post-buttons">
+					<li>
+						<a href="{postrow.U_POST_DETAILS}" title="{L_POST_DETAILS}" class="button icon-button info-icon">
+							<span>{L_POST_DETAILS}</span>
+						</a>
+					</li>
+					<li>
+						<label for="post_id_list_select_{postrow.POST_ID}">{L_SELECT}{L_COLON}
+							<input type="checkbox" id="post_id_list_select_{postrow.POST_ID}" name="post_id_list[]" value="{postrow.POST_ID}"<!-- IF postrow.S_CHECKED --> checked="checked"<!-- ENDIF --> />
+						</label>
+					</li>
+				</ul>
 
 				<h3><a href="{postrow.U_POST_DETAILS}">{postrow.POST_SUBJECT}</a></h3>
 				<p class="author"><a href="#pr{postrow.POST_ID}">{postrow.MINI_POST_IMG}</a> {L_POSTED} {postrow.POST_DATE} {L_POST_BY_AUTHOR} <strong>{postrow.POST_AUTHOR_FULL}</strong><!-- IF postrow.U_MCP_DETAILS --> [ <a href="{postrow.U_MCP_DETAILS}">{L_POST_DETAILS}</a> ]<!-- ENDIF --></p>
diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index 8c63ce9cea..d18fff6bb0 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -52,7 +52,7 @@
 {$STYLESHEETS}
 
 </head>
-<body id="phpbb" class="nojs section-{SCRIPT_NAME} {S_CONTENT_DIRECTION} {BODY_CLASS}">
+<body id="phpbb" class="nojs notouch section-{SCRIPT_NAME} {S_CONTENT_DIRECTION} {BODY_CLASS}">
 
 <!-- EVENT overall_header_body_before -->
 
diff --git a/phpBB/styles/prosilver/template/posting_topic_review.html b/phpBB/styles/prosilver/template/posting_topic_review.html
index d2faed5f8f..6909877196 100644
--- a/phpBB/styles/prosilver/template/posting_topic_review.html
+++ b/phpBB/styles/prosilver/template/posting_topic_review.html
@@ -24,14 +24,25 @@
 		<div class="postbody" id="pr{topic_review_row.POST_ID}">
 			<h3><a href="#pr{topic_review_row.POST_ID}">{topic_review_row.POST_SUBJECT}</a></h3>
 
+			<!-- IF (topic_review_row.POSTER_QUOTE and topic_review_row.DECODED_MESSAGE) or topic_review_row.U_MCP_DETAILS -->
+			<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 icon-button info-icon">
+						<span>{L_POST_DETAILS}</span>
+					</a>
+				<li>
+			<!-- ENDIF -->
 			<!-- IF topic_review_row.POSTER_QUOTE and topic_review_row.DECODED_MESSAGE -->
-			<ul class="profile-icons">
-				<li class="quote-icon"><a href="#postingbox" onclick="addquote({topic_review_row.POST_ID}, '{topic_review_row.POSTER_QUOTE}', '{LA_WROTE}');" title="{L_QUOTE} {topic_review_row.POST_AUTHOR}"><span>{L_QUOTE} {topic_review_row.POST_AUTHOR}</span></a></li>
+				<li>
+					<a href="#postingbox" onclick="addquote({topic_review_row.POST_ID}, '{topic_review_row.POSTER_QUOTE}', '{LA_WROTE}');" title="{L_QUOTE} {topic_review_row.POST_AUTHOR}" class="button icon-button quote-icon">
+						<span>{L_QUOTE} {topic_review_row.POST_AUTHOR}</span>
+					</a>
+				</li>
+			<!-- ENDIF -->
 			</ul>
 			<!-- ENDIF -->
 
-			<!-- IF topic_review_row.U_MCP_DETAILS --><div class="right-box"><a href="{topic_review_row.U_MCP_DETAILS}">{L_POST_DETAILS}</a></div><!-- ENDIF -->
-
 			<p class="author"><!-- IF S_IS_BOT -->{topic_review_row.MINI_POST_IMG}<!-- ELSE --><a href="{topic_review_row.U_MINI_POST}">{topic_review_row.MINI_POST_IMG}</a><!-- ENDIF --> {L_POST_BY_AUTHOR} <strong>{topic_review_row.POST_AUTHOR_FULL}</strong> &raquo; {topic_review_row.POST_DATE}  </p>
 			<div class="content">{topic_review_row.MESSAGE}</div>
 
diff --git a/phpBB/styles/prosilver/template/ucp_pm_history.html b/phpBB/styles/prosilver/template/ucp_pm_history.html
index d08f622d1f..0e9c3844cc 100644
--- a/phpBB/styles/prosilver/template/ucp_pm_history.html
+++ b/phpBB/styles/prosilver/template/ucp_pm_history.html
@@ -18,8 +18,12 @@
 			<h3><a href="{history_row.U_VIEW_MESSAGE}" <!-- IF history_row.S_CURRENT_MSG -->class="current"<!-- ENDIF -->>{history_row.SUBJECT}</a></h3>
 
 			<!-- IF history_row.U_QUOTE or history_row.MESSAGE_AUTHOR_QUOTE -->
-			<ul class="profile-icons">
-				<li class="quote-icon"><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}');"<!-- ENDIF --> title="{L_QUOTE} {history_row.MESSAGE_AUTHOR}"><span>{L_QUOTE} {history_row.MESSAGE_AUTHOR}</span></a></li>
+			<ul class="post-buttons">
+				<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}');"<!-- ENDIF --> title="{L_QUOTE} {history_row.MESSAGE_AUTHOR}" class="button icon-button quote-icon">
+						<span>{L_QUOTE} {history_row.MESSAGE_AUTHOR}</span>
+					</a>
+				</li>
 			</ul>
 			<!-- ENDIF -->
 
diff --git a/phpBB/styles/prosilver/template/ucp_pm_message_header.html b/phpBB/styles/prosilver/template/ucp_pm_message_header.html
index 840eba4c83..56e27811c6 100644
--- a/phpBB/styles/prosilver/template/ucp_pm_message_header.html
+++ b/phpBB/styles/prosilver/template/ucp_pm_message_header.html
@@ -8,16 +8,31 @@
 	<!-- IF FOLDER_STATUS and FOLDER_MAX_MESSAGES neq 0 --><p>{FOLDER_STATUS}</p><!-- ENDIF -->
 	<!-- IF U_POST_REPLY_PM or U_POST_NEW_TOPIC or U_FORWARD_PM -->
 		<div class="buttons">
-			<!-- IF U_POST_REPLY_PM --><div class="pmreply-icon"><a title="{L_POST_REPLY_PM}" href="{U_POST_REPLY_PM}"><span></span>{L_BUTTON_PM_REPLY}</a></div>
-			<!-- ELSEIF U_POST_NEW_TOPIC --><div class="newpm-icon"><a href="{U_POST_NEW_TOPIC}" accesskey="n" title="{L_UCP_PM_COMPOSE}"><span></span>{L_BUTTON_PM_NEW}</a></div><!-- ENDIF -->
-			<!-- IF U_FORWARD_PM --><div class="forwardpm-icon"><a title="{L_POST_FORWARD_PM}" href="{U_FORWARD_PM}"><span></span>{L_BUTTON_PM_FORWARD}</a></div><!-- ENDIF -->
-			<!-- IF U_POST_REPLY_PM and S_PM_RECIPIENTS gt 1 --><div class="reply-all"><a title="{L_REPLY_TO_ALL}" href="{U_POST_REPLY_ALL}">{L_BUTTON_PM_REPLY_ALL}</a></div><!-- ENDIF -->
+			<!-- IF U_POST_REPLY_PM -->
+				<a title="{L_POST_REPLY_PM}" href="{U_POST_REPLY_PM}" class="button icon-button pmreply-icon">
+					{L_BUTTON_PM_REPLY}
+				</a>
+			<!-- ELSEIF U_POST_NEW_TOPIC -->
+				<a href="{U_POST_NEW_TOPIC}" accesskey="n" title="{L_UCP_PM_COMPOSE}" class="button icon-button newpm-icon">
+					{L_BUTTON_PM_NEW}
+				</a>
+			<!-- ENDIF -->
+			<!-- IF U_FORWARD_PM -->
+				<a title="{L_POST_FORWARD_PM}" href="{U_FORWARD_PM}" class="button icon-button forwardpm-icon">
+					{L_BUTTON_PM_FORWARD}
+				</a>
+			<!-- ENDIF -->
+			<!-- IF U_POST_REPLY_PM and S_PM_RECIPIENTS gt 1 -->
+				<a title="{L_REPLY_TO_ALL}" href="{U_POST_REPLY_ALL}" class="button icon-button reply-all">
+					{L_BUTTON_PM_REPLY_ALL}
+				</a>
+			<!-- ENDIF -->
 		</div>
 	<!-- ENDIF -->
 
 	<!-- IF not S_IS_BOT and U_PRINT_PM -->
 		<div class="dropdown-container dropdown-button-control topic-tools">
-			<span title="{L_PM_TOOLS}" class="dropdown-trigger dropdown-select dropdown-select-icon tools-icon"><span></span></span>
+			<span title="{L_PM_TOOLS}" class="dropdown-trigger dropdown-select button icon-button tools-icon"></span>
 			<div class="dropdown hidden">
 				<div class="pointer"><div class="pointer-inner"></div></div>
 				<ul class="dropdown-contents">
diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
index f58b334a60..84ab6ecb44 100644
--- a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
+++ b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
@@ -66,11 +66,27 @@
 		<h3 class="first">{SUBJECT}</h3>
 
 		<!-- IF U_DELETE or U_EDIT or U_QUOTE or U_REPORT -->
-		<ul class="profile-icons">
-			<!-- IF U_EDIT --><li class="edit-icon"><a href="{U_EDIT}" title="{L_POST_EDIT_PM}"><span>{L_POST_EDIT_PM}</span></a></li><!-- ENDIF -->
-			<!-- IF U_DELETE --><li class="delete-icon"><a href="{U_DELETE}" title="{L_DELETE_MESSAGE}"><span>{L_DELETE_MESSAGE}</span></a></li><!-- ENDIF -->
-			<!-- IF U_REPORT --><li class="report-icon"><a href="{U_REPORT}" title="{L_REPORT_PM}"><span>{L_REPORT_PM}</span></a></li><!-- ENDIF -->
-			<!-- IF U_QUOTE --><li class="quote-icon"><a href="{U_QUOTE}" title="{L_POST_QUOTE_PM}"><span>{L_POST_QUOTE_PM}</span></a></li><!-- ENDIF -->
+		<ul class="post-buttons">
+			<!-- IF U_EDIT -->
+				<li>
+					<a href="{U_EDIT}" title="{L_POST_EDIT_PM}" class="button icon-button edit-icon"><span>{L_POST_EDIT_PM}</span></a>
+				</li>
+			<!-- ENDIF -->
+			<!-- IF U_DELETE -->
+				<li>
+					<a href="{U_DELETE}" title="{L_DELETE_MESSAGE}" class="button icon-button delete-icon"><span>{L_DELETE_MESSAGE}</span></a>
+				</li>
+			<!-- ENDIF -->
+			<!-- IF U_REPORT -->
+				<li>
+					<a href="{U_REPORT}" title="{L_REPORT_PM}" class="button icon-button report-icon"><span>{L_REPORT_PM}</span></a>
+				</li>
+			<!-- ENDIF -->
+			<!-- IF U_QUOTE -->
+				<li>
+					<a href="{U_QUOTE}" title="{L_POST_QUOTE_PM}" class="button icon-button quote-icon"><span>{L_POST_QUOTE_PM}</span></a>
+				</li>
+			<!-- ENDIF -->
 		</ul>
 		<!-- ENDIF -->
 
diff --git a/phpBB/styles/prosilver/template/viewforum_body.html b/phpBB/styles/prosilver/template/viewforum_body.html
index 7a0ebaafcf..c747dd01f5 100644
--- a/phpBB/styles/prosilver/template/viewforum_body.html
+++ b/phpBB/styles/prosilver/template/viewforum_body.html
@@ -39,7 +39,9 @@
 
 	<!-- IF not S_IS_BOT and S_DISPLAY_POST_INFO -->
 		<div class="buttons">
-			<div class="<!-- IF S_IS_LOCKED -->locked-icon<!-- ELSE -->post-icon<!-- ENDIF -->" title="<!-- IF S_IS_LOCKED -->{L_FORUM_LOCKED}<!-- ELSE -->{L_POST_TOPIC}<!-- ENDIF -->"><a href="{U_POST_NEW_TOPIC}"><span></span><!-- IF S_IS_LOCKED -->{L_BUTTON_FORUM_LOCKED}<!-- ELSE -->{L_BUTTON_NEW_TOPIC}<!-- ENDIF --></a></div>
+			<a href="{U_POST_NEW_TOPIC}" class="button icon-button <!-- IF S_IS_LOCKED -->locked-icon<!-- ELSE -->post-icon<!-- ENDIF -->" title="<!-- IF S_IS_LOCKED -->{L_FORUM_LOCKED}<!-- ELSE -->{L_POST_TOPIC}<!-- ENDIF -->">
+				<!-- IF S_IS_LOCKED -->{L_BUTTON_FORUM_LOCKED}<!-- ELSE -->{L_BUTTON_NEW_TOPIC}<!-- ENDIF -->
+			</a>
 		</div>
 	<!-- ENDIF -->
 
@@ -222,9 +224,11 @@
 <!-- IF .topicrow and not S_DISPLAY_ACTIVE -->
 	<div class="topic-actions">
 		<!-- IF not S_IS_BOT and S_DISPLAY_POST_INFO -->
-		<div class="buttons">
-			<div class="<!-- IF S_IS_LOCKED -->locked-icon<!-- ELSE -->post-icon<!-- ENDIF -->" title="<!-- IF S_IS_LOCKED -->{L_FORUM_LOCKED}<!-- ELSE -->{L_POST_TOPIC}<!-- ENDIF -->"><a href="{U_POST_NEW_TOPIC}"><span></span><!-- IF S_IS_LOCKED -->{L_BUTTON_FORUM_LOCKED}<!-- ELSE -->{L_BUTTON_NEW_TOPIC}<!-- ENDIF --></a></div>
-		</div>
+			<div class="buttons">
+				<a href="{U_POST_NEW_TOPIC}" class="button icon-button <!-- IF S_IS_LOCKED -->locked-icon<!-- ELSE -->post-icon<!-- ENDIF -->" title="<!-- IF S_IS_LOCKED -->{L_FORUM_LOCKED}<!-- ELSE -->{L_POST_TOPIC}<!-- ENDIF -->">
+					<!-- IF S_IS_LOCKED -->{L_BUTTON_FORUM_LOCKED}<!-- ELSE -->{L_BUTTON_NEW_TOPIC}<!-- ENDIF -->
+				</a>
+			</div>
 		<!-- ENDIF -->
 
 		<div class="pagination">
diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html
index 18fa7ce783..eb61bd3e72 100644
--- a/phpBB/styles/prosilver/template/viewtopic_body.html
+++ b/phpBB/styles/prosilver/template/viewtopic_body.html
@@ -29,7 +29,9 @@
 
 	<div class="buttons">
 	<!-- IF not S_IS_BOT and S_DISPLAY_REPLY_INFO -->
-		<div class="<!-- IF S_IS_LOCKED -->locked-icon<!-- ELSE -->reply-icon<!-- ENDIF -->"><a href="{U_POST_REPLY_TOPIC}" title="<!-- IF S_IS_LOCKED -->{L_TOPIC_LOCKED}<!-- ELSE -->{L_POST_REPLY}<!-- ENDIF -->"><span></span><!-- IF S_IS_LOCKED -->{L_BUTTON_TOPIC_LOCKED}<!-- ELSE -->{L_BUTTON_POST_REPLY}<!-- ENDIF --></a></div>
+		<a href="{U_POST_REPLY_TOPIC}" class="button icon-button <!-- IF S_IS_LOCKED -->locked-icon<!-- ELSE -->reply-icon<!-- ENDIF -->" title="<!-- IF S_IS_LOCKED -->{L_TOPIC_LOCKED}<!-- ELSE -->{L_POST_REPLY}<!-- ENDIF -->">
+			<!-- IF S_IS_LOCKED -->{L_BUTTON_TOPIC_LOCKED}<!-- ELSE -->{L_BUTTON_POST_REPLY}<!-- ENDIF -->
+		</a>
 	<!-- ENDIF -->
 	</div>
 
@@ -197,14 +199,38 @@
 
 		<!-- IF not S_IS_BOT -->
 			<!-- IF postrow.U_EDIT or postrow.U_DELETE or postrow.U_REPORT or postrow.U_WARN or postrow.U_INFO or postrow.U_QUOTE -->
-				<ul class="profile-icons">
+				<ul class="post-buttons">
 					<!-- EVENT viewtopic_body_post_buttons_before -->
-					<!-- IF postrow.U_EDIT --><li class="edit-icon"><a href="{postrow.U_EDIT}" title="{L_EDIT_POST}"><span>{L_EDIT_POST}</span></a></li><!-- ENDIF -->
-					<!-- IF postrow.U_DELETE --><li class="delete-icon"><a href="{postrow.U_DELETE}" title="{L_DELETE_POST}"><span>{L_DELETE_POST}</span></a></li><!-- ENDIF -->
-					<!-- IF postrow.U_REPORT --><li class="report-icon"><a href="{postrow.U_REPORT}" title="{L_REPORT_POST}"><span>{L_REPORT_POST}</span></a></li><!-- ENDIF -->
-					<!-- IF postrow.U_WARN --><li class="warn-icon"><a href="{postrow.U_WARN}" title="{L_WARN_USER}"><span>{L_WARN_USER}</span></a></li><!-- ENDIF -->
-					<!-- IF postrow.U_INFO --><li class="info-icon"><a href="{postrow.U_INFO}" title="{L_INFORMATION}"><span>{L_INFORMATION}</span></a></li><!-- ENDIF -->
-					<!-- IF postrow.U_QUOTE --><li class="quote-icon"><a href="{postrow.U_QUOTE}" title="{L_REPLY_WITH_QUOTE}"><span>{L_REPLY_WITH_QUOTE}</span></a></li><!-- ENDIF -->
+					<!-- IF postrow.U_EDIT -->
+						<li>
+							<a href="{postrow.U_EDIT}" title="{L_EDIT_POST}" class="button icon-button edit-icon"><span>{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 delete-icon"><span>{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 report-icon"><span>{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 warn-icon"><span>{L_WARN_USER}</span></a>
+						</li>
+					<!-- ENDIF -->
+					<!-- IF postrow.U_INFO -->
+						<li>
+							<a href="{postrow.U_INFO}" title="{L_INFORMATION}" class="button icon-button info-icon"><span>{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 quote-icon"><span>{L_QUOTE}</span></a>
+						</li>
+					<!-- ENDIF -->
 					<!-- EVENT viewtopic_body_post_buttons_after -->
 				</ul>
 			<!-- ENDIF -->
@@ -316,7 +342,9 @@
 <div class="topic-actions">
 	<div class="buttons">
 	<!-- IF not S_IS_BOT and S_DISPLAY_REPLY_INFO -->
-		<div class="<!-- IF S_IS_LOCKED -->locked-icon<!-- ELSE -->reply-icon<!-- ENDIF -->"><a href="{U_POST_REPLY_TOPIC}" title="<!-- IF S_IS_LOCKED -->{L_TOPIC_LOCKED}<!-- ELSE -->{L_POST_REPLY}<!-- ENDIF -->"><span></span><!-- IF S_IS_LOCKED -->{L_BUTTON_TOPIC_LOCKED}<!-- ELSE -->{L_BUTTON_POST_REPLY}<!-- ENDIF --></a></div>
+		<a href="{U_POST_REPLY_TOPIC}" class="button icon-button <!-- IF S_IS_LOCKED -->locked-icon<!-- ELSE -->reply-icon<!-- ENDIF -->" title="<!-- IF S_IS_LOCKED -->{L_TOPIC_LOCKED}<!-- ELSE -->{L_POST_REPLY}<!-- ENDIF -->">
+			<!-- IF S_IS_LOCKED -->{L_BUTTON_TOPIC_LOCKED}<!-- ELSE -->{L_BUTTON_POST_REPLY}<!-- ENDIF -->
+		</a>
 	<!-- ENDIF -->
 	</div>
 
diff --git a/phpBB/styles/prosilver/template/viewtopic_topic_tools.html b/phpBB/styles/prosilver/template/viewtopic_topic_tools.html
index 89f34d1b3a..5394c00f6a 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 S_HAS_ATTACHMENTS 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_TOPIC_TOOLS}" class="dropdown-trigger dropdown-select dropdown-select-icon tools-icon"><span></span></span>
+		<span title="{L_TOPIC_TOOLS}" class="button icon-button tools-icon dropdown-trigger dropdown-select"></span>
 		<div class="dropdown hidden">
 			<div class="pointer"><div class="pointer-inner"></div></div>
 			<ul class="dropdown-contents">
diff --git a/phpBB/styles/prosilver/theme/bidi.css b/phpBB/styles/prosilver/theme/bidi.css
index c2d15b9ef2..78b95d902e 100644
--- a/phpBB/styles/prosilver/theme/bidi.css
+++ b/phpBB/styles/prosilver/theme/bidi.css
@@ -554,13 +554,27 @@ ul.linklist li.small-icon > a, ul.linklist li.breadcrumbs span:first-child > a {
 /* Rollover buttons
    Based on: http://wellstyled.com/css-nopreload-rollovers.html
 ----------------------------------------*/
-.rtl .buttons {
-	float: right;
+.rtl .icon-button.dropdown-select {
+	padding-left: 26px;
+	padding-right: 8px;
 }
 
-/* Rollover state */
-.rtl .buttons div {
-	margin: 0 1px 0 5px;
+.rtl .icon-button:before {
+	float: left;
+	margin-left: 0;
+	margin-right: 2px;
+}
+
+.dropdown-select:after {
+	border-left: 0;
+	border-right-style: solid;
+	border-right-width: 1px;
+	left: 0;
+	right: auto;
+}
+
+.rtl .buttons, .rtl .buttons .button {
+	float: right;
 }
 
 /* Icon images
@@ -574,17 +588,18 @@ ul.linklist li.small-icon > a, ul.linklist li.breadcrumbs span:first-child > a {
 	padding-right: 0;
 }
 
-/* Poster profile icons
-----------------------------------------*/
-/* Rollover state */
-.rtl .postprofile ul.profile-icons li {
-	float: right;
-	margin: 0 0 3px 6px;
+/* Post control buttons
+--------------------------------------------- */
+.rtl .post-buttons {
+	float: left;
 }
 
-/* Positioning of moderator icons */
-.rtl .postbody ul.profile-icons {
-	float: left;
+.rtl .post-buttons li {
+	float: right;
+}
+
+.post-buttons .icon-button:before {
+	margin-right: 0;
 }
 
 /**
diff --git a/phpBB/styles/prosilver/theme/buttons.css b/phpBB/styles/prosilver/theme/buttons.css
index 9ca04516cc..7d9aae86d7 100644
--- a/phpBB/styles/prosilver/theme/buttons.css
+++ b/phpBB/styles/prosilver/theme/buttons.css
@@ -4,102 +4,84 @@
 /* Rollover buttons
    Based on: http://wellstyled.com/css-nopreload-rollovers.html
 ----------------------------------------*/
-.buttons {
-	float: left;
-	width: auto;
-	height: auto;
-}
-
-/* Rollover state */
-.buttons div, .dropdown-select {
-	float: left;
-	margin: 0 5px 0 0;
-}
-
-/* Rolloff state */
-.buttons div a, .dropdown-select {
+.button {
+	cursor: pointer;
 	display: inline-block;
-	line-height: 17.5px;
 	height: 18px;
 	font-size: 13px;
 	white-space: nowrap;
 	border: 1px solid transparent;
 	border-radius: 4px;
 	background: transparent none 0 0 repeat-x;
-	padding: 2px 22px 2px 8px;
+	padding: 2px 8px;
 	font-family: "Open Sans", "Droid Sans", Verdana, Arial, Helvetica;
-	font-weight: 600;
 	position: relative;
 	text-decoration: none !important;
 	outline-style: none !important;
 	vertical-align: bottom;
-	*padding-right: 8px;
 }
 
-.buttons div span { display: none; }
+.icon-button.dropdown-select {
+	padding-right: 28px;
+}
 
-.buttons div a:after, .dropdown-select:after {
-	content: '';
-	display: block;
-	position: absolute;
-	top: 50%;
-	right: 6px;
-	width: 12px;
-	height: 12px;
-	margin-top: -6px;
+.icon-button:before {
 	background: transparent 0 0 no-repeat;
-}
-
-.buttons div a:hover:after {
-	background-position: 0 -20px;
-}
-
-.dropdown-select {
-	cursor: pointer;
-	font-family: inherit;
-	font-size: 1em;
-	font-weight: normal;
+	content: '';
+	display: inline-block;
+	float: right;
+	height: 12px;
+	margin: 3px 0 0 2px;
+	width: 12px;
 }
 
 .dropdown-select:after {
 	background-position: -103px 10px;
 	border-left: 1px solid;
-	margin-top: 0;
+	content: '';
+	position: absolute;
 	top: 0;
 	right: 0;
-	height: 21px;
-	width: 15px;
+	height: 22px;
+	width: 16px;
 }
 
 .dropdown-visible .dropdown-select:after, .nojs .dropdown-container:hover .dropdown-select:after {
 	background-position: -103px -10px;
 }
 
-.dropdown-select-icon:before {
-	content: '';
-	display: block;
+.buttons, .buttons .button {
 	float: left;
-	margin-right: 4px;
-	margin-top: 2px;
+}
+
+.buttons .button, .dropdown-select {
+	margin-right: 5px;
 }
 
 /* Big button images */
-.buttons div.reply-icon a:after, .buttons div.pmreply-icon a:after { background-position: -20px 0; }
-.buttons div.reply-icon a:hover:after, .buttons div.pmreply-icon a:hover:after	{ background-position: -20px -20px; }
+.reply-icon:before, .pmreply-icon:before					{ background-position: -20px 0; }
+.reply-icon:hover:before, .pmreply-icon:hover:before		{ background-position: -20px -20px; }
 
-.buttons div.post-icon a:after, .buttons div.newpm-icon a:after	{ background-position: 0 0; }
-.buttons div.post-icon a:hover:after, .buttons div.newpm-icon a:hover:after	{ background-position: 0 -20px; }
+.post-icon:before, .newpm-icon:before, .reply-all:before	{ background-position: 0 0; }
+.post-icon:hover:before,
+.newpm-icon:hover:before,
+.reply-all:hover:before										{ background-position: 0 -20px; }
 
-.buttons div.locked-icon a:after	{ background-position: -60px 0; }
-.buttons div.locked-icon a:hover:after	{ background-position: -60px -20px; }
+.locked-icon:before											{ background-position: -60px 0; }
+.locked-icon:hover:before									{ background-position: -60px -20px; }
 
-.buttons div.forwardpm-icon a:after	{ background-position: -40px 0; }
-.buttons div.forwardpm-icon a:hover:after	{ background-position: -40px -20px; }
+.forwardpm-icon:before										{ background-position: -40px 0; }
+.forwardpm-icon:hover:before								{ background-position: -40px -20px; }
 
-.dropdown-select.tools-icon:before { background-position: -80px 0; height: 16px; width: 16px; }
+.tools-icon:before {
+	background-position: -80px 0;
+	height: 16px;
+	margin-top: 2px;
+	width: 16px;
+}
 
-.dropdown-visible .dropdown-select.tools-icon:before,
-.nojs .dropdown-container:hover .dropdown-select.tools-icon:before { background-position: -80px -20px; }
+.dropdown-visible .tools-icon:before,
+.nojs .dropdown-container:hover .tools-icon:before			{ background-position: -80px -20px; }
 
 /* Icon images
 ---------------------------------------- */
@@ -118,102 +100,8 @@ ul.linklist.bulletin li.small-icon:before {
 	display: none;
 }
 
-/* Poster profile icons
+/* Poster contact icons
 ----------------------------------------*/
-ul.profile-icons {
-	padding-top: 10px;
-	list-style: none;
-}
-
-/* Rollover state */
-ul.profile-icons li {
-	float: left;
-	margin: 0 6px 3px 0;
-	background-position: 0 100%;
-}
-
-/* Rolloff state */
-ul.profile-icons li a {
-	display: block;
-	width: 100%;
-	height: 100%;
-	background-position: 0 0;
-}
-
-/* Hide <a> text and hide off-state image when rolling over (prevents flicker in IE) */
-ul.profile-icons li span { display:none; }
-ul.profile-icons li a:hover { background: none; }
-
-/* Positioning of moderator icons */
-.postbody ul.profile-icons {
-	float: right;
-	width: auto;
-	padding: 0;
-}
-
-.postbody ul.profile-icons li {
-	margin: 0 3px;
-}
-
-/* Responsive icons in postbody */
-.postbody ul.profile-icons.responsive .responsive-menu {
-	position: relative;
-}
-
-ul.profile-icons.responsive a.responsive-menu-link {
-	display: inline-block;
-	position: relative;
-	margin: 0 5px;
-	width: 20px;
-	height: 20px;
-	text-decoration: none;
-	background: none top left no-repeat;
-}
-
-ul.profile-icons.responsive a.responsive-menu-link:hover {
-	background-position: 0 -20px;
-}
-
-ul.profile-icons.responsive a.responsive-menu-link:before {
-	content: '';
-	position: absolute;
-	left: 0;
-	top: 7px;
-	height: .125em;
-	width: 14px;
-	border-bottom: 0.125em solid transparent;
-	border-top: 0.375em double transparent;
-}
-
-.postbody ul.profile-icons.responsive .popup-pointer {
-	left: auto;
-	right: 7px;
-	top: 20px;
-}
-
-.postbody ul.profile-icons .dropdown li, .postbody ul.profile-icons .dropdown li a {
-	display: block;
-	background: transparent none;
-	width: auto;
-	height: auto;
-	margin: 0;
-	padding: 0;
-	float: none;
-	list-style-type: none;
-}
-
-.postbody ul.profile-icons .dropdown li span {
-	display: block;
-	text-align: right;
-	font-size: 1.2em;
-	line-height: 1.8em;
-	white-space: nowrap;
-}
-
-.hasjs .postbody ul.profile-icons {
-	max-width: 40%;
-}
-
 .contact-icons.dropdown-contents {
 	min-width: 0;
 	padding: 0;
@@ -245,8 +133,7 @@ ul.profile-icons.responsive a.responsive-menu-link:before {
 	clear: left;
 }
 
-
-/* Profile & navigation icons */
+/* Profile icons */
 .pm-icon		{ background-position: 0 0; }
 .email-icon		{ background-position: -21px 0; }
 .jabber-icon	{ background-position: -80px 0; }
@@ -261,39 +148,74 @@ ul.profile-icons.responsive a.responsive-menu-link:before {
 .phpbb_twitter-icon		{ background-position: -203px 0; }
 .phpbb_yahoo-icon		{ background-position: -224px 0; }
 
-.quote-icon, .quote-icon a		{ background: none top left no-repeat; }
+/* Post control buttons
+--------------------------------------------- */
+.post-buttons {
+	float: right;
+	list-style: none;
+	margin-top: 2px;
+}
 
-/* Moderator icons */
-.report-icon, .report-icon a		{ background: none top left no-repeat; }
-.warn-icon, .warn-icon a			{ background: none top left no-repeat; }
-.edit-icon, .edit-icon a			{ background: none top left no-repeat; }
-.delete-icon, .delete-icon a		{ background: none top left no-repeat; }
-.info-icon, .info-icon a			{ background: none top left no-repeat; }
+.notouch.section-viewtopic .post-buttons {
+	opacity: 0;
+	transition: opacity .5s;
+}
 
-/* Set profile icon dimensions */
-ul.profile-icons li.email-icon		{ width: 20px; height: 20px; }
-ul.profile-icons li.phpbb_aol-icon	{ width: 20px; height: 20px; }
-ul.profile-icons li.aim-icon	{ width: 20px; height: 20px; }
-ul.profile-icons li.yahoo-icon	{ width: 20px; height: 20px; }
-ul.profile-icons li.phpbb_yahoo-icon	{ width: 20px; height: 20px; }
-ul.profile-icons li.web-icon	{ width: 20px; height: 20px; }
-ul.profile-icons li.phpbb_website-icon	{ width: 20px; height: 20px; }
-ul.profile-icons li.msnm-icon	{ width: 20px; height: 20px; }
-ul.profile-icons li.phpbb_wlm-icon	{ width: 20px; height: 20px; }
-ul.profile-icons li.icq-icon	{ width: 20px; height: 20px; }
-ul.profile-icons li.phpbb_icq-icon	{ width: 20px; height: 20px; }
-ul.profile-icons li.jabber-icon	{ width: 20px; height: 20px; }
-ul.profile-icons li.pm-icon		{ width: 28px; height: 20px; }
-ul.profile-icons li.quote-icon	{ width: 54px; height: 20px; }
-ul.profile-icons li.report-icon	{ width: 20px; height: 20px; }
-ul.profile-icons li.edit-icon	{ width: 42px; height: 20px; }
-ul.profile-icons li.delete-icon	{ width: 20px; height: 20px; }
-ul.profile-icons li.info-icon	{ width: 20px; height: 20px; }
-ul.profile-icons li.warn-icon	{ width: 20px; height: 20px; }
-ul.profile-icons a.responsive-menu-link	{ width: 20px; height: 20px; }
+.notouch.section-viewtopic .post:hover .post-buttons {
+	opacity: 1;
+}
 
-/* Fix profile icon default margins */
-ul.profile-icons li.edit-icon	{ margin: 0 0 0 3px; }
-ul.profile-icons li.quote-icon	{ margin: 0 0 0 10px; }
-ul.profile-icons li.info-icon, ul.profile-icons li.report-icon	{ margin: 0 3px 0 0; }
+.post-buttons li {
+	float: left;
+	margin-right: 3px;
+}
 
+.post-buttons .icon-button {
+	padding: 0 5px;
+}
+
+.hastouch .post-buttons .icon-button {
+	padding: 2px 8px;
+}
+
+.post-buttons .icon-button span {
+	display: block;
+	height: 0;
+	overflow: hidden;
+	position: absolute;
+	width: 1px;
+}
+
+.post-buttons .icon-button:before {
+	margin-left: 0;
+}
+
+.quote-icon:before							{ background-position: -122px 0; }
+.quote-icon:hover:before					{ background-position: -122px -21px; }
+.edit-icon:before							{ background-position: -137px 0; }
+.edit-icon:hover:before						{ background-position: -137px -21px; }
+.warn-icon:before							{ background-position: -208px 0; }
+.warn-icon:hover:before						{ background-position: -208px -21px; }
+.delete-icon:before							{ background-position: -152px 0; }
+.delete-icon:hover:before					{ background-position: -152px -21px; }
+.report-icon:before							{ background-position: -165px 0; }
+.report-icon:hover:before					{ background-position: -165px -21px; }
+.info-icon:before							{ background-position: -175px 0; }
+.info-icon:hover:before						{ background-position: -175px -21px; }
+.button.responsive-menu-link:before			{ background-position: -191px 0; }
+.button.responsive-menu-link:hover:before	{ background-position: -191px -21px; }
+
+/* Responsive buttons in post body */
+.post-buttons .dropdown {
+	top: 18px;
+}
+
+.post-buttons .dropdown a {
+	display: block;
+	font-size: 1.2em;
+	text-align: right;
+}
+
+.hasjs .postbody .post-buttons {
+	max-width: 40%;
+}
diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css
index a7d7184642..72c8b5f226 100644
--- a/phpBB/styles/prosilver/theme/colours.css
+++ b/phpBB/styles/prosilver/theme/colours.css
@@ -668,8 +668,7 @@ dd.profile-warnings {
 --------------------------------------------------------------
 Colours and backgrounds for buttons.css
 -------------------------------------------------------------- */
-
-.buttons div a, .dropdown-select {
+.button, .button:visited {
 	border-color: #C7C3BF;
 	background-color: #FFFFFF;
 	background-image: -moz-linear-gradient(top, #FFFFFF, #E9E9E9);
@@ -679,19 +678,10 @@ Colours and backgrounds for buttons.css
 	-ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorStr='#FFFFFF', EndColorStr='#E9E9E9')";
 	box-shadow: 0 0 0 1px #FFFFFF inset;
 	-webkit-box-shadow: 0 0 0 1px #FFFFFF inset;
-	color: #BC2A4D !important;
+	color: #BC2A4D;
 }
 
-.dropdown-select {
-	color: #5C6482 !important;
-}
-
-.dropdown-select:after {
-	border-color: #DADADA;
-}
-
-.buttons div a:hover, .dropdown-select:hover, .dropdown-visible .dropdown-select,
-.dropdown-visible .dropdown-select:hover, .nojs .dropdown-container:hover .dropdown-select  {
+.button:hover, .dropdown-visible .dropdown-select, .nojs .dropdown-container:hover .dropdown-select {
 	border-color: #0a8ed0;
 	background-image: -moz-linear-gradient(top, #E9E9E9, #FFFFFF);
 	background-image: -webkit-linear-gradient(top, #E9E9E9, #FFFFFF);
@@ -701,26 +691,16 @@ 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);
 }
 
-.dropdown-select:hover {
-	border-color: #C7C3BF; 
-}
+.dropdown-select:after	{ border-color: #DADADA; }
+.dropdown-select:hover	{ border-color: #C7C3BF; }
 
 .dropdown-visible .dropdown-select, .dropdown-visible .dropdown-select:hover, .nojs .dropdown-container:hover .dropdown-select {
 	border-color: #A6B2BA;
-	color: #105289 !important;
+	color: #105289;
 }
 
-.buttons div a:after, .dropdown-select-icon:before, .dropdown-select:after {
-	background-image: url("images/buttons.png");
-}
-
-.contact-icons a {
-	border-color: #DCDCDC;
-}
-
-.contact-icons a:hover {
-	background-color: #F2F6F9;
-}
+.contact-icons a		{ border-color: #DCDCDC; }
+.contact-icons a:hover	{ background-color: #F2F6F9; }
 
 /* Icon images
 ---------------------------------------- */
@@ -744,17 +724,8 @@ Colours and backgrounds for buttons.css
 .icon-print						{ background-image: url("./images/icon_print.gif"); }
 
 /* Profile & navigation icons */
-.contact-icon { background-image: url("./images/icons_contact.png"); }
-
-.quote-icon, .quote-icon a		{ background-image: url("./en/icon_post_quote.gif"); }
-ul.profile-icons.responsive a.responsive-menu-link	{ background-image: url("./images/icon_post_menu.png"); }
-
-/* Moderator icons */
-.report-icon, .report-icon a		{ background-image: url("./images/icon_post_report.gif"); }
-.edit-icon, .edit-icon a			{ background-image: url("./en/icon_post_edit.gif"); }
-.delete-icon, .delete-icon a		{ background-image: url("./images/icon_post_delete.gif"); }
-.info-icon, .info-icon a			{ background-image: url("./images/icon_post_info.gif"); }
-.warn-icon, .warn-icon a			{ background-image: url("./images/icon_user_warn.gif"); } /* Need updated warn icon */
+.contact-icon													{ background-image: url("./images/icons_contact.png"); }
+.icon-button:before, .dropdown-select:after						{ background-image: url("./images/icons_button.png"); }
 
 /* Forum icons & Topic icons */
 .global_read													{ background-image: url("./images/announce_read.gif"); }
diff --git a/phpBB/styles/prosilver/theme/en/icon_contact_pm.gif b/phpBB/styles/prosilver/theme/en/icon_contact_pm.gif
deleted file mode 100644
index ec190118fe..0000000000
Binary files a/phpBB/styles/prosilver/theme/en/icon_contact_pm.gif and /dev/null differ
diff --git a/phpBB/styles/prosilver/theme/en/icon_post_edit.gif b/phpBB/styles/prosilver/theme/en/icon_post_edit.gif
deleted file mode 100644
index 19006f95a7..0000000000
Binary files a/phpBB/styles/prosilver/theme/en/icon_post_edit.gif and /dev/null differ
diff --git a/phpBB/styles/prosilver/theme/en/icon_post_quote.gif b/phpBB/styles/prosilver/theme/en/icon_post_quote.gif
deleted file mode 100644
index c3708a1477..0000000000
Binary files a/phpBB/styles/prosilver/theme/en/icon_post_quote.gif and /dev/null differ
diff --git a/phpBB/styles/prosilver/theme/en/stylesheet.css b/phpBB/styles/prosilver/theme/en/stylesheet.css
index d8ca2558e5..bf4bd31ffc 100644
--- a/phpBB/styles/prosilver/theme/en/stylesheet.css
+++ b/phpBB/styles/prosilver/theme/en/stylesheet.css
@@ -1,26 +1,6 @@
-/* Set profile icon dimensions */
-ul.profile-icons li.pm-icon		{ width: 28px; height: 20px; }
-ul.profile-icons li.quote-icon	{ width: 54px; height: 20px; }
-ul.profile-icons li.edit-icon	{ width: 42px; height: 20px; }
-
 /* Online image */
 .online { background-image: url("./icon_user_online.gif"); }
 
-/* Icon images */
-.quote-icon, .quote-icon a		{ background-image: url("./icon_post_quote.gif"); }
-.edit-icon, .edit-icon a			{ background-image: url("./icon_post_edit.gif"); }
-
-/* EN Language Pack */
-.imageset.icon_post_edit {
-	background-image: url("./icon_post_edit.gif");
-	padding-left: 42px;
-	padding-top: 20px;
-}
-.imageset.icon_post_quote {
-	background-image: url("./icon_post_quote.gif");
-	padding-left: 54px;
-	padding-top: 20px;
-}
 .imageset.icon_user_online {
 	background-image: url("./icon_user_online.gif");
 	padding-left: 58px;
diff --git a/phpBB/styles/prosilver/theme/images/buttons.png b/phpBB/styles/prosilver/theme/images/buttons.png
deleted file mode 100644
index 3a8c2f2f65..0000000000
Binary files a/phpBB/styles/prosilver/theme/images/buttons.png and /dev/null differ
diff --git a/phpBB/styles/prosilver/theme/images/icon_post_delete.gif b/phpBB/styles/prosilver/theme/images/icon_post_delete.gif
deleted file mode 100644
index f51ffc24a6..0000000000
Binary files a/phpBB/styles/prosilver/theme/images/icon_post_delete.gif and /dev/null differ
diff --git a/phpBB/styles/prosilver/theme/images/icon_post_info.gif b/phpBB/styles/prosilver/theme/images/icon_post_info.gif
deleted file mode 100644
index af089d8656..0000000000
Binary files a/phpBB/styles/prosilver/theme/images/icon_post_info.gif and /dev/null differ
diff --git a/phpBB/styles/prosilver/theme/images/icon_post_menu.png b/phpBB/styles/prosilver/theme/images/icon_post_menu.png
deleted file mode 100644
index 2b48289fdb..0000000000
Binary files a/phpBB/styles/prosilver/theme/images/icon_post_menu.png and /dev/null differ
diff --git a/phpBB/styles/prosilver/theme/images/icon_post_report.gif b/phpBB/styles/prosilver/theme/images/icon_post_report.gif
deleted file mode 100644
index 72c6ae89d0..0000000000
Binary files a/phpBB/styles/prosilver/theme/images/icon_post_report.gif and /dev/null differ
diff --git a/phpBB/styles/prosilver/theme/images/icon_user_warn.gif b/phpBB/styles/prosilver/theme/images/icon_user_warn.gif
deleted file mode 100644
index 9c4ad98e5c..0000000000
Binary files a/phpBB/styles/prosilver/theme/images/icon_user_warn.gif and /dev/null differ
diff --git a/phpBB/styles/prosilver/theme/images/icons_button.png b/phpBB/styles/prosilver/theme/images/icons_button.png
new file mode 100644
index 0000000000..a45a0cc2ba
Binary files /dev/null and b/phpBB/styles/prosilver/theme/images/icons_button.png differ
diff --git a/phpBB/styles/prosilver/theme/imageset.css b/phpBB/styles/prosilver/theme/imageset.css
index 8e3348a99d..5cd91348be 100644
--- a/phpBB/styles/prosilver/theme/imageset.css
+++ b/phpBB/styles/prosilver/theme/imageset.css
@@ -369,16 +369,6 @@ span.imageset {
 
 
 /* English images for fallback */
-.imageset.icon_post_edit {
-	background-image: url("./en/icon_post_edit.gif");
-	padding-left: 42px;
-	padding-top: 20px;
-}
-.imageset.icon_post_quote {
-	background-image: url("./en/icon_post_quote.gif");
-	padding-left: 54px;
-	padding-top: 20px;
-}
 .imageset.icon_user_online {
 	background-image: url("./en/icon_user_online.gif");
 	padding-left: 58px;
diff --git a/phpBB/styles/prosilver/theme/responsive.css b/phpBB/styles/prosilver/theme/responsive.css
index 13711c1267..b76f6b60cd 100644
--- a/phpBB/styles/prosilver/theme/responsive.css
+++ b/phpBB/styles/prosilver/theme/responsive.css
@@ -423,10 +423,6 @@ fieldset.polls dd.resultbar, fieldset.polls dd.poll_option_percent {
 	margin: 0;
 }
 
-.postprofile ul.profile-icons {
-	display: none;
-}
-
 .postprofile .avatar {
 	display: block;
 	float: left;