diff --git a/phpBB/styles/prosilver/template/forum_fn.js b/phpBB/styles/prosilver/template/forum_fn.js
index 1594d73517..87754269cd 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')) {
+					menu.find('.button').removeClass('button icon-button');
+					$('.responsive-menu-link', item).addClass('button icon-button').prepend('<span></span>');
+				}
 				copied = true;
 			}
 			else {
diff --git a/phpBB/styles/prosilver/template/mcp_post.html b/phpBB/styles/prosilver/template/mcp_post.html
index 2b4ebec5c8..49aa00de1c 100644
--- a/phpBB/styles/prosilver/template/mcp_post.html
+++ b/phpBB/styles/prosilver/template/mcp_post.html
@@ -50,13 +50,16 @@
 	<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 == '{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>
+			</li>
+			<!-- IF U_EDIT -->
+				<li class="edit-icon"><a href="{U_EDIT}" title="{L_EDIT_POST}" class="button icon-button"><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..f7c3656ef4 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 class="info-icon">
+						<a href="{postrow.U_POST_DETAILS}" title="{L_POST_DETAILS}" class="button icon-button">
+							<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/posting_topic_review.html b/phpBB/styles/prosilver/template/posting_topic_review.html
index d2faed5f8f..1af6e08c18 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 class="info-icon">
+					<a href="{topic_review_row.U_MCP_DETAILS}" title="{L_POST_DETAILS}" class="button icon-button">
+						<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 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}" class="button icon-button">
+						<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..c499242280 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 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}" class="button icon-button">
+						<span>{L_QUOTE} {history_row.MESSAGE_AUTHOR}</span>
+					</a>
+				</li>
 			</ul>
 			<!-- ENDIF -->
 
diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
index f58b334a60..e75952d343 100644
--- a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
+++ b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
@@ -66,11 +66,19 @@
 		<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 class="edit-icon"><a href="{U_EDIT}" title="{L_POST_EDIT_PM}" class="button icon-button"><span>{L_POST_EDIT_PM}</span></a></li>
+			<!-- ENDIF -->
+			<!-- IF U_DELETE -->
+				<li class="delete-icon"><a href="{U_DELETE}" title="{L_DELETE_MESSAGE}" class="button icon-button"><span>{L_DELETE_MESSAGE}</span></a></li>
+			<!-- ENDIF -->
+			<!-- IF U_REPORT -->
+				<li class="report-icon"><a href="{U_REPORT}" title="{L_REPORT_PM}" class="button icon-button"><span>{L_REPORT_PM}</span></a></li>
+			<!-- ENDIF -->
+			<!-- IF U_QUOTE -->
+				<li class="quote-icon"><a href="{U_QUOTE}" title="{L_POST_QUOTE_PM}" class="button icon-button"><span>{L_POST_QUOTE_PM}</span></a></li>
+			<!-- ENDIF -->
 		</ul>
 		<!-- ENDIF -->
 
diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html
index a7840f3e57..989e7b3c75 100644
--- a/phpBB/styles/prosilver/template/viewtopic_body.html
+++ b/phpBB/styles/prosilver/template/viewtopic_body.html
@@ -201,14 +201,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_BUTTON_EDIT}</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_IP}</span></a></li><!-- ENDIF -->
-					<!-- IF postrow.U_QUOTE --><li class="quote-icon"><a href="{postrow.U_QUOTE}" title="{L_REPLY_WITH_QUOTE}"><span>{L_QUOTE}</span></a></li><!-- ENDIF -->
+					<!-- IF postrow.U_EDIT -->
+						<li class="edit-icon">
+							<a href="{postrow.U_EDIT}" title="{L_EDIT_POST}" class="button icon-button"><span>{L_BUTTON_EDIT}</span></a>
+						</li>
+					<!-- ENDIF -->
+					<!-- IF postrow.U_DELETE -->
+						<li class="delete-icon">
+							<a href="{postrow.U_DELETE}" title="{L_DELETE_POST}" class="button icon-button"><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}" class="button icon-button"><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}" class="button icon-button"><span>{L_WARN_USER}</span></a>
+						</li>
+					<!-- ENDIF -->
+					<!-- IF postrow.U_INFO -->
+						<li class="info-icon">
+							<a href="{postrow.U_INFO}" title="{L_INFORMATION}" class="button icon-button"><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}" class="button icon-button"><span>{L_QUOTE}</span></a>
+						</li>
+					<!-- ENDIF -->
 					<!-- EVENT viewtopic_body_post_buttons_after -->
 				</ul>
 			<!-- ENDIF -->
