diff --git a/src/app/settings/two-factor-authenticator.component.html b/src/app/settings/two-factor-authenticator.component.html
index 7393fbfa2b..4bbdf00d38 100644
--- a/src/app/settings/two-factor-authenticator.component.html
+++ b/src/app/settings/two-factor-authenticator.component.html
@@ -16,7 +16,7 @@
             <form #form (ngSubmit)="submit()" [appApiAction]="formPromise" ngNativeValidate *ngIf="authed">
                 <div class="modal-body">
                     <ng-container *ngIf="!enabled">
-                        <img src="../../images/two-factor/0.png" class="float-right" alt="">
+                        <img class="float-right mfaType0" alt="Authenticator app logo">
                         <p>{{'twoStepAuthenticatorDesc' | i18n}}</p>
                         <p>
                             <strong>1. {{'twoStepAuthenticatorDownloadApp' | i18n}}</strong>
@@ -27,7 +27,7 @@
                             <p>{{'twoStepLoginProviderEnabled' | i18n}}</p>
                             {{'twoStepAuthenticatorReaddDesc' | i18n}}
                         </app-callout>
-                        <img src="../../images/two-factor/0.png" class="float-right" alt="">
+                        <img class="float-right mfaType0" alt="Authenticator app logo">
                         <p>{{'twoStepAuthenticatorNeedApp' | i18n}}</p>
                     </ng-container>
                     <ul class="fa-ul">
diff --git a/src/app/settings/two-factor-duo.component.html b/src/app/settings/two-factor-duo.component.html
index b911270331..baa5fe07a8 100644
--- a/src/app/settings/two-factor-duo.component.html
+++ b/src/app/settings/two-factor-duo.component.html
@@ -20,7 +20,7 @@
                         <app-callout type="success" title="{{'enabled' | i18n}}" icon="fa-check-circle">
                             {{'twoStepLoginProviderEnabled' | i18n}}
                         </app-callout>
-                        <img src="../../images/two-factor/2.png" class="float-right ml-3" alt="">
+                        <img class="float-right ml-3 mfaType2" alt="Duo logo">
                         <strong>{{'twoFactorDuoIntegrationKey' | i18n}}:</strong> {{ikey}}
                         <br>
                         <strong>{{'twoFactorDuoSecretKey' | i18n}}:</strong> {{skey}}
@@ -28,7 +28,7 @@
                         <strong>{{'twoFactorDuoApiHostname' | i18n}}:</strong> {{host}}
                     </ng-container>
                     <ng-container *ngIf="!enabled">
-                        <img src="../../images/two-factor/2.png" class="float-right ml-3" alt="">
+                        <img class="float-right ml-3 mfaType2" alt="Duo logo">
                         <p>{{'twoFactorDuoDesc' | i18n}}</p>
                         <div class="form-group">
                             <label for="ikey">{{'twoFactorDuoIntegrationKey' | i18n}}</label>
diff --git a/src/app/settings/two-factor-email.component.html b/src/app/settings/two-factor-email.component.html
index 9e6c78de3a..424c8ff64c 100644
--- a/src/app/settings/two-factor-email.component.html
+++ b/src/app/settings/two-factor-email.component.html
@@ -24,7 +24,7 @@
                     <ng-container *ngIf="!enabled">
                         <p class="d-flex">
                             <span class="mr-3">{{'twoFactorEmailDesc' | i18n}}</span>
-                            <img src="../../images/two-factor/1.png" class="float-right ml-auto" alt="">
+                            <img class="float-right ml-auto mfaType1" alt="Email logo">
                         </p>
                         <div class="form-group">
                             <label for="email">1. {{'twoFactorEmailEnterEmail' | i18n}}</label>
diff --git a/src/app/settings/two-factor-setup.component.html b/src/app/settings/two-factor-setup.component.html
index 04fe750e13..f7a5d871ab 100644
--- a/src/app/settings/two-factor-setup.component.html
+++ b/src/app/settings/two-factor-setup.component.html
@@ -21,7 +21,7 @@
 <ul class="list-group list-group-2fa">
     <li *ngFor="let p of providers" class="list-group-item d-flex align-items-center">
         <div class="logo-2fa d-flex justify-content-center">
-            <img [src]="'images/two-factor/' + p.type + '.png'" alt="">
+            <img [class]="'mfaType' + p.type" [alt]="p.name + ' logo'">
         </div>
         <div class="mx-4">
             <h3 class="mb-0">
