diff --git a/src/app/@theme/components/header/header.component.html b/src/app/@theme/components/header/header.component.html
index 0ac1e97a..57c76608 100644
--- a/src/app/@theme/components/header/header.component.html
+++ b/src/app/@theme/components/header/header.component.html
@@ -26,9 +26,9 @@
   <nb-action>
     <nb-user [menu]="userMenu" [name]="user?.name" [picture]="user?.picture"></nb-user>
   </nb-action>
-  <nb-action class="action-item" disabled icon="nb-notifications"></nb-action>
-  <nb-action class="action-item" icon="nb-email"></nb-action>
-  <nb-action class="action-item">
+  <nb-action class="control-item" disabled icon="nb-notifications"></nb-action>
+  <nb-action class="control-item" icon="nb-email"></nb-action>
+  <nb-action class="control-item">
     <nb-search type="rotate-layout"></nb-search>
   </nb-action>
 </nb-actions>
diff --git a/src/app/@theme/components/header/header.component.scss b/src/app/@theme/components/header/header.component.scss
index 7ea95dcb..d024e4ed 100644
--- a/src/app/@theme/components/header/header.component.scss
+++ b/src/app/@theme/components/header/header.component.scss
@@ -31,7 +31,7 @@
     width: 50%;
   }
 
-  .action-item {
+  .control-item {
     display: block;
   }
 
@@ -151,12 +151,8 @@
     }
   }
 
-  nb-user /deep/ .user-name {
-    display: block;
-  }
-
   @include media-breakpoint-down(md) {
-    .action-item {
+    .control-item {
       display: none;
     }
   }
diff --git a/src/app/pages/ui-features/buttons/button-groups/button-groups.component.scss b/src/app/pages/ui-features/buttons/button-groups/button-groups.component.scss
index 4e391fff..55d64133 100644
--- a/src/app/pages/ui-features/buttons/button-groups/button-groups.component.scss
+++ b/src/app/pages/ui-features/buttons/button-groups/button-groups.component.scss
@@ -57,7 +57,7 @@
 
     > label {
       flex-basis: 10%;
-      margin: 0 5px 10px 0;
+      margin: 0 0.25rem 0.5rem 0;
     }
   }
 
diff --git a/src/app/pages/ui-features/buttons/buttons.component.scss b/src/app/pages/ui-features/buttons/buttons.component.scss
index c88cf294..83855334 100644
--- a/src/app/pages/ui-features/buttons/buttons.component.scss
+++ b/src/app/pages/ui-features/buttons/buttons.component.scss
@@ -81,18 +81,18 @@
     ngx-action-groups /deep/ nb-card-body {
       flex-direction: column;
       align-items: flex-start;
-      padding: 0.7rem;
+      padding: 0.75rem;
 
       nb-action {
-        padding: 0.6rem;
+        padding: 0.5rem;
       }
 
       .control-icon, .start-search {
-        font-size: 1.7rem;
+        font-size: 1.5rem;
       }
 
       .user-container {
-        font-size: 0.7rem;
+        font-size: 0.75rem;
       }
 
       .user-picture {
@@ -101,7 +101,7 @@
       }
 
       .action-groups-header {
-        margin: 0 0 10px 10px;
+        margin: 0 0 0.5rem 0.25rem;
       }
     }
 
@@ -111,7 +111,7 @@
       }
 
       i {
-        font-size: 1.9rem !important;
+        font-size: 2rem !important;
       }
 
     }
diff --git a/src/app/pages/ui-features/buttons/hero-buttons/hero-buttons.component.html b/src/app/pages/ui-features/buttons/hero-buttons/hero-buttons.component.html
index 410a7096..9a809507 100644
--- a/src/app/pages/ui-features/buttons/hero-buttons/hero-buttons.component.html
+++ b/src/app/pages/ui-features/buttons/hero-buttons/hero-buttons.component.html
@@ -2,7 +2,7 @@
   <nb-card-header>Hero Buttons</nb-card-header>
   <nb-card-body>
     <div class="row">
-      <div class="example-container col-xs-12 col-sm-6 col-md-4 col-lg-4 col-xl-3 col-xxxl-2" *ngFor="let hb of settings">
+      <div class="example-container col-xs-12 col-sm-6 col-md-4 col-xl-3 col-xxxl-2" *ngFor="let hb of settings">
         <div class="container-title">
           <span>{{ hb.title }}</span>
         </div>
diff --git a/src/app/pages/ui-features/tabs/tabs.component.scss b/src/app/pages/ui-features/tabs/tabs.component.scss
index 0f6fbcd4..194df306 100644
--- a/src/app/pages/ui-features/tabs/tabs.component.scss
+++ b/src/app/pages/ui-features/tabs/tabs.component.scss
@@ -21,7 +21,7 @@
   @include media-breakpoint-down(xs) {
     nb-tabset /deep/ul {
       font-size: 1rem;
-      padding: 0 0.2rem;
+      padding: 0 0.25rem;
     }
   }
 }