diff --git a/public/sass/_variables.light.scss b/public/sass/_variables.light.scss
index 4298c50369f..782354bba19 100644
--- a/public/sass/_variables.light.scss
+++ b/public/sass/_variables.light.scss
@@ -153,11 +153,11 @@ $table-bg-hover: $gray-5;
 
 // Buttons
 // -------------------------
-$btn-primary-bg: $sapphire-base;
-$btn-primary-bg-hl: $sapphire-shade;
+$btn-primary-bg: $green-base;
+$btn-primary-bg-hl: $green-shade;
 
-$btn-secondary-bg: rgba(0,0,0,0);
-$btn-secondary-bg-hl: rgba(0,0,0,0);
+$btn-secondary-bg: $sapphire-base;
+$btn-secondary-bg-hl: $sapphire-shade;
 
 $btn-danger-bg: $lobster-base;
 $btn-danger-bg-hl: $lobster-shade;
diff --git a/public/sass/components/_timepicker.scss b/public/sass/components/_timepicker.scss
index 6f075c4d92e..d25d85b3d74 100644
--- a/public/sass/components/_timepicker.scss
+++ b/public/sass/components/_timepicker.scss
@@ -10,6 +10,10 @@
 .gf-timepicker-nav-btn {
   text-overflow: ellipsis;
   overflow: hidden;
+
+  .fa-clock-o {
+    margin-right: 4px;
+  }
 }
 
 .gf-timepicker-dropdown {
@@ -48,7 +52,6 @@
 }
 
 .gf-timepicker-utc {
-  background-color: $tight-form-func-bg;
   color: $orange;
   font-size: 75%;
   padding: 3px;