diff --git a/src/Raven.Studio/wwwroot/App/views/manage/certificates.html b/src/Raven.Studio/wwwroot/App/views/manage/certificates.html
index 0ce803dbab9..ec24d295672 100644
--- a/src/Raven.Studio/wwwroot/App/views/manage/certificates.html
+++ b/src/Raven.Studio/wwwroot/App/views/manage/certificates.html
@@ -144,7 +144,7 @@ <h2 class="text-warning"><i class="icon-unsecure"></i> Authentication is off</h2
                     </ul>
                 </div>
             </div>
-            <div class="margin-bottom-xs">
+            <div class="margin-bottom-xs margin-top-xs">
                 <small data-bind="html: filterAndSortDescription"></small>
             </div>
             <div class="scroll flex-grow margin-top margin-top-sm">
@@ -545,11 +545,11 @@ <h4>Database Permissions</h4>
     </button>
     <div class="dropdown-menu slidein-style filter-options-dropdown-container" aria-labelledby="dropdownFilterOptions" data-bind="dropdownPanel: true">
         <form>
-            <div class="panel">
+            <div class="panel padding">
                 <div>
                     <div class="row">
                         <div class="col-sm-6">
-                            <h3 class="margin-top-lg margin-left-lg">Security Clearance</h3>
+                            <h3 class="margin-top margin-left">Security Clearance</h3>
                             <div class="row margin-left">
                                 <div class="col-sm-9">
                                     <div class="flex-horizontal">
@@ -585,7 +585,7 @@ <h3 class="margin-top-lg margin-left-lg">Security Clearance</h3>
                             </div>
                         </div>
                         <div class="col-sm-6 no-padding-left">
-                            <h3 class="margin-top-lg">Certificates State</h3>
+                            <h3 class="margin-top">Certificates State</h3>
                             <div class="row">
                                 <div class="col-sm-8 no-padding-right">
                                     <div class="flex-horizontal">
@@ -621,8 +621,8 @@ <h3 class="margin-top-lg">Certificates State</h3>
                             </div>
                         </div>
                     </div>
-                    <h3 class="margin-top-lg margin-left-lg">Database Permissions</h3>
-                    <div class="margin-top margin-left-lg margin-right">
+                    <h3 class="margin-top margin-left">Database Permissions</h3>
+                    <div class="margin-top margin-left margin-right margin-bottom">
                         <div class="flex-horizontal margin-bottom">
                             <div class="flex-grow">
                                 <div class="dropdown btn-block flex-grow">
@@ -646,7 +646,7 @@ <h3 class="margin-top-lg margin-left-lg">Database Permissions</h3>
                                 </button>
                             </div>
                         </div>
-                        <div data-bind="visible: databasesToShow().length" class="margin-top margin-bottom-lg">
+                        <div data-bind="visible: databasesToShow().length" class="margin-top margin-bottom">
                             <ul class="well collection-list" data-bind="foreach: databasesToShow">
                                 <li>
                                     <div class="name force-text-wrap" data-bind="text: $data"></div>