diff --git a/app/assets/javascripts/app/controllers/widget/ticket_stats.coffee b/app/assets/javascripts/app/controllers/widget/ticket_stats.coffee
index edb36c1c3..7ec299050 100644
--- a/app/assets/javascripts/app/controllers/widget/ticket_stats.coffee
+++ b/app/assets/javascripts/app/controllers/widget/ticket_stats.coffee
@@ -69,7 +69,7 @@ class App.TicketStats extends App.Controller
     limit = 5
     iconClass = ''
     if data.user_tickets_open_ids.length is 0 && data.user_tickets_closed_ids.length > 0
-      iconClass = 'mood icon supergood-state'
+      iconClass = 'mood icon supergood-color'
     new TicketStatsList(
       el:         @$('.js-user-open-tickets')
       user:       @user
@@ -93,7 +93,7 @@ class App.TicketStats extends App.Controller
 
     iconClass = ''
     if data.org_tickets_open_ids.length is 0 && data.org_tickets_closed_ids.length > 0
-      iconClass = 'mood icon supergood-state'
+      iconClass = 'mood icon supergood-color'
     new TicketStatsList(
       el:         @$('.js-org-open-tickets')
       user:       @user
diff --git a/app/assets/javascripts/app/views/dashboard/stats.jst.eco b/app/assets/javascripts/app/views/dashboard/stats.jst.eco
index 8f652103e..0f3d087dc 100644
--- a/app/assets/javascripts/app/views/dashboard/stats.jst.eco
+++ b/app/assets/javascripts/app/views/dashboard/stats.jst.eco
@@ -46,7 +46,7 @@
       <div class="stat-tickets vertical reverse end">
         <% stack_counter = parseInt(@StatsTicketLoadMeasure.percent*0.16) %>
         <% for count in [1..stack_counter]: %>
-          <%- @Icon('one-ticket', "one-ticket state-color #{@StatsTicketLoadMeasure.state}-state") %>
+          <%- @Icon('one-ticket', "one-ticket #{@StatsTicketLoadMeasure.state}-color") %>
         <% end %>
       </div>
       <%- @Icon('total-tickets', 'total-tickets') %>
@@ -59,7 +59,7 @@
   <div class="in-process stat-widget vertical">
     <div class="stat-title"><%- @T('Your Tickets in process') %></div>
     <div class="stat-graphic">
-      <%- @Icon('in-process', "in-process-icon state-color #{@StatsTicketInProcess.state}-state") %>
+      <%- @Icon('in-process', "in-process-icon #{@StatsTicketInProcess.state}-color") %>
     </div>
     <div class="stat-label" title="<%- @T('%s of your Tickets are currently in process.', @StatsTicketInProcess.in_process) %>"><%- @T('%s% are currently in process', @StatsTicketInProcess.percent) %></div>
     <div class="stat-detail"><%- @T('Average: %s%', @StatsTicketInProcess.average_per_agent) %></div>
@@ -69,7 +69,7 @@
   <div class="reopening stat-widget vertical">
     <div class="stat-title"><%- @T('Reopening rate') %></div>
     <div class="stat-graphic">
-      <%- @Icon('reopening', "reopening-icon state-color #{@StatsTicketReopen.state}-state") %>
+      <%- @Icon('reopening', "reopening-icon #{@StatsTicketReopen.state}-color") %>
     </div>
     <div class="stat-label"><%- @T('%s% are being reopened', @StatsTicketReopen.percent) %></div>
     <div class="stat-detail"><%- @T('Average: %s%', @StatsTicketReopen.average_per_agent) %></div>
diff --git a/app/assets/javascripts/app/views/layout_ref/user_profile.jst.eco b/app/assets/javascripts/app/views/layout_ref/user_profile.jst.eco
index d2736f8f5..5f2de1eac 100644
--- a/app/assets/javascripts/app/views/layout_ref/user_profile.jst.eco
+++ b/app/assets/javascripts/app/views/layout_ref/user_profile.jst.eco
@@ -146,12 +146,12 @@
         <div class="stat-title">Status</div>
         <div class="stat-graphic">
           <div class="stat-tickets vertical reverse end">
-            <%- @Icon('one-ticket', 'one-ticket state-color supergood-state') %>
-            <%- @Icon('one-ticket', 'one-ticket state-color supergood-state') %>
-            <%- @Icon('one-ticket', 'one-ticket state-color supergood-state') %>
-            <%- @Icon('one-ticket', 'one-ticket state-color supergood-state') %>
-            <%- @Icon('one-ticket', 'one-ticket state-color supergood-state') %>
-            <%- @Icon('one-ticket', 'one-ticket state-color supergood-state') %>
+            <%- @Icon('one-ticket', 'one-ticket supergood-color') %>
+            <%- @Icon('one-ticket', 'one-ticket supergood-color') %>
+            <%- @Icon('one-ticket', 'one-ticket supergood-color') %>
+            <%- @Icon('one-ticket', 'one-ticket supergood-color') %>
+            <%- @Icon('one-ticket', 'one-ticket supergood-color') %>
+            <%- @Icon('one-ticket', 'one-ticket supergood-color') %>
           </div>
           <%- @Icon('total-tickets', 'total-tickets') %>
         </div>
diff --git a/app/assets/stylesheets/zammad.scss b/app/assets/stylesheets/zammad.scss
index 4b6b485f4..089ff7c9b 100644
--- a/app/assets/stylesheets/zammad.scss
+++ b/app/assets/stylesheets/zammad.scss
@@ -3498,13 +3498,11 @@ footer {
   height: 47px;
 }
 
-.state-color {
-  &.supergood-state { fill: $supergood-color;}
-  &.good-state      { fill: $good-color; }
-  &.ok-state        { fill: $ok-color; }
-  &.bad-state       { fill: $bad-color; }
-  &.superbad-state  { fill: $superbad-color; }
-}
+.supergood-color { fill: $supergood-color;}
+.good-color      { fill: $good-color; }
+.ok-color        { fill: $ok-color; }
+.bad-color       { fill: $bad-color; }
+.superbad-color  { fill: $superbad-color; }
 
 .stat-widgets {
   margin: 0 -7px 20px;