diff --git a/css/gpxedit.css b/css/gpxedit.css
index 78256b8..4ea204c 100644
--- a/css/gpxedit.css
+++ b/css/gpxedit.css
@@ -785,9 +785,6 @@ h2.popupTitle{
 #clearButton {
     width: 100%;
 }
-#saveButton i{
-    color: blue;
-}
 #clearButton i{
     color: red;
 }
@@ -795,9 +792,6 @@ h2.popupTitle{
 #saveButton, #saveName {
     width: 100%;
 }
-#loadButton i, #loadFolderButton i{
-    color: blue;
-}
 .selectimg{
     background: url('images/symbols/geocache-open.png') no-repeat right 8px center rgba(240, 240, 240, 0.90);
     background-size: 20px 20px;
@@ -911,3 +905,12 @@ div#ho button {
     margin-left: -4px !important;
     margin-top: -4px !important;
 }
+.sidebar-tabs > li.active {          
+    background-color: #E8E8E8;       
+}                                    
+.leaflet-control-locate.active .fa { 
+    color: #2074B6;                  
+}                                    
+.leaflet-control-locate .fa {        
+    color: black;                    
+}
diff --git a/js/gpxedit.js b/js/gpxedit.js
index 63a7b28..62f32f7 100644
--- a/js/gpxedit.js
+++ b/js/gpxedit.js
@@ -1773,6 +1773,14 @@
             }
         });
 
+		var buttonColor = 'blue';
+        if (OCA.Theming) {
+            buttonColor = OCA.Theming.color;
+        }
+
+        $('<style role="buttons">.fa { ' +
+            'color: ' + buttonColor + '; }</style>').appendTo('body');
+
     });
 
 })(jQuery, OC);