diff --git a/apps/red-ui/src/app/screens/admin/dictionary-overview-screen/dictionary-overview-screen.component.html b/apps/red-ui/src/app/screens/admin/dictionary-overview-screen/dictionary-overview-screen.component.html
index 4eb626208..67f241f79 100644
--- a/apps/red-ui/src/app/screens/admin/dictionary-overview-screen/dictionary-overview-screen.component.html
+++ b/apps/red-ui/src/app/screens/admin/dictionary-overview-screen/dictionary-overview-screen.component.html
@@ -99,15 +99,14 @@
                 </ace-editor>
             </div>
 
-            <div class="changes-box" *ngIf="hasChanges">
+            <div class="changes-box" *ngIf="hasChanges && permissionsService.isAdmin()">
                 <redaction-icon-button
-                    *ngIf="permissionsService.isAdmin()"
                     icon="red:check-alt"
                     (action)="saveEntries()"
                     text="dictionary-overview.save-changes"
                     type="primary"
                 ></redaction-icon-button>
-                <div class="all-caps-label cancel" *ngIf="permissionsService.isAdmin()" (click)="revert()" translate="dictionary-overview.revert-changes"></div>
+                <div class="all-caps-label cancel" (click)="revert()" translate="dictionary-overview.revert-changes"></div>
             </div>
         </div>
 
diff --git a/apps/red-ui/src/app/screens/admin/rules-screen/rules-screen.component.html b/apps/red-ui/src/app/screens/admin/rules-screen/rules-screen.component.html
index 0edd921ff..cdfdb09c7 100644
--- a/apps/red-ui/src/app/screens/admin/rules-screen/rules-screen.component.html
+++ b/apps/red-ui/src/app/screens/admin/rules-screen/rules-screen.component.html
@@ -26,15 +26,9 @@
             >
             </ace-editor>
         </div>
-        <div class="changes-box" *ngIf="hasChanges">
-            <redaction-icon-button
-                *ngIf="permissionsService.isAdmin()"
-                icon="red:check"
-                (action)="save()"
-                text="rules-screen.save-changes"
-                type="primary"
-            ></redaction-icon-button>
-            <div *ngIf="permissionsService.isAdmin()" (click)="revert()" translate="rules-screen.revert-changes" class="all-caps-label cancel"></div>
+        <div class="changes-box" *ngIf="hasChanges && permissionsService.isAdmin()">
+            <redaction-icon-button icon="red:check-alt" (action)="save()" text="rules-screen.save-changes" type="primary"></redaction-icon-button>
+            <div (click)="revert()" translate="rules-screen.revert-changes" class="all-caps-label cancel"></div>
         </div>
     </div>
 </section>
diff --git a/apps/red-ui/src/app/screens/admin/watermark-screen/watermark-screen.component.html b/apps/red-ui/src/app/screens/admin/watermark-screen/watermark-screen.component.html
index b108ac99b..865006403 100644
--- a/apps/red-ui/src/app/screens/admin/watermark-screen/watermark-screen.component.html
+++ b/apps/red-ui/src/app/screens/admin/watermark-screen/watermark-screen.component.html
@@ -20,16 +20,15 @@
         <div class="left-container">
             <div class="overlay-shadow"></div>
             <div #viewer class="viewer"></div>
-            <div class="changes-box" *ngIf="changed">
+            <div class="changes-box" *ngIf="changed && permissionsService.isAdmin()">
                 <redaction-icon-button
-                    *ngIf="permissionsService.isAdmin()"
                     [disabled]="configForm.invalid"
                     icon="red:check-alt"
                     (action)="save()"
                     text="watermark-screen.action.save"
                     type="primary"
                 ></redaction-icon-button>
-                <div *ngIf="permissionsService.isAdmin()" (click)="revert()" translate="watermark-screen.action.revert" class="all-caps-label cancel"></div>
+                <div (click)="revert()" translate="watermark-screen.action.revert" class="all-caps-label cancel"></div>
             </div>
         </div>
 
diff --git a/apps/red-ui/src/assets/styles/red-button.scss b/apps/red-ui/src/assets/styles/red-button.scss
index 802bfaf83..f30726a9f 100644
--- a/apps/red-ui/src/assets/styles/red-button.scss
+++ b/apps/red-ui/src/assets/styles/red-button.scss
@@ -31,16 +31,17 @@
     opacity: 0 !important;
 }
 
-.mat-flat-button.mat-primary {
+.mat-flat-button.mat-primary,
+.mat-button.primary {
     padding: 0 14px;
     transition: background-color 0.2s, color 0.2s;
     background-color: $red-1;
 
     &.mat-button-disabled {
         background-color: $red-1;
-        color: $white;
 
-        > * {
+        .mat-button-wrapper {
+            color: $white;
             opacity: 0.5;
         }
     }