diff --git a/public/less/admin/manage/tags.less b/public/less/admin/manage/tags.less
index e034d3b3f6..6800778237 100644
--- a/public/less/admin/manage/tags.less
+++ b/public/less/admin/manage/tags.less
@@ -18,8 +18,6 @@
 
 	.tag-item {
 		border: solid 1px @gray-light;
-		border-bottom-left-radius: 5px;
-		border-top-left-radius: 5px;
 		background-color: transparent;
 		color: @gray-light;
 		padding: .2em .6em .3em;
@@ -31,15 +29,14 @@
 	.tag-topic-count {
 		border: solid 1px lighten(@brand-primary, 20%);
 		background-color: lighten(@brand-primary, 20%);
-		padding: .2em .6em .3em;
+		padding: 6px;
 		font-size: 75%;
 		font-weight: 700;
 		white-space: nowrap;
 		border-left: none;
 		padding-right: 5px;
 		padding-left: 5px;
-		border-bottom-right-radius: 5px;
-		border-top-right-radius: 5px;
+		border-width: 1px 1px 2px medium;
 
 		a {
 			color: #FFFFFF;
diff --git a/src/views/admin/manage/tags.tpl b/src/views/admin/manage/tags.tpl
index 6a2ddfa505..3e35c7e54c 100644
--- a/src/views/admin/manage/tags.tpl
+++ b/src/views/admin/manage/tags.tpl
@@ -1,11 +1,12 @@
-<div class="tags">
+<div class="tags row">
 
 	<div class="col-lg-9">
-		<div class="tag-management">
-			<!-- IF !tags.length -->
-			<h5>Your forum does not have any topics with tags yet.</h5>
-			<!-- ENDIF !tags.length -->
-			<div class="row">
+		<div class="panel panel-default tag-management">
+			<div class="panel-body">
+				<!-- IF !tags.length -->
+				Your forum does not have any topics with tags yet.
+				<!-- ENDIF !tags.length -->
+			
 				<div class="tag-list">
 					<!-- BEGIN tags -->
 					<div class="tag-row" data-tag="{tags.value}">