diff --git a/src/app/settings/two-factor-webauthn.component.html b/src/app/settings/two-factor-webauthn.component.html
index 69f68114b8..e887afce75 100644
--- a/src/app/settings/two-factor-webauthn.component.html
+++ b/src/app/settings/two-factor-webauthn.component.html
@@ -24,7 +24,7 @@
                             <li>{{'twoFactorWebAuthnSupportWeb' | i18n}}</li>
                         </ul>
                     </app-callout>
-                    <img src="../../images/two-factor/7.png" class="float-right ml-5" alt="">
+                    <img class="float-right ml-5 mfaType7" alt="FIDO2 WebAuthn logo'">
                     <ul class="fa-ul">
                         <li *ngFor="let k of keys; let i = index" #removeKeyBtn [appApiAction]="k.removePromise">
                             <i class="fa-li fa fa-key"></i>
diff --git a/src/app/settings/two-factor-yubikey.component.html b/src/app/settings/two-factor-yubikey.component.html
index 70675be857..b94dc68a23 100644
--- a/src/app/settings/two-factor-yubikey.component.html
+++ b/src/app/settings/two-factor-yubikey.component.html
@@ -26,7 +26,7 @@
                             <li>{{'twoFactorYubikeySupportMobile' | i18n}}</li>
                         </ul>
                     </app-callout>
-                    <img src="../../images/two-factor/3.png" class="float-right" alt="">
+                    <img class="float-right mfaType3" alt="YubiKey OTP security key logo">
                     <p>{{'twoFactorYubikeyAdd' | i18n}}:</p>
                     <ol>
                         <li>{{'twoFactorYubikeyPlugIn' | i18n}}</li>
diff --git a/src/images/two-factor/7-w.png b/src/images/two-factor/7-w.png
new file mode 100644
index 0000000000..1620ff7667
Binary files /dev/null and b/src/images/two-factor/7-w.png differ
diff --git a/src/images/two-factor/7.png b/src/images/two-factor/7.png
index 7098e4c768..d998ae664d 100644
Binary files a/src/images/two-factor/7.png and b/src/images/two-factor/7.png differ
diff --git a/src/scss/plugins.scss b/src/scss/plugins.scss
index fd953646c1..7c911499c1 100644
--- a/src/scss/plugins.scss
+++ b/src/scss/plugins.scss
@@ -36,6 +36,20 @@
     }
 }
 
+@each $mfaType in $mfaTypes {
+    .mfaType#{$mfaType} {
+        content: url('../images/two-factor/' + $mfaType + '.png');
+        max-width: 100px;
+    }
+}
+
+.mfaType7 {
+    @include themify($themes) {
+        content: url('../images/two-factor/7' + themed('mfaLogoSuffix'));
+        max-width: 100px;
+    }
+}
+
 .progress {
     @include themify($themes) {
         background-color: themed('pwStrengthBackground');
diff --git a/src/scss/tables.scss b/src/scss/tables.scss
index b796cfdee3..6b9cf59d6f 100644
--- a/src/scss/tables.scss
+++ b/src/scss/tables.scss
@@ -10,12 +10,14 @@
         }
 
         & > a {
-            @include themify($themes) {
-                color: themed('tableLinkColor');
-            }
-            &:hover {
+            &:not(.badge) {
                 @include themify($themes) {
-                    color: themed('tableLinkColorHover');
+                    color: themed('tableLinkColor');
+                }
+                &:hover {
+                    @include themify($themes) {
+                        color: themed('tableLinkColorHover');
+                    }
                 }
             }
         }
diff --git a/src/scss/variables.scss b/src/scss/variables.scss
index 8e375a4eb1..9e6e264c35 100644
--- a/src/scss/variables.scss
+++ b/src/scss/variables.scss
@@ -77,6 +77,10 @@ $border-color: $secondary;
 
 $fa-font-path: "~font-awesome/fonts";
 
+// MFA Types for logo styling with no dark theme alternative
+
+$mfaTypes: 0, 1, 2, 3, 4, 6;
+
 // Theme Variables
 
 $lightDangerHover: #C43421;
@@ -216,6 +220,7 @@ $themes: (
         tableRowHover: rgba(0,0,0,0.03),
         tableSeparator: #DEE2E6,
         browserInputIconsFilter: invert(0),
+        mfaLogoSuffix: '.png'
     ),
     dark: (
         logoSuffix: 'white',
@@ -331,6 +336,7 @@ $themes: (
         tableRowHover: rgba(255, 255, 255, 0.03),
         tableSeparator: $darkBlue1,
         browserInputIconsFilter: invert(1),
+        mfaLogoSuffix: '-w.png'
     ),
 );