diff --git a/app/assets/javascripts/app/views/layout_ref/content.jst.eco b/app/assets/javascripts/app/views/layout_ref/content.jst.eco
index 7696f7c28..4cdc1a5de 100644
--- a/app/assets/javascripts/app/views/layout_ref/content.jst.eco
+++ b/app/assets/javascripts/app/views/layout_ref/content.jst.eco
@@ -81,7 +81,7 @@
 
             <div class="dropdown-toggle u-positionOrigin" data-toggle="dropdown">
               <input id="customer_id_autocompletion2" name="customer_id_autocompletion" class="ui-autocomplete-input form-control" autocapitalize="off" placeholder="Enter Person or Organization/Company" autocomplete="off" role="textbox" aria-autocomplete="list" aria-haspopup="true">
-              <svg class="arrow arrow--right"><use xlink:href="#icon-arrow-right" /></svg>
+              <svg class="icon-arrow-down"><use xlink:href="#icon-arrow-down" /></svg>
             </div>
 
             <div class="dropdown-menu" aria-labelledby="customer_id">
@@ -95,7 +95,7 @@
                     Albrecht &amp; Bertschler GmbH
                     <span class="recipientList-detail">- 4 Personen</span>
                   </div>
-                  <svg class="recipientList-arrow"><use xlink:href="#icon-arrow-right" /></svg>
+                  <svg class="icon-arrow-right recipientList-arrow"><use xlink:href="#icon-arrow-right" /></svg>
                     <li class="recipientList-entry js-organization" data-organization-id="BENCHMARKhumanresources">
                   <div class="recipientList-iconSpacer">
                     <svg class="recipientList-icon"><use xlink:href="#icon-organization" /></svg>
@@ -104,7 +104,7 @@
                     BENCHMARK human resources
                     <span class="recipientList-detail">- 2 Personen</span>
                   </div>
-                  <svg class="recipientList-arrow"><use xlink:href="#icon-arrow-right" /></svg>
+                  <svg class="icon-arrow-right recipientList-arrow"><use xlink:href="#icon-arrow-right" /></svg>
 
                 <li class="recipientList-entry">
                   <div class="recipientList-iconSpacer">
@@ -150,7 +150,7 @@
                     Support Team Berlin
                     <span class="recipientList-detail">- 5 Personen</span>
                   </div>
-                  <svg class="recipientList-arrow"><use xlink:href="#icon-arrow-right" /></svg>
+                  <svg class="icon-arrow-right recipientList-arrow"><use xlink:href="#icon-arrow-right" /></svg>
 
                 <li class="recipientList-entry js-organization">
                   <div class="recipientList-iconSpacer">
@@ -160,7 +160,7 @@
                     Bernecker + Rainer Industrie-Elektronik Ges.m.b.H.
                     <span class="recipientList-detail">- 3 Personen</span>
                   </div>
-                  <svg class="recipientList-arrow"><use xlink:href="#icon-arrow-right" /></svg>
+                  <svg class="icon-arrow-right recipientList-arrow"><use xlink:href="#icon-arrow-right" /></svg>
 
                 <li class="recipientList-entry js-organization">
                   <div class="recipientList-iconSpacer">
@@ -170,7 +170,7 @@
                     Bertsch Ecopower GmbH
                     <span class="recipientList-detail">- 1 Person</span>
                   </div>
-                  <svg class="recipientList-arrow"><use xlink:href="#icon-arrow-right" /></svg>
+                  <svg class="icon-arrow-right recipientList-arrow"><use xlink:href="#icon-arrow-right" /></svg>
 
                 <li class="recipientList-entry recipientList--new u-clickable horizontal center">
                   <div class="recipientList-iconSpacer">
@@ -184,7 +184,7 @@
               <ul class="recipientList-organizationMembers hide" id="AlbrechtBertschlerGmbG">
                 <li class="recipientList-controls js-back">
                   <div class="btn btn--action btn--onDark">
-                    <svg class="icon arrow arrow--left"><use xlink:href="#icon-arrow-left" /></svg>
+                    <svg class="icon-arrow-left"><use xlink:href="#icon-arrow-left" /></svg>
                     <span class="btn-label"><%- @T('Back') %></span>
                   </div>
 
@@ -228,7 +228,7 @@
               <ul class="recipientList-organizationMembers hide" id="BENCHMARKhumanresources">
                 <li class="recipientList-controls js-back">
                   <div class="btn btn--action btn--onDark">
-                    <svg class="icon arrow arrow--left"><use xlink:href="#icon-arrow-left" /></svg>
+                    <svg class="icon-arrow-left"><use xlink:href="#icon-arrow-left" /></svg>
                     <span class="btn-label"><%- @T('Back') %></span>
                   </div>
 
