diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 7cda81e830..b80a48f269 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -37,6 +37,7 @@ import { StopClickDirective } from 'jslib/angular/directives/stop-click.directiv
 import { StopPropDirective } from 'jslib/angular/directives/stop-prop.directive';
 import { TrueFalseValueDirective } from 'jslib/angular/directives/true-false-value.directive';
 
+import { ColorPasswordPipe } from 'jslib/angular/pipes/color-password.pipe';
 import { I18nPipe } from 'jslib/angular/pipes/i18n.pipe';
 import { SearchCiphersPipe } from 'jslib/angular/pipes/search-ciphers.pipe';
 
@@ -141,6 +142,7 @@ registerLocaleData(localeZhTw, 'zh-TW');
         BoxRowDirective,
         CiphersComponent,
         CollectionsComponent,
+        ColorPasswordPipe,
         EnvironmentComponent,
         ExportComponent,
         FallbackSrcDirective,
diff --git a/src/app/vault/password-generator.component.html b/src/app/vault/password-generator.component.html
index 695604b19a..97059d841b 100644
--- a/src/app/vault/password-generator.component.html
+++ b/src/app/vault/password-generator.component.html
@@ -2,7 +2,7 @@
     <div class="modal-dialog modal-sm">
         <div class="modal-content">
             <div class="modal-body">
-                <div class="password-block">{{password}}</div>
+                <div class="password-block" [innerHTML]="password | colorPassword"></div>
                 <div class="box">
                     <div class="box-content condensed">
                         <a class="box-content-row" href="#" appStopClick appBlurClick
diff --git a/src/app/vault/view.component.html b/src/app/vault/view.component.html
index 2400af2cd8..df56c2c665 100644
--- a/src/app/vault/view.component.html
+++ b/src/app/vault/view.component.html
@@ -27,7 +27,7 @@
                         <div class="row-main">
                             <span class="row-label">{{'password' | i18n}}</span>
                             <span [hidden]="showPassword" class="monospaced">{{cipher.login.maskedPassword}}</span>
-                            <span [hidden]="!showPassword" class="monospaced">{{cipher.login.password}}</span>
+                            <span [hidden]="!showPassword" class="monospaced" [innerHTML]="cipher.login.password | colorPassword"></span>
                         </div>
                         <div class="action-buttons">
                             <button type="button" #checkPasswordBtn class="row-btn btn" appBlurClick
diff --git a/src/scss/base.scss b/src/scss/base.scss
index 0300dc8460..8c6129e81c 100644
--- a/src/scss/base.scss
+++ b/src/scss/base.scss
@@ -64,6 +64,18 @@ input, select, textarea {
     }
 }
 
+.passwordNumber {
+    @include themify($themes) {
+        color: themed('passwordNumberColor');
+    }
+}
+
+.passwordSpecial {
+    @include themify($themes) {
+        color: themed('passwordSpecialColor');
+    }
+}
+
 input, select, textarea, button {
     font-size: $font-size-base;
     font-family: $font-family-sans-serif;
diff --git a/src/scss/variables.scss b/src/scss/variables.scss
index 088fea7ef9..9c83a32d64 100644
--- a/src/scss/variables.scss
+++ b/src/scss/variables.scss
@@ -41,6 +41,8 @@ $button-color-danger: darken($brand-danger, 10%);
 $themes: (
     light: (
         textColor: $text-color,
+        passwordNumberColor: #007fde,
+        passwordSpecialColor: #c40800,
         borderColor: $border-color-dark,
         backgroundColor: $background-color,
         backgroundColorAlt: $background-color-alt,
@@ -87,6 +89,8 @@ $themes: (
     ),
     dark: (
         textColor: #ffffff,
+        passwordNumberColor: #9fd9ff,
+        passwordSpecialColor: #ff7c70,
         borderColor: #2f2f2f,
         backgroundColor: #363636,
         backgroundColorAlt: #3d3d3d,
@@ -133,6 +137,8 @@ $themes: (
     ),
     nord: (
         textColor: $nord5,
+        passwordNumberColor: $nord8,
+        passwordSpecialColor: $nord12,
         borderColor: $nord0,
         backgroundColor: $nord2,
         backgroundColorAlt: $nord1,