diff --git a/files/styles/style-dark.css b/files/styles/style-dark.css
index 86359af..ad65088 100644
--- a/files/styles/style-dark.css
+++ b/files/styles/style-dark.css
@@ -90,6 +90,12 @@ QGCMAVLinkLogPlayer QLabel:disabled {
 	color: #AAA;
 }
 
+QGCToolBar {
+    border-top-color: #969696;
+    border-bottom-color: #484848;
+    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #4B4B4B, stop: 0.3 #404040, stop: 0.34 #383838, stop:1 #181818);
+}
+
 QGCToolBar QLabel {
     font-size: 12pt;
     font-weight: bold;
@@ -120,8 +126,22 @@ QGCToolBar QToolButton {
     margin: 0;
     padding-left: 0;
     padding-right: 0;
+    border: none;
+    border-top: 1px solid #333;
+    border-bottom: 1px solid #333;
     border-radius: 0;
     text-align: left;
+    background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #AAA, stop: 1 #BBB);
+    color: #000;
+}
+
+QGCToolBar QToolButton:checked, QGCToolBar QToolButton:pressed, QGCToolBar QToolButton:checked:hover {
+    background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #555, stop: 1 #777);
+    color: #FFF;
+}
+
+QGCToolBar QToolButton:hover {
+    color: #FFF;
 }
 
 QGCToolBar QToolButton#advancedButton {
@@ -317,7 +337,7 @@ QPushButton:disabled, QToolButton:disabled {
 }
 
 QPushButton:hover, QToolButton:hover {
-    background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #59666f, stop: 1 #414B52);
+    background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #59666F, stop: 1 #414B52);
 }
 
 QPushButton:hover#connectButton, QPushButton:hover#controlButton {
@@ -462,12 +482,6 @@ QTextEdit {
     border-radius: 2px;
 }
 
-QToolBar {
-    border-top-color: #969696;
-    border-bottom-color: #484848;
-    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #4B4B4B, stop: 0.3 #404040, stop: 0.34 #383838, stop:1 #181818);
-}
-
 QToolButton {
     padding-left: 3px;
     padding-right: 3px;
diff --git a/files/styles/style-light.css b/files/styles/style-light.css
index f3fe7c4..18f736b 100644
--- a/files/styles/style-light.css
+++ b/files/styles/style-light.css
@@ -90,6 +90,12 @@ QGCMAVLinkLogPlayer QLabel:disabled {
 	color: #666;
 }
 
+QGCToolBar {
+    border-top-color: #969696;
+    border-bottom-color: #484848;
+    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #DDD, stop: 1 #999);
+}
+
 QGCToolBar QLabel {
     font-size: 12pt;
     font-weight: bold;
@@ -120,8 +126,22 @@ QGCToolBar QToolButton {
     margin: 0;
     padding-left: 0;
     padding-right: 0;
+    border: none;
+    border-top: 1px solid #DDD;
+    border-bottom: 1px solid #DDD;
     border-radius: 0;
     text-align: left;
+    background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #333, stop: 1 #444);
+    color: #FFF;
+}
+
+QGCToolBar QToolButton:checked, QGCToolBar QToolButton:pressed, QGCToolBar QToolButton:checked:hover {
+    background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #777, stop: 1 #999);
+    color: #FFF;
+}
+
+QGCToolBar QToolButton:hover {
+    color: #000;
 }
 
 QGCToolBar QToolButton#advancedButton {
@@ -285,7 +305,6 @@ QPushButton, QToolButton {
 
 QPushButton#connectButton, QPushButton#controlButton {
     background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #73D95D, stop: 1 #18A154);
-    padding: 0;
 }
 
 QPushButton#controlButton {
@@ -430,7 +449,7 @@ QSpinBox::up-button, QDoubleSpinBox::up-button {
 }
 
 QStatusBar {
-    background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #CCC, stop: 1 #888);
+    background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #DDD, stop: 1 #999);
 }
 
 QTabBar::tab {
@@ -465,12 +484,6 @@ QTextEdit {
     border-radius: 2px;
 }
 
-QToolBar {
-    border-top-color: #969696;
-    border-bottom-color: #484848;
-    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #CCC, stop: 1 #888);
-}
-
 QToolButton {
     padding-left: 3px;
     padding-right: 3px;