diff --git a/src/plugins/kibana/public/dashboard/styles/main.less b/src/plugins/kibana/public/dashboard/styles/main.less
index ed8736f2090c0..fdbef55cfb0f1 100644
--- a/src/plugins/kibana/public/dashboard/styles/main.less
+++ b/src/plugins/kibana/public/dashboard/styles/main.less
@@ -6,9 +6,6 @@
   navbar[name="dashboard-options"] {
     padding-bottom: 0;
   }
-  navbar[name="dashboard-search"] {
-    padding-bottom: 10px;
-  }
 }
 
 dashboard-grid {
diff --git a/src/plugins/kibana/public/discover/styles/main.less b/src/plugins/kibana/public/discover/styles/main.less
index d947c95778308..ef6cb62f8b634 100644
--- a/src/plugins/kibana/public/discover/styles/main.less
+++ b/src/plugins/kibana/public/discover/styles/main.less
@@ -5,9 +5,6 @@
   navbar[name="discover-options"] {
     padding-bottom: 0;
   }
-  navbar[name="discover-search"] {
-    padding-bottom: 10px;
-  }
 }
 
 .discover {
diff --git a/src/plugins/kibana/public/visualize/editor/styles/_editor.less b/src/plugins/kibana/public/visualize/editor/styles/_editor.less
index 6a0468669c4f6..773eeb9e7c494 100644
--- a/src/plugins/kibana/public/visualize/editor/styles/_editor.less
+++ b/src/plugins/kibana/public/visualize/editor/styles/_editor.less
@@ -69,9 +69,6 @@
     padding-bottom: 0;
   }
 
-  navbar[name="visualize-search"] {
-    padding-bottom: 10px;
-  }
 
   &-actions {
     margin-left: auto;
diff --git a/src/ui/public/styles/control_group.less b/src/ui/public/styles/control_group.less
index 23cd303a065ce..3f21998996402 100644
--- a/src/ui/public/styles/control_group.less
+++ b/src/ui/public/styles/control_group.less
@@ -24,7 +24,7 @@
   }
 
   button {
-    padding: @padding-base-vertical @padding-base-horizontal;
+    padding: 4px 10px;
     font-size: @font-size-base;
     color: @control-group-link-color;
     background-color: @control-group-bg;
diff --git a/src/ui/public/styles/navbar.less b/src/ui/public/styles/navbar.less
index 1f022cc35c6bb..20c0ef599c795 100644
--- a/src/ui/public/styles/navbar.less
+++ b/src/ui/public/styles/navbar.less
@@ -6,7 +6,7 @@ navbar {
   max-height: @navbar-collapse-max-height;
   margin-bottom: @navbar-margin-bottom;
   // top and bottom padding are normally calcuated and stored in @navbar-padding-vertical, but flexbox
-  padding: @padding-base-vertical @navbar-padding-horizontal;
+  padding: 0 @navbar-padding-horizontal 6px @navbar-padding-horizontal;
   color: @navbar-default-color;
   background-color: @navbar-default-bg;
   border: none;
@@ -20,6 +20,11 @@ navbar {
     padding-right: @navbar-padding-horizontal;
   }
 
+  .navbar-text {
+    margin-top: 6px;
+    margin-bottom: 6px;
+  }
+
   // the "brand" that is displayed, usually on the left of the navbar
   > .name {
     align-self: center;
diff --git a/src/ui/public/styles/variables/bootstrap-mods.less b/src/ui/public/styles/variables/bootstrap-mods.less
index 771dadf6ff152..4f8afce3df71d 100644
--- a/src/ui/public/styles/variables/bootstrap-mods.less
+++ b/src/ui/public/styles/variables/bootstrap-mods.less
@@ -332,7 +332,7 @@
 @navbar-height:                    45px;
 @navbar-margin-bottom:             0px;
 @navbar-border-radius:             @border-radius-base;
-@navbar-padding-horizontal:        floor((@grid-gutter-width / 2));
+@navbar-padding-horizontal:        10px;
 @navbar-padding-vertical:          ((@navbar-height - @line-height-computed) / 2);
 @navbar-collapse-max-height:       340px;