diff --git a/phpBB/styles/prosilver/template/post_buttons.html b/phpBB/styles/prosilver/template/post_buttons.html
deleted file mode 100644
index db794aa968..0000000000
--- a/phpBB/styles/prosilver/template/post_buttons.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<!-- EVENT viewtopic_body_post_buttons_before -->
-<!-- IF postrow.U_EDIT -->
-	<li>
-		<a href="{postrow.U_EDIT}" title="{L_EDIT_POST}" class="button button-icon-only">
-			{{ Icon('iconify', 'fa:pencil', lang('BUTTON_EDIT'), true, 'c-button-icon') }}
-		</a>
-	</li>
-<!-- ENDIF -->
-<!-- IF postrow.U_DELETE -->
-	<li>
-		<a href="{postrow.U_DELETE}" title="{L_DELETE_POST}" class="button button-icon-only">
-			{{ Icon('iconify', 'fa:times', lang('BUTTON_DELETE'), true, 'c-button-icon') }}
-		</a>
-	</li>
-<!-- ENDIF -->
-<!-- IF postrow.U_REPORT -->
-	<li>
-		<a href="{postrow.U_REPORT}" title="{L_REPORT_POST}" class="button button-icon-only">
-			{{ Icon('iconify', 'fa:exclamation', lang('BUTTON_REPORT'), true, 'c-button-icon') }}
-		</a>
-	</li>
-<!-- ENDIF -->
-<!-- IF postrow.U_WARN -->
-	<li>
-		<a href="{postrow.U_WARN}" title="{L_WARN_USER}" class="button button-icon-only">
-			{{ Icon('iconify', 'fa:exclamation-triangle', lang('BUTTON_WARN'), true, 'c-button-icon') }}
-		</a>
-	</li>
-<!-- ENDIF -->
-<!-- IF postrow.U_INFO -->
-	<li>
-		<a href="{postrow.U_INFO}" title="{L_INFORMATION}" class="button button-icon-only">
-			{{ Icon('iconify', 'fa:info', lang('BUTTON_INFORMATION'), true, 'c-button-icon') }}
-		</a>
-	</li>
-<!-- ENDIF -->
-<!-- IF postrow.U_QUOTE -->
-	<li>
-		<a href="{postrow.U_QUOTE}" title="{L_REPLY_WITH_QUOTE}" class="button button-icon-only">
-			{{ Icon('iconify', 'fa:quote-left', lang('BUTTON_QUOTE'), true, 'c-button-icon') }}
-		</a>
-	</li>
-<!-- ENDIF -->
-<!-- EVENT viewtopic_body_post_buttons_after -->
diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html
index e5022f7395..e98772e128 100644
--- a/phpBB/styles/prosilver/template/viewtopic_body.html
+++ b/phpBB/styles/prosilver/template/viewtopic_body.html
@@ -254,17 +254,70 @@
 		<!-- IF not S_IS_BOT -->
 			<!-- IF $SHOW_POST_BUTTONS -->
 				<ul class="post-buttons">
-					<!-- INCLUDE post_buttons.html -->
-						<li class="post-buttons-responsive-menu dropdown-container">
-							<a href="javascript:void(0);" class="button button-icon-only post-button-responsive dropdown-toggle">
-								{{ Icon('iconify', 'fa:bars', '', true, 'c-button-icon') }}
-							</a>
-							<div class="dropdown">
-								<div class="pointer">
-									<div class="pointer-inner"></div>
-								</div>
+					{% with {'post_buttons_hide_text': true} %}
+						{% block post_buttons %}
+							{% EVENT viewtopic_body_post_buttons_before %}
+
+							{% if postrow.U_EDIT %}
+								<li>
+									<a href="{{ postrow.U_EDIT }}" title="{{ lang('EDIT_POST') }}" class="button button-icon-only">
+										{{ Icon('iconify', 'fa:pencil', lang('BUTTON_EDIT'), post_buttons_hide_text, 'c-button-icon') }}
+									</a>
+								</li>
+							{% endif %}
+							{% if postrow.U_DELETE %}
+								<li>
+									<a href="{{ postrow.U_DELETE }}" title="{{ lang('DELETE_POST') }}" class="button button-icon-only">
+										{{ Icon('iconify', 'fa:times', lang('BUTTON_DELETE'), post_buttons_hide_text, 'c-button-icon') }}
+									</a>
+								</li>
+							{% endif %}
+							{% if postrow.U_REPORT %}
+								<li>
+									<a href="{{ postrow.U_REPORT }}" title="{{ lang('REPORT_POST') }}" class="button button-icon-only">
+										{{ Icon('iconify', 'fa:exclamation', lang('BUTTON_REPORT'), post_buttons_hide_text, 'c-button-icon') }}
+									</a>
+								</li>
+							{% endif %}
+							{% if postrow.U_WARN %}
+								<li>
+									<a href="{{ postrow.U_WARN }}" title="{{ lang('WARN_USER') }}" class="button button-icon-only">
+										{{ Icon('iconify', 'fa:exclamation-triangle', lang('BUTTON_WARN'), post_buttons_hide_text, 'c-button-icon') }}
+									</a>
+								</li>
+							{% endif %}
+							{% if postrow.U_INFO %}
+								<li>
+									<a href="{{ postrow.U_INFO }}" title="{{ lang('INFORMATION') }}" class="button button-icon-only">
+										{{ Icon('iconify', 'fa:info', lang('BUTTON_INFORMATION'), post_buttons_hide_text, 'c-button-icon') }}
+									</a>
+								</li>
+							{% endif %}
+							{% if postrow.U_QUOTE %}
+								<li>
+									<a href="{{ postrow.U_QUOTE }}" title="{{ lang('REPLY_WITH_QUOTE') }}" class="button button-icon-only">
+										{{ Icon('iconify', 'fa:quote-left', lang('BUTTON_QUOTE'), post_buttons_hide_text, 'c-button-icon') }}
+									</a>
+								</li>
+							{% endif %}
+
+							{% EVENT viewtopic_body_post_buttons_after %}
+						{% endblock post_buttons %}
+					{% endwith %}
+
+					<li class="post-buttons-responsive-menu dropdown-container">
+						<a href="javascript:void(0);" class="button button-icon-only post-button-responsive dropdown-toggle">
+							{{ Icon('iconify', 'fa:bars', '', true, 'c-button-icon') }}
+						</a>
+						<div class="dropdown">
+							<div class="pointer">
+								<div class="pointer-inner"></div>
+							</div>
+
 							<ul class="dropdown-contents">
-								<!-- INCLUDE post_buttons.html -->
+								{% with {'post_buttons_hide_text': false} %}
+									{{ block('post_buttons', _self) }}
+								{% endwith %}
 							</ul>
 						</div>
 					</li>
diff --git a/phpBB/styles/prosilver/theme/buttons.css b/phpBB/styles/prosilver/theme/buttons.css
index 86fff5c244..10e4eca738 100644
--- a/phpBB/styles/prosilver/theme/buttons.css
+++ b/phpBB/styles/prosilver/theme/buttons.css
@@ -155,6 +155,7 @@
 	font-size: 13px;
 	text-align: right;
 	display: block;
+	justify-content: start;
 }
 
 .hasjs .postbody .post-buttons {