diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md
index 776377ba54..0130362131 100644
--- a/phpBB/docs/events.md
+++ b/phpBB/docs/events.md
@@ -403,13 +403,13 @@ viewtopic_topic_title_prepend
 viewtopic_topic_tools_after
 ===
 * Locations:
-    + styles/prosilver/template/viewtopic_body.html
+    + styles/prosilver/template/viewtopic_topic_tools.html
 * Since: 3.1.0-a3
 * Purpose: Add a new topic tool after the rest of the existing ones
 
 viewtopic_topic_tools_before
 ===
 * Locations:
-    + styles/prosilver/template/viewtopic_body.html
+    + styles/prosilver/template/viewtopic_topic_tools.html
 * Since: 3.1.0-a3
 * Purpose: Add a new topic tool before the rest of the existing ones
diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html
index 41a34a2039..155b9f0a05 100644
--- a/phpBB/styles/prosilver/template/viewtopic_body.html
+++ b/phpBB/styles/prosilver/template/viewtopic_body.html
@@ -33,48 +33,7 @@
 	<!-- ENDIF -->
 	</div>
 
-	<!-- DEFINE $TOPIC_TOOLS_BLOCK -->
-		<!-- IF not S_IS_BOT and (U_WATCH_TOPIC or U_BOOKMARK_TOPIC or U_BUMP_TOPIC or S_HAS_ATTACHMENTS 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>
-				<div class="dropdown hidden">
-					<div class="pointer"><div class="pointer-inner"></div></div>
-					<ul class="dropdown-contents">
-						<!-- EVENT viewtopic_topic_tools_before -->
-						<!-- IF U_WATCH_TOPIC -->
-							<li class="small-icon <!-- IF S_WATCHING_TOPIC -->icon-unsubscribe<!-- ELSE -->icon-subscribe<!-- ENDIF -->">
-								<a href="{U_WATCH_TOPIC}" title="{S_WATCH_TOPIC_TITLE}" data-ajax="toggle_link" data-toggle-class="small-icon <!-- IF not S_WATCHING_TOPIC -->icon-unsubscribe<!-- ELSE -->icon-subscribe<!-- ENDIF -->" data-toggle-text="{S_WATCH_TOPIC_TOGGLE}" data-toggle-url="{U_WATCH_TOPIC_TOGGLE}">
-									{S_WATCH_TOPIC_TITLE}
-								</a>
-							</li>
-						<!-- ENDIF -->
-						<!-- IF U_BOOKMARK_TOPIC -->
-							<li class="small-icon icon-bookmark">
-								<a href="{U_BOOKMARK_TOPIC}" title="{L_BOOKMARK_TOPIC}" data-ajax="alt_text" data-alt-text="{S_BOOKMARK_TOGGLE}">
-									{S_BOOKMARK_TOPIC}
-								</a>
-							</li>
-						<!-- ENDIF -->
-						<!-- IF U_BUMP_TOPIC --><li class="small-icon icon-bump"><a href="{U_BUMP_TOPIC}" title="{L_BUMP_TOPIC}" data-ajax="true">{L_BUMP_TOPIC}</a></li><!-- ENDIF -->
-						<!-- IF S_HAS_ATTACHMENTS -->
-							<li class="small-icon icon-download">
-								<a class="dropdown-toggle-submenu" href="{U_DOWNLOAD_ALL_ATTACHMENTS}" title="{L_DOWNLOAD_ALL_ATTACHMENTS}">{L_DOWNLOAD_ALL_ATTACHMENTS}</a>
-								<ul class="dropdown-submenu hidden">
-									<li>
-									<!-- BEGIN dl_method -->
-										<a href="{dl_method.LINK}">{dl_method.TYPE}</a><!-- IF not dl_method.S_LAST_ROW --> &bull; <!-- ENDIF --> 
-									<!-- END dl_method -->
-									</li>
-								</ul>
-							</li>
-						<!-- ENDIF -->
-						<!-- EVENT viewtopic_topic_tools_after -->
-					</ul>
-				</div>
-			</div>
-		<!-- ENDIF -->
-	<!-- ENDDEFINE -->
-	{$TOPIC_TOOLS_BLOCK}
+	<!-- INCLUDE viewtopic_topic_tools.html -->
 
 	<!-- IF S_DISPLAY_SEARCHBOX -->
 		<div class="search-box">
@@ -342,7 +301,7 @@
 	<!-- ENDIF -->
 	</div>
 
-	{$TOPIC_TOOLS_BLOCK}
+	<!-- INCLUDE viewtopic_topic_tools.html -->
 
 	<!-- IF .pagination or TOTAL_POSTS -->
 		<div class="pagination">
diff --git a/phpBB/styles/prosilver/template/viewtopic_topic_tools.html b/phpBB/styles/prosilver/template/viewtopic_topic_tools.html
new file mode 100644
index 0000000000..ec17185bae
--- /dev/null
+++ b/phpBB/styles/prosilver/template/viewtopic_topic_tools.html
@@ -0,0 +1,39 @@
+<!-- IF not S_IS_BOT and (U_WATCH_TOPIC or U_BOOKMARK_TOPIC or U_BUMP_TOPIC or S_HAS_ATTACHMENTS 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>
+		<div class="dropdown hidden">
+			<div class="pointer"><div class="pointer-inner"></div></div>
+			<ul class="dropdown-contents">
+				<!-- EVENT viewtopic_topic_tools_before -->
+				<!-- IF U_WATCH_TOPIC -->
+					<li class="small-icon icon-<!-- IF S_WATCHING_TOPIC -->unsubscribe<!-- ELSE -->subscribe<!-- ENDIF -->">
+						<a href="{U_WATCH_TOPIC}" title="{S_WATCH_TOPIC_TITLE}" data-ajax="toggle_link" data-toggle-class="small-icon icon-<!-- IF not S_WATCHING_TOPIC -->unsubscribe<!-- ELSE -->subscribe<!-- ENDIF -->" data-toggle-text="{S_WATCH_TOPIC_TOGGLE}" data-toggle-url="{U_WATCH_TOPIC_TOGGLE}">
+							{S_WATCH_TOPIC_TITLE}
+						</a>
+					</li>
+				<!-- ENDIF -->
+				<!-- IF U_BOOKMARK_TOPIC -->
+					<li class="small-icon icon-bookmark">
+						<a href="{U_BOOKMARK_TOPIC}" title="{L_BOOKMARK_TOPIC}" data-ajax="alt_text" data-alt-text="{S_BOOKMARK_TOGGLE}">
+							{S_BOOKMARK_TOPIC}
+						</a>
+					</li>
+				<!-- ENDIF -->
+				<!-- IF U_BUMP_TOPIC --><li class="small-icon icon-bump"><a href="{U_BUMP_TOPIC}" title="{L_BUMP_TOPIC}" data-ajax="true">{L_BUMP_TOPIC}</a></li><!-- ENDIF -->
+				<!-- IF S_HAS_ATTACHMENTS -->
+					<li class="small-icon icon-download">
+						<a class="dropdown-toggle-submenu" href="{U_DOWNLOAD_ALL_ATTACHMENTS}" title="{L_DOWNLOAD_ALL_ATTACHMENTS}">{L_DOWNLOAD_ALL_ATTACHMENTS}</a>
+						<ul class="dropdown-submenu hidden">
+							<li>
+							<!-- BEGIN dl_method -->
+								<a href="{dl_method.LINK}">{dl_method.TYPE}</a><!-- IF not dl_method.S_LAST_ROW --> &bull; <!-- ENDIF --> 
+							<!-- END dl_method -->
+							</li>
+						</ul>
+					</li>
+				<!-- ENDIF -->
+				<!-- EVENT viewtopic_topic_tools_after -->
+			</ul>
+		</div>
+	</div>
+<!-- ENDIF -->
diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css
index 8258262276..7291a9d83d 100644
--- a/phpBB/styles/prosilver/theme/colours.css
+++ b/phpBB/styles/prosilver/theme/colours.css
@@ -1181,6 +1181,10 @@ ul.linklist li.responsive-menu a.responsive-menu-link:hover:before, ul.linklist
 	box-shadow: 1px 0 5px rgba(0, 0, 0, 0.2);
 }
 
+.dropdown li, .dropdown li li {
+	border-color: #DCDCDC;
+}
+
 #minitabs .dropdown-contents {
 	background-color: #F1F8FF;
 }
diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index 8d65c96a72..cacae74649 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -548,14 +548,32 @@ ul.linklist.bulletin li.no-bulletin:before {
 }
 
 .dropdown li {
-	float: none;
+	border-bottom: 1px dotted transparent;
+	float: none !important;
+	line-height: normal !important;
+	font-size: 1em !important;
 	list-style: none;
 	margin: 0;
+	padding-top: 4px;
+	padding-bottom: 4px;
 	white-space: nowrap;
 	text-align: left;
 }
 
+.dropdown li:last-child, .dropdown li li {
+	border-bottom: 0;
+}
+
+.dropdown li li:first-child {
+	margin-top: 4px;
+}
+
+.dropdown li li:last-child {
+	padding-bottom: 0;
+}
+
 .dropdown li li {
+	border-top: 1px dotted transparent;
 	padding-left: 10px;
 }