diff --git a/module/admin/css/index.css b/module/admin/css/index.css
index 767e46b936..520491a9aa 100755
--- a/module/admin/css/index.css
+++ b/module/admin/css/index.css
@@ -34,12 +34,13 @@
 .settings.panel, .plug.panel {margin-bottom: 16px;}
 
 .settings-list {display: flex; flex-wrap: wrap; padding: 0 4px 16px 4px;}
-.settings-list > .setting-box.btn {flex: 1 1 18%; padding: 8px; border: 1px solid rgba(227, 228, 233, 0.6); margin-right: 10px; margin-top: 16px; display: flex; flex-direction: column; justify-content: space-between; cursor: pointer; white-space: unset; text-align: unset;}
-.settings-list > .setting-box.btn:hover {background: unset;}
-.settings-list > .setting-box.btn[disabled] {cursor: not-allowed; pointer-events: unset;}
-.settings-list > .setting-box.btn[disabled] > a {pointer-events: none;}
-.settings-list > .setting-box > h4 > img {padding-right: 8px; padding-bottom: 3px; width: 32px; height: 27px;}
-.settings-list > .setting-box > .setting-desc {padding-bottom: 16px; color: #5E626D;}
+.settings-list > .setting-box {border: unset; flex: 0 1 20%; padding: 8px;}
+.settings-list > .setting-box > button.btn {padding: 16px 10px; height: 100%; width: 100%; display: flex; flex-direction: column; justify-content: space-between; cursor: pointer; white-space: unset; text-align: unset; border: 1px solid rgba(227, 228, 233, 0.6)}
+.settings-list > .setting-box > .btn:hover {background: unset;}
+.settings-list > .setting-box > .btn[disabled] {cursor: not-allowed; pointer-events: unset;}
+.settings-list > .setting-box > .btn[disabled] > a {pointer-events: none;}
+.settings-list > .setting-box > .btn > h4 > img {padding-right: 8px; padding-bottom: 3px; width: 32px; height: 27px;}
+.settings-list > .setting-box > .btn > .setting-desc {padding-bottom: 16px; color: #5E626D;}
 .settings-list.lite-setting > .setting-box {flex: 1 1 30%;}
 
 .plugin-list {display: flex; flex-wrap: wrap; padding: 12px 4px 4px 4px;}
diff --git a/module/admin/view/index.html.php b/module/admin/view/index.html.php
index 5fc9e2d923..aa1f338b2e 100755
--- a/module/admin/view/index.html.php
+++ b/module/admin/view/index.html.php
@@ -19,11 +19,13 @@
       <div class="settings-list <?php if($config->vision == 'lite') echo 'lite-setting';?>">
         <?php foreach($lang->admin->menuList as $menuKey => $menu):?>
         <?php if($config->vision == 'lite' and !in_array($menuKey, $config->admin->liteMenuList)) continue;?>
-	<button class="setting-box btn shadow-primary-hover" <?php if($menu['disabled']) echo 'disabled';?> data-link='<?php echo $menu['link'];?>'>
-	  <h4><img src="/static/svg/admin-<?php echo $menuKey;?>.svg"/><?php echo $menu['name'];?></h4>
-          <p class="text-muted setting-desc" title="<?php echo $menu['desc'];?>"><?php echo $menu['desc'];?></p>
-          <?php echo html::a($config->admin->helpURL[$menuKey], "<i class='icon icon-help'></i> {$lang->help}", '_blank', 'class="text-muted setting-help"');?>
-        </button>
+        <div class="setting-box">
+          <button class="btn shadow-primary-hover" <?php if($menu['disabled']) echo 'disabled';?> data-link='<?php echo $menu['link'];?>'>
+            <h4><img src="/static/svg/admin-<?php echo $menuKey;?>.svg"/><?php echo $menu['name'];?></h4>
+            <p class="text-muted setting-desc" title="<?php echo $menu['desc'];?>"><?php echo $menu['desc'];?></p>
+            <?php echo html::a($config->admin->helpURL[$menuKey], "<i class='icon icon-help'></i> {$lang->help}", '_blank', 'class="text-muted setting-help"');?>
+          </button>
+        </div>
         <?php endforeach;?>
       </div>
     </div>