diff --git a/public/less/admin/manage/categories.less b/public/less/admin/manage/categories.less
index 2d0ad58214..9b1e1fec3f 100644
--- a/public/less/admin/manage/categories.less
+++ b/public/less/admin/manage/categories.less
@@ -16,6 +16,12 @@ div.categories {
 			padding-bottom: 12px;
 			margin-bottom: 12px;
 		}
+
+		> li li:last-child {
+			.row {
+				border-bottom: 0px;
+			}
+		}
 	}
 
 	.stats {
@@ -32,6 +38,7 @@ div.categories {
 	li {
 		min-height: @acp-line-height;
 		margin: @acp-base-line 0;
+		margin-top: 28px;
 
 		&.placeholder {
 			border: 1px dashed #2196F3;
diff --git a/src/views/admin/manage/categories.tpl b/src/views/admin/manage/categories.tpl
index c57996551a..090264ddf5 100644
--- a/src/views/admin/manage/categories.tpl
+++ b/src/views/admin/manage/categories.tpl
@@ -1,11 +1,6 @@
 <div class="row">
     <div class="col-lg-9">
-        <div class="panel panel-default">
-            <div class="panel-heading"><i class="fa fa-folder"></i> Categories</div>
-            <div class="panel-body">
-                <div class="categories"></div>
-            </div>
-        </div>
+        <div class="categories"></div>
     </div>
 
     <div class="col-lg-3 acp-sidebar">
diff --git a/src/views/admin/partials/categories/category-rows.tpl b/src/views/admin/partials/categories/category-rows.tpl
index 86c6301743..273d7e31b5 100644
--- a/src/views/admin/partials/categories/category-rows.tpl
+++ b/src/views/admin/partials/categories/category-rows.tpl
@@ -16,10 +16,10 @@
             <div class="col-md-3">
                 <div class="clearfix pull-right text-right">
                     <div class="btn-group">
-                        <button data-action="toggle" data-disabled="{categories.disabled}" class="btn btn-xs <!-- IF categories.disabled -->btn-primary<!-- ELSE -->btn-danger<!-- ENDIF categories.disabled -->">
+                        <button data-action="toggle" data-disabled="{categories.disabled}" class="btn <!-- IF categories.disabled -->btn-primary<!-- ELSE -->btn-danger<!-- ENDIF categories.disabled -->">
                             <!-- IF categories.disabled -->Enable<!-- ELSE -->Disable<!-- ENDIF categories.disabled -->
                         </button>
-                        <a href="./categories/{categories.cid}" class="btn btn-default btn-xs">Edit</a>
+                        <a href="./categories/{categories.cid}" class="btn btn-default">Edit</a>
                     </div>
                 </div>
             </div>