diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md
index c51bc72160..28cf9c73f1 100644
--- a/phpBB/docs/events.md
+++ b/phpBB/docs/events.md
@@ -756,6 +756,14 @@ posting_editor_buttons_before
 * Since: 3.1.0-a3
 * Purpose: Add content before the BBCode posting buttons
 
+posting_editor_buttons_custom_tags_before
+===
+* Locations:
+    + styles/prosilver/template/posting_buttons.html
+    + styles/subsilver2/template/posting_buttons.html
+* Since: 3.1.2-RC1
+* Purpose: Add content inside the BBCode posting buttons and before the customs BBCode
+
 posting_editor_message_after
 ===
 * Locations:
diff --git a/phpBB/styles/prosilver/template/posting_buttons.html b/phpBB/styles/prosilver/template/posting_buttons.html
index 3dad6606bb..1555b12369 100644
--- a/phpBB/styles/prosilver/template/posting_buttons.html
+++ b/phpBB/styles/prosilver/template/posting_buttons.html
@@ -92,6 +92,9 @@
 		<!-- ENDIF -->
 	</select>
 	<input type="button" class="button2 bbcode-color" name="bbpalette" id="bbpalette" value="{L_FONT_COLOR}" onclick="change_palette();" title="{L_BBCODE_S_HELP}" />
+
+	<!-- EVENT posting_editor_buttons_custom_tags_before -->
+
 	<!-- BEGIN custom_tags -->
 		<input type="button" class="button2 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}" />
 	<!-- END custom_tags -->
diff --git a/phpBB/styles/subsilver2/template/posting_buttons.html b/phpBB/styles/subsilver2/template/posting_buttons.html
index d1c0f79a16..516cd0922b 100644
--- a/phpBB/styles/subsilver2/template/posting_buttons.html
+++ b/phpBB/styles/subsilver2/template/posting_buttons.html
@@ -69,21 +69,18 @@
 			<!-- ENDIF -->
 		</select></span>
 	</div>
+	<!-- EVENT posting_editor_buttons_custom_tags_before -->
+	<!-- IF .custom_tags -->
+		<div id="custom-bbcode-buttons">
+			<!-- BEGIN custom_tags -->
+			<input type="button" class="btnbbcode bbcode-{custom_tags.BBCODE_TAG_CLEAN}" name="addbbcode{custom_tags.BBCODE_ID}" value="{custom_tags.BBCODE_TAG}" onclick="bbstyle({custom_tags.BBCODE_ID})"<!-- IF custom_tags.BBCODE_HELPLINE !== '' --> onmouseover="helpline('cb_{custom_tags.BBCODE_ID}')" onmouseout="helpline('tip')"<!-- ENDIF --> />
+			<!-- END custom_tags -->
+		</div>
+	<!-- ENDIF -->
 	<!-- EVENT posting_editor_buttons_after -->
 <!-- ENDIF -->
 	</td>
 </tr>
-<!-- IF S_BBCODE_ALLOWED and .custom_tags -->
-	<tr valign="middle" align="{S_CONTENT_FLOW_BEGIN}">
-		<td colspan="2">
-		<div id="custom-bbcode-buttons">
-		<!-- BEGIN custom_tags -->
-			<input type="button" class="btnbbcode bbcode-{custom_tags.BBCODE_TAG_CLEAN}" name="addbbcode{custom_tags.BBCODE_ID}" value="{custom_tags.BBCODE_TAG}" onclick="bbstyle({custom_tags.BBCODE_ID})"<!-- IF custom_tags.BBCODE_HELPLINE !== '' --> onmouseover="helpline('cb_{custom_tags.BBCODE_ID}')" onmouseout="helpline('tip')"<!-- ENDIF --> />
-		<!-- END custom_tags -->
-		</div>
-		</td>
-	</tr>
-<!-- ENDIF -->
 <!-- IF S_BBCODE_ALLOWED -->
 <tr>
 	<td<!-- IF $S_SIGNATURE or S_EDIT_DRAFT --> colspan="2"<!-- ENDIF -->><input type="text" readonly="readonly" name="helpbox" style="width:100%" class="helpline" value="{L_STYLES_TIP}" /></td>