diff --git a/client/client/app/components/ngbFeatureInfoPanel/ngbFeatureInfo/ngbFeatureInfoMain/ngbFeatureInfoMain.controller.js b/client/client/app/components/ngbFeatureInfoPanel/ngbFeatureInfo/ngbFeatureInfoMain/ngbFeatureInfoMain.controller.js
index f21a138c6..5258e4997 100644
--- a/client/client/app/components/ngbFeatureInfoPanel/ngbFeatureInfo/ngbFeatureInfoMain/ngbFeatureInfoMain.controller.js
+++ b/client/client/app/components/ngbFeatureInfoPanel/ngbFeatureInfo/ngbFeatureInfoMain/ngbFeatureInfoMain.controller.js
@@ -171,4 +171,4 @@ export default class ngbFeatureInfoMainController {
         this.ngbFeatureInfoPanelService.saveInProgress = false;
         this.ngbFeatureInfoPanelService.saveError = null;
     }
-}
\ No newline at end of file
+}
diff --git a/client/client/app/components/ngbFeatureInfoPanel/ngbFeatureInfo/ngbFeatureInfoMain/ngbFeatureInfoMain.scss b/client/client/app/components/ngbFeatureInfoPanel/ngbFeatureInfo/ngbFeatureInfoMain/ngbFeatureInfoMain.scss
index 1d367e6a3..fa0a1e1a7 100644
--- a/client/client/app/components/ngbFeatureInfoPanel/ngbFeatureInfo/ngbFeatureInfoMain/ngbFeatureInfoMain.scss
+++ b/client/client/app/components/ngbFeatureInfoPanel/ngbFeatureInfo/ngbFeatureInfoMain/ngbFeatureInfoMain.scss
@@ -14,7 +14,11 @@
   border-bottom: 1px solid #cccccc;
   font-weight: bold;
 }
-ngb-feature-info-main{
+ngb-feature-info-main {
+  [disabled] ng-md-icon {
+    fill: currentColor !important;
+  }
+
   collapsible-panel-title{
     font: 400 18px Arial;
     text-transform: none;
@@ -45,12 +49,8 @@ ngb-feature-info-main{
 }
 
 .general-information-buttons {
-  margin: 0px;
+  margin: 0;
   font-size: 14px;
-  color: #6699ff;
+  color: rgba(0, 0, 0, 0.87);
   float: right;
 }
-
-.cancel-button {
-  color: #494949;
-}
diff --git a/client/client/app/components/ngbFeatureInfoPanel/ngbFeatureInfo/ngbFeatureInfoMain/ngbFeatureInfoMain.tpl.html b/client/client/app/components/ngbFeatureInfoPanel/ngbFeatureInfo/ngbFeatureInfoMain/ngbFeatureInfoMain.tpl.html
index e3dc299a1..ed858c658 100644
--- a/client/client/app/components/ngbFeatureInfoPanel/ngbFeatureInfo/ngbFeatureInfoMain/ngbFeatureInfoMain.tpl.html
+++ b/client/client/app/components/ngbFeatureInfoPanel/ngbFeatureInfo/ngbFeatureInfoMain/ngbFeatureInfoMain.tpl.html
@@ -4,19 +4,19 @@
             <collapsible-panel-title>
                 General information
                 <md-button
-                    class="general-information-buttons"
+                    class="md-primary general-information-buttons"
                     ng-if="$ctrl.uuid && !$ctrl.editMode && $ctrl.isGeneralInfoOpen"
                     ng-click="$ctrl.onClickEditBtn($event)">
                     Edit
                 </md-button>
                 <md-button
-                    class="general-information-buttons cancel-button"
+                    class="general-information-buttons"
                     ng-if="$ctrl.editMode"
                     ng-click="$ctrl.onClickCancelBtn($event)">
                     Cancel
                 </md-button>
                 <md-button
-                    class="general-information-buttons"
+                    class="md-primary general-information-buttons"
                     ng-if="$ctrl.editMode"
                     ng-click="$ctrl.onClickSaveBtn($event)"
                     ng-disabled="$ctrl.disableSave || $ctrl.saveInProgress">