diff --git a/themes/neue-dark-ui/buttons.less b/themes/neue-dark-ui/buttons.less
index b5058b7ff..e33888564 100644
--- a/themes/neue-dark-ui/buttons.less
+++ b/themes/neue-dark-ui/buttons.less
@@ -1,25 +1,59 @@
 @import "ui-variables";
 @import "ui-mixins";
 
-.btn-toggle.btn-group {
+.btn {
+  color: @text-color;
+  border-radius: @component-border-radius;
+  border: none;
+
+  background-color: transparent;
+  background-image: -webkit-linear-gradient(@button-background-color, darken(@button-background-color, 5%));
+
+  font-weight: bold;
+  text-shadow: none;
+
+  font-size: 12px;
+  padding: 4px 10px;
+
+  &:hover {
+    color: @text-color-highlight;
+    background-image: -webkit-linear-gradient(@button-background-hover-color, darken(@button-background-hover-color, 5%));
+  }
+  &.selected, &.selected:hover {
+    color: @text-color-highlight;
+    background-image: -webkit-linear-gradient(@button-background-selected-color, darken(@button-background-selected-color, 5%));
+  }
+}
+
+.btn-group > .btn {
+  border-left: 1px solid @button-border-color;
+}
+.btn-group > .btn:first-child {
+  border-left: none;
+  border-top-left-radius: @component-border-radius;
+  border-bottom-left-radius: @component-border-radius;
+}
+.btn-group > .btn:last-child,
+.btn-group > .dropdown-toggle {
+  border-top-right-radius: @component-border-radius;
+  border-bottom-right-radius: @component-border-radius;
+}
+
+.btn-group.btn-group-toggle {
   .btn {
-    font-weight: bold;
-    background: @button-color;
-    color: @text-color;
-    font-size: 12px;
-    padding: 3px;
+    //font-weight: bold;
+    //color: @text-color;
+    //font-size: 12px;
+    //padding: 3px;
 
-    border: none;
-    //border-left: 1px solid @border-color-2;
-
-    &:hover{ background: @button-color-hover; }
+    //&:hover{ background: @button-color-hover; }
     &.enabled{
-      color: @text-color-info;
-      background: @button-color-active;
+      // color: @text-color-info;
+      // background: @button-color-active;
       //box-shadow: inset 1px 1px 1px @background-color-highlight-1;
     }
   }
-  .btn:first-child {
+  /*.btn:first-child {
     border-left: none;
     border-bottom-left-radius: 2px;
     border-top-left-radius: 2px;
@@ -27,5 +61,5 @@
   .btn:last-child {
     border-bottom-right-radius: 2px;
     border-top-right-radius: 2px;
-  }
+  }*/
 }
diff --git a/themes/neue-dark-ui/popover-list.less b/themes/neue-dark-ui/popover-list.less
index 959a8d0cb..5ffb05327 100644
--- a/themes/neue-dark-ui/popover-list.less
+++ b/themes/neue-dark-ui/popover-list.less
@@ -10,4 +10,8 @@
   .editor {
     margin-bottom: @component-padding/2;
   }
+
+  .list-group li {
+    padding-left: @component-padding/2;
+  }
 }
diff --git a/themes/neue-dark-ui/ui-variables.less b/themes/neue-dark-ui/ui-variables.less
index c98e188e8..fea694778 100644
--- a/themes/neue-dark-ui/ui-variables.less
+++ b/themes/neue-dark-ui/ui-variables.less
@@ -37,9 +37,10 @@
 @overlay-border-color: rgba(255, 255, 255, 0.05);
 @overlay-shadow-color: rgba(0, 0, 0, 0.5);
 
-@button-color: #303030;
-@button-color-hover: #353536;
-@button-color-active: #404040;
+@button-background-color: #43484d;
+@button-background-hover-color: lighten(@button-background-color, 5%);
+@button-background-selected-color: #5c6064;
+@button-border-color: rgba(0, 0, 0, 0.5);
 
 @tab-background-color-active: @panel-heading-background-color;
 @tab-background-color-inactive: #292c2f;