diff --git a/src/app/send/send.component.html b/src/app/send/send.component.html
index 21210f339c..81257a575b 100644
--- a/src/app/send/send.component.html
+++ b/src/app/send/send.component.html
@@ -51,23 +51,24 @@
                         <div class="item-title">
                             {{s.name}}
                             <span class="title-badges">
-                                <span appStopClick class="text-badge" *ngIf="s.disabled">
-                                    {{'disabled' | i18n}}
-                                </span>
-                                <ng-container >
+                                <ng-container ngIf="s.disabled">
+                                    <i class="fa fa-warning" appStopProp title="{{'disabled' | i18n}}" aria-hidden="true"></i>
+                                    <span class="sr-only">{{'disabled' | i18n}}</span>
+                                </ng-container>
+                                <ng-container *ngIf="s.password">
                                     <i class="fa fa-key" appStopProp title="{{'password' | i18n}}" aria-hidden="true"></i>
                                     <span class="sr-only">{{'password' | i18n}}</span>
                                 </ng-container>
-                                <ng-container >
+                                <ng-container *ngIf="s.maxAccessCountReached">
                                     <i class="fa fa-ban" appStopProp title="{{'maxAccessCountReached' | i18n}}"
                                         aria-hidden="true"></i>
                                     <span class="sr-only">{{'maxAccessCountReached' | i18n}}</span>
                                 </ng-container>
-                                <ng-container >
+                                <ng-container *ngIf="s.expired">
                                     <i class="fa fa-clock-o" appStopProp title="{{'expired' | i18n}}" aria-hidden="true"></i>
                                     <span class="sr-only">{{'expired' | i18n}}</span>
                                 </ng-container>
-                                <ng-container >
+                                <ng-container *ngIf="s.pendingDelete">
                                     <i class="fa fa-trash" appStopProp title="{{'pendingDeletion' | i18n}}"
                                         aria-hidden="true"></i>
                                     <span class="sr-only">{{'pendingDeletion' | i18n}}</span>
diff --git a/src/scss/list.scss b/src/scss/list.scss
index dc9149a963..5a50dd7ad5 100644
--- a/src/scss/list.scss
+++ b/src/scss/list.scss
@@ -120,16 +120,6 @@
                 @include themify($themes) {
                     color: themed('mutedColor');
                 }
-
-                .text-badge {
-                    padding-left: 2px;
-                    margin-right: 3px;
-                    font-size: $font-size-small;
-                    border-radius: 3px;
-                    @include themify($themes) {
-                        background-color: themed('mutedColorBackground');
-                    }
-                }
             }
         }
 
diff --git a/src/scss/variables.scss b/src/scss/variables.scss
index 7a005eccea..98ab045672 100644
--- a/src/scss/variables.scss
+++ b/src/scss/variables.scss
@@ -66,7 +66,6 @@ $themes: (
         headingButtonHoverColor: $gray-light,
         labelColor: $gray-light,
         mutedColor: $text-muted,
-        mutedColorBackground: lighten($text-muted, 35%),
         totpStrokeColor: $brand-primary,
         boxRowButtonColor: $brand-primary,
         boxRowButtonHoverColor: darken($brand-primary, 10%),
@@ -118,7 +117,6 @@ $themes: (
         headingButtonHoverColor: #ffffff,
         labelColor: #a3a3a3,
         mutedColor: #a3a3a3,
-        mutedColorBackground: darken(#a3a3a3, 35%),
         totpStrokeColor: #cacaca,
         boxRowButtonColor: #cacaca,
         boxRowButtonHoverColor: #ffffff,
@@ -170,7 +168,6 @@ $themes: (
         headingButtonHoverColor: $nord6,
         labelColor: $nord4,
         mutedColor: $nord4,
-        mutedColorBackground: darken($nord4, 35%),
         totpStrokeColor: $nord4,
         boxRowButtonColor: $nord4,
         boxRowButtonHoverColor: $nord6,