diff --git a/phpBB/styles/prosilver/theme/bidi.css b/phpBB/styles/prosilver/theme/bidi.css
index c2d15b9ef2..4a7879c8eb 100644
--- a/phpBB/styles/prosilver/theme/bidi.css
+++ b/phpBB/styles/prosilver/theme/bidi.css
@@ -576,15 +576,13 @@ ul.linklist li.small-icon > a, ul.linklist li.breadcrumbs span:first-child > a {
 
 /* Poster profile icons
 ----------------------------------------*/
-/* Rollover state */
-.rtl .postprofile ul.profile-icons li {
-	float: right;
-	margin: 0 0 3px 6px;
+/* Positioning of moderator icons */
+.rtl .post-buttons {
+	float: left;
 }
 
-/* Positioning of moderator icons */
-.rtl .postbody ul.profile-icons {
-	float: left;
+.rtl .post-buttons li {
+	float: right;
 }
 
 /**
diff --git a/phpBB/styles/prosilver/theme/buttons.css b/phpBB/styles/prosilver/theme/buttons.css
index 35a209233e..64b6ea2f23 100644
--- a/phpBB/styles/prosilver/theme/buttons.css
+++ b/phpBB/styles/prosilver/theme/buttons.css
@@ -106,100 +106,6 @@ ul.linklist.bulletin li.small-icon:before {
 
 /* Poster contact icons
 ----------------------------------------*/
-ul.contact-icons {
-	padding-top: 10px;
-	list-style: none;
-}
-
-/* Rollover state */
-ul.contact-icons li {
-	float: left;
-	margin: 0 6px 3px 0;
-	background-position: 0 100%;
-}
-
-/* Rolloff state */
-ul.contact-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.contact-icons li span { display:none; }
-ul.contact-icons li a:hover { background: none; }
-
-/* Positioning of moderator icons */
-.postbody ul.contact-icons {
-	float: right;
-	width: auto;
-	padding: 0;
-}
-
-.postbody ul.contact-icons li {
-	margin: 0 3px;
-}
-
-/* Responsive icons in postbody */
-.postbody ul.contact-icons.responsive .responsive-menu {
-	position: relative;
-}
-
-ul.contact-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.contact-icons.responsive a.responsive-menu-link:hover {
-	background-position: 0 -20px;
-}
-
-ul.contact-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.contact-icons.responsive .popup-pointer {
-	left: auto;
-	right: 7px;
-	top: 20px;
-}
-
-.postbody ul.contact-icons .dropdown li, .postbody ul.contact-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.contact-icons .dropdown li span {
-	display: block;
-	text-align: right;
-	font-size: 1.2em;
-	line-height: 1.8em;
-	white-space: nowrap;
-}
-
-.hasjs .postbody ul.contact-icons {
-	max-width: 40%;
-}
-
 .contact-icons.dropdown-contents {
 	min-width: 0;
 	padding: 0;
@@ -231,8 +137,7 @@ ul.contact-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; }
@@ -247,176 +152,55 @@ ul.contact-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; }
-
-/* 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; }
-
-/* Set profile icon dimensions */
-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; }
-
-/* 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; }
-
-/* mini profile buttons
+/* Post control buttons
 --------------------------------------------- */
-ul.profile-icons {
+.post-buttons {
 	float: right;
 	list-style: none;
-	width: auto;
-	height: auto;
 	margin-top: 2px;
 }
 
-ul.profile-icons li {
+.post-buttons li {
 	float: left;
-	margin: 0 5px 0 0;
+	margin-right: 3px;
 }
 
-ul.profile-icons li a {
-	font-weight: bold;
-	display: inline-block;
-	font-family: 'Noto Sans', sans-serif, Verdana, Arial, Helvetica;
-	font-size: 9px;
-	line-height: 10px;
-	height: 12px;
-	text-decoration: none !important;
-	outline-style: none !important;
-	vertical-align: bottom;
-	white-space: nowrap;
-	border: 1px solid transparent;
-	border-radius: 3px;
-	background: transparent none 0 0 repeat-x;
-	padding: 3px 5px 1px 8px;
-	position: relative;
-	border-color: #858585;
-	background: #e3e3e3;
-	/*background: url(data:image/svg+xml; base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2ZmZmZmZiIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiNlM2UzZTMiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+);*/
-	background: -moz-linear-gradient(top,  #ffffff 0%, #e3e3e3 100%);
-	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ffffff), color-stop(100%,#e3e3e3));
-	background: -webkit-linear-gradient(top,  #ffffff 0%,#e3e3e3 100%);
-	background: -o-linear-gradient(top,  #ffffff 0%,#e3e3e3 100%);
-	background: -ms-linear-gradient(top,  #ffffff 0%,#e3e3e3 100%);
-	background: linear-gradient(to bottom,  #ffffff 0%,#e3e3e3 100%);
-	-m-filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#e3e3e3',GradientType=0 );
-	box-shadow: 0 0 0 1px #FFFFFF inset;
-	-webkit-box-shadow: 0 0 0 1px #FFFFFF inset;
-	color: #BC2A4D !important;
+.post-buttons .icon-button {
+	padding: 0 5px;
+	text-indent: -9999px;
 }
 
-ul.profile-icons li a:hover {
-	border-color: #0a8ed0;
-	background: #ffffff;
-	/*background: url(data:image/svg+xml; base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIxJSIgc3RvcC1jb2xvcj0iI2UzZTNlMyIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiNmZmZmZmYiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+);*/
-	background: -moz-linear-gradient(top,  #e3e3e3 1%, #ffffff 100%);
-	background: -webkit-gradient(linear, left top, left bottom, color-stop(1%,#e3e3e3), color-stop(100%,#ffffff));
-	background: -webkit-linear-gradient(top,  #e3e3e3 1%,#ffffff 100%);
-	background: -o-linear-gradient(top,  #e3e3e3 1%,#ffffff 100%);
-	background: -ms-linear-gradient(top,  #e3e3e3 1%,#ffffff 100%);
-	background: linear-gradient(to bottom,  #e3e3e3 1%,#ffffff 100%);
-	-m-filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#e3e3e3', endColorstr='#ffffff',GradientType=0 );
-	text-shadow: 1px 1px 0 #FFFFFF, -1px -1px 0 #FFFFFF, -1px -1px 0 rgba(188, 42, 77, 0.2);
-	box-shadow: 0 0 0 1px #FFFFFF inset;
-	-webkit-box-shadow: 0 0 0 1px #FFFFFF inset;
-	color: #BC2A4D !important;
+.post-buttons span {
+	float: none;
+	margin-right: 0;
 }
 
-ul.profile-icons li a:after {
-	content: '';
+.quote-icon span		{ background-position: 0 0; }
+.quote-icon:hover span	{ background-position: 0 -21px; }
+.edit-icon span			{ background-position: -24px 0; }
+.edit-icon:hover span	{ background-position: -24px -21px; }
+.warn-icon span			{ background-position: -48px 0; }
+.warn-icon:hover span	{ background-position: -48px -21px; }
+.delete-icon span		{ background-position: -36px 0; }
+.delete-icon:hover span	{ background-position: -36px -21px; }
+.report-icon span		{ background-position: -48px 0; }
+.report-icon:hover span	{ background-position: -48px -21px; }
+.info-icon span			{ background-position: -73px 0; }
+.info-icon:hover span	{ background-position: -73px -21px; }
+.button.responsive-menu-link span		{ background-position: -60px 0; }
+.button.responsive-menu-link:hover span	{ background-position: -60px -21px; }
+
+/* Responsive buttons in post body */
+.post-buttons .dropdown {
+	top: 18px;
+}
+
+.post-buttons .dropdown a {
 	display: block;
-	position: absolute;
-	top: 50%;
-	left: -4px;
-	width: 12px;
-	height: 16px;
-	margin-top: -10px;
-	background: transparent 0 0 no-repeat;
-	background-image: url("images/mini-buttons.png");
+	font-size: 1.2em;
+	text-align: right;
 }
 
-	/* Mini profile button images */
-ul.profile-icons li.quote-icon a:after {
-	background-position: 0px 0px;
-}
-
-ul.profile-icons li.quote-icon a:hover:after {
-	background-position: 0px -21px;
-}
-
-ul.profile-icons li.edit-icon a:after {
-	background-position: -24px 0;
-}
-
-ul.profile-icons li.edit-icon a:hover:after {
-	background-position: -24px -21px;
-}
-
-ul.profile-icons li.warn-icon span {
-	display: none;
-}
-
-ul.profile-icons li.warn-icon a:after {
-	background-position: -48px 0px;
-}
-
-ul.profile-icons li.warn-icon a:hover:after {
-	background-position: -48px -21px;
-}
-
-ul.profile-icons li.delete-icon span {
-	display: none;
-}
-
-ul.profile-icons li.delete-icon a {
-	width: 12px;
-	padding: 3px 3px 1px 3px;
-}
-
-ul.profile-icons li.delete-icon a:after {
-	background-position: -36px 0px;
-	left: 3px;
-	margin-top: -6px;
-}
-
-ul.profile-icons li.delete-icon a:hover:after {
-	background-position: -36px -21px;
-}
-
-ul.profile-icons li.report-icon span {
-	display: none;
-}
-
-ul.profile-icons li.report-icon a {
-	width: 12px;
-	padding: 3px 3px 1px 3px;
-}
-
-ul.profile-icons li.report-icon a:after {
-	background-position: -48px 0px;
-	left: 3px;
-	margin-top: -6px;
-}
-
-ul.profile-icons li.report-icon a:hover:after {
-	background-position: -48px -21px;
-}
-
-ul.profile-icons li.info-icon a	 {
-	padding: 3px 5px 1px 6px;
-}
-
-ul.profile-icons li.info-icon a:after {
-	background: none;
+.hasjs .postbody .post-buttons {
+	max-width: 40%;
 }
diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css
index 91dea07b40..96aeeffda5 100644
--- a/phpBB/styles/prosilver/theme/colours.css
+++ b/phpBB/styles/prosilver/theme/colours.css
@@ -700,17 +700,8 @@ Colours and backgrounds for buttons.css
 	color: #105289 !important;
 }
 
-.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
 ---------------------------------------- */
@@ -734,17 +725,9 @@ 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 span, .dropdown-select:after	{ background-image: url("images/buttons.png"); }
+.post-buttons .icon-button span				{ background-image: url("images/post_buttons.png"); }
 
 /* Forum icons & Topic icons */
 .global_read													{ background-image: url("./images/announce_read.gif"); }
diff --git a/phpBB/styles/prosilver/theme/images/post_buttons.png b/phpBB/styles/prosilver/theme/images/post_buttons.png
new file mode 100755
index 0000000000..26e7a024ac
Binary files /dev/null and b/phpBB/styles/prosilver/theme/images/post_buttons.png differ
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;