diff --git a/app/assets/javascripts/app/views/layout_ref/error.jst.eco b/app/assets/javascripts/app/views/layout_ref/error.jst.eco
index 2e964ccdd..ee8505fa4 100644
--- a/app/assets/javascripts/app/views/layout_ref/error.jst.eco
+++ b/app/assets/javascripts/app/views/layout_ref/error.jst.eco
@@ -1,4 +1,4 @@
 <div class="fullscreenMessage">
-  <svg class="icon icon-error"><use xlink:href="#icon-diagonal-cross" /></svg>
+  <svg class="icon-error icon-diagonal-cross"><use xlink:href="#icon-diagonal-cross" /></svg>
   <h2><%- @T('Status Code') %>: 1234. Check your internet connection...</h2>
 </div>
\ No newline at end of file
diff --git a/app/assets/javascripts/app/views/layout_ref/insufficient_rights.jst.eco b/app/assets/javascripts/app/views/layout_ref/insufficient_rights.jst.eco
index 25e7ae801..5eb890d81 100644
--- a/app/assets/javascripts/app/views/layout_ref/insufficient_rights.jst.eco
+++ b/app/assets/javascripts/app/views/layout_ref/insufficient_rights.jst.eco
@@ -1,4 +1,4 @@
 <div class="flex fullscreenMessage">
-  <svg class="icon icon-diagonal-cross"><use xlink:href="#icon-diagonal-cross" /></svg>
+  <svg class="icon-error icon-diagonal-cross"><use xlink:href="#icon-diagonal-cross" /></svg>
   <h2>Opps.. I'm sorry, but you have insufficient rights to open this ticket.</h2>
 </div>
\ No newline at end of file
diff --git a/app/assets/stylesheets/zammad.css.scss b/app/assets/stylesheets/zammad.css.scss
index f5e3ec679..c3a8c98cd 100644
--- a/app/assets/stylesheets/zammad.css.scss
+++ b/app/assets/stylesheets/zammad.css.scss
@@ -307,11 +307,14 @@ span[data-tooltip]:hover:before {
     }
   }
 
+  // used in .recipientList-controls
   &.btn--onDark {
     background: none;
+    color: white;
     
-    .icon {
-      fill: white;
+    svg {
+      fill: currentColor;
+      opacity: 1;
     }
   }
 
@@ -413,7 +416,7 @@ span[data-tooltip]:hover:before {
 }
 
 .btn-label {
-  margin-left: 4px;
+  margin-left: 7px;
 }
 
 .visibility-change {
@@ -643,19 +646,18 @@ table {
 
 h1, h2, h3, h4, h5, h6 {
   font-weight: normal;
+  color: hsl(202,8%,28%);
 }
 
 h1 {
   font-size: 23px;
   line-height: 29px;
-  color: rgba(0,8,14,.73);
 }
 
 h2,
 h2.popover-title {
   font-size: 19px;
   line-height: 25px;
-  color: rgba(0,8,14,.73);
 }
 
 h3 {
@@ -898,7 +900,7 @@ textarea,
   justify-content: center;
   flex: 1;
 
-  .icon {
+  svg {
     margin-right: 14px;
   }
 
@@ -2963,7 +2965,7 @@ footer {
       width: 11px;
       height: 11px;
       background: white;
-      border: 1px solid hsl(240,4%,66%);
+      border: 1px solid hsl(240,4%,95%);
       box-shadow: 0 0 1px rgba(0,0,0,.06) inset;
       transform: rotate(-45deg);
     }
@@ -3297,7 +3299,7 @@ footer {
       min-height: 38px;
     }
 
-    .ticket-edit .bubble-arrow:after {
+    .article-new .bubble-arrow:after {
       border-color: #b3b3b3;
       box-shadow: none;
     }
@@ -3566,6 +3568,7 @@ footer {
 .alert {
   padding: 10px 15px;
   border-radius: 3px;
+  color: hsl(202,5%,18%);
   
   &.alert--info {
     border-color: hsl(188,50%,72%);
@@ -4122,7 +4125,6 @@ footer {
   .recipientList-name {
     color: white;
     margin-left: 10px;
-    margin-top: 2px;
     flex: 1;
     @extend .u-textTruncate;
   }
@@ -4155,7 +4157,7 @@ footer {
   .recipientList-controls,
   .recipientList-controls:hover {
     @extend .u-clickable;
-    padding: 5px 10px !important;
+    padding: 0 10px !important;
     background: hsl(206,7%,28%) !important;
   }