diff --git a/app/assets/javascripts/app/views/generic/postmaster_match.jst.eco b/app/assets/javascripts/app/views/generic/postmaster_match.jst.eco
index 135590aab..9899921e5 100644
--- a/app/assets/javascripts/app/views/generic/postmaster_match.jst.eco
+++ b/app/assets/javascripts/app/views/generic/postmaster_match.jst.eco
@@ -16,10 +16,10 @@
     </div>
     <div class="filter-controls">
       <div class="filter-control filter-control-remove js-remove" title="<%- @T('Remote') %>">
-        <%- @Icon('minus') %>
+        <%- @Icon('minus-small') %>
       </div>
       <div class="filter-control filter-control-add js-add" title="<%- @T('Add') %>">
-        <%- @Icon('plus') %>
+        <%- @Icon('plus-small') %>
       </div>
     </div>
   </div>
diff --git a/app/assets/javascripts/app/views/generic/postmaster_set.jst.eco b/app/assets/javascripts/app/views/generic/postmaster_set.jst.eco
index a1b34b1fe..17e5c88e0 100644
--- a/app/assets/javascripts/app/views/generic/postmaster_set.jst.eco
+++ b/app/assets/javascripts/app/views/generic/postmaster_set.jst.eco
@@ -10,10 +10,10 @@
     </div>
     <div class="filter-controls">
       <div class="filter-control filter-control-remove js-remove" title="<%- @T('Remote') %>">
-        <%- @Icon('minus') %>
+        <%- @Icon('minus-small') %>
       </div>
       <div class="filter-control filter-control-add js-add" title="<%- @T('Add') %>">
-        <%- @Icon('plus') %>
+        <%- @Icon('plus-small') %>
       </div>
     </div>
   </div>
diff --git a/app/assets/javascripts/app/views/generic/ticket_perform_action.jst.eco b/app/assets/javascripts/app/views/generic/ticket_perform_action.jst.eco
index a1b34b1fe..17e5c88e0 100644
--- a/app/assets/javascripts/app/views/generic/ticket_perform_action.jst.eco
+++ b/app/assets/javascripts/app/views/generic/ticket_perform_action.jst.eco
@@ -10,10 +10,10 @@
     </div>
     <div class="filter-controls">
       <div class="filter-control filter-control-remove js-remove" title="<%- @T('Remote') %>">
-        <%- @Icon('minus') %>
+        <%- @Icon('minus-small') %>
       </div>
       <div class="filter-control filter-control-add js-add" title="<%- @T('Add') %>">
-        <%- @Icon('plus') %>
+        <%- @Icon('plus-small') %>
       </div>
     </div>
   </div>
diff --git a/app/assets/javascripts/app/views/generic/ticket_selector.jst.eco b/app/assets/javascripts/app/views/generic/ticket_selector.jst.eco
index 41ef82f4e..05d191c9a 100644
--- a/app/assets/javascripts/app/views/generic/ticket_selector.jst.eco
+++ b/app/assets/javascripts/app/views/generic/ticket_selector.jst.eco
@@ -16,10 +16,10 @@
     </div>
     <div class="filter-controls">
       <div class="filter-control filter-control-remove js-remove" title="<%- @T('Remote') %>">
-        <%- @Icon('minus') %>
+        <%- @Icon('minus-small') %>
       </div>
       <div class="filter-control filter-control-add js-add" title="<%- @T('Add') %>">
-        <%- @Icon('plus') %>
+        <%- @Icon('plus-small') %>
       </div>
     </div>
   </div>
diff --git a/app/assets/javascripts/app/views/layout_ref/scheduler_modal.jst.eco b/app/assets/javascripts/app/views/layout_ref/scheduler_modal.jst.eco
index 5c949756c..6e48092e8 100644
--- a/app/assets/javascripts/app/views/layout_ref/scheduler_modal.jst.eco
+++ b/app/assets/javascripts/app/views/layout_ref/scheduler_modal.jst.eco
@@ -47,10 +47,10 @@
     </div>
     <div class="filter-controls">
       <div class="filter-control filter-control-remove js-remove" title=<%- @T('Remote') %>>
-        <%- @Icon('minus') %>
+        <%- @Icon('minus-small') %>
       </div>
       <div class="filter-control filter-control-add js-add" title=<%- @T('Add') %>>
-        <%- @Icon('plus') %>
+        <%- @Icon('plus-small') %>
       </div>
     </div>
   </div>
@@ -107,10 +107,10 @@
     </div>
     <div class="filter-controls">
       <div class="filter-control filter-control-remove js-remove" title=<%- @T('Remote') %>>
-        <%- @Icon('minus') %>
+        <%- @Icon('minus-small') %>
       </div>
       <div class="filter-control filter-control-add js-add" title=<%- @T('Add') %>>
-        <%- @Icon('plus') %>
+        <%- @Icon('plus-small') %>
       </div>
     </div>
   </div>
@@ -165,10 +165,10 @@
     </div>
     <div class="filter-controls">
       <div class="filter-control filter-control-remove js-remove" title=<%- @T('Remote') %>>
-        <%- @Icon('minus') %>
+        <%- @Icon('minus-small') %>
       </div>
       <div class="filter-control filter-control-add js-add" title=<%- @T('Add') %>>
-        <%- @Icon('plus') %>
+        <%- @Icon('plus-small') %>
       </div>
     </div>
   </div>
@@ -228,10 +228,10 @@
     </div>
     <div class="filter-controls">
       <div class="filter-control filter-control-remove js-remove" title=<%- @T('Remote') %>>
-        <%- @Icon('minus') %>
+        <%- @Icon('minus-small') %>
       </div>
       <div class="filter-control filter-control-add js-add" title=<%- @T('Add') %>>
-        <%- @Icon('plus') %>
+        <%- @Icon('plus-small') %>
       </div>
     </div>
   </div>
@@ -302,10 +302,10 @@
     </div>
     <div class="filter-controls">
       <div class="filter-control filter-control-remove js-remove" title=<%- @T('Remote') %>>
-        <%- @Icon('minus') %>
+        <%- @Icon('minus-small') %>
       </div>
       <div class="filter-control filter-control-add js-add" title=<%- @T('Add') %>>
-        <%- @Icon('plus') %>
+        <%- @Icon('plus-small') %>
       </div>
     </div>
   </div>
@@ -418,10 +418,10 @@
     </div>
     <div class="filter-controls">
       <div class="filter-control filter-control-remove is-disabled js-remove" title=<%- @T('Remote') %>>
-        <%- @Icon('minus') %>
+        <%- @Icon('minus-small') %>
       </div>
       <div class="filter-control filter-control-add js-add" title=<%- @T('Add') %>>
-        <%- @Icon('plus') %>
+        <%- @Icon('plus-small') %>
       </div>
     </div>
   </div>
diff --git a/app/assets/javascripts/app/views/layout_ref/sla_modal.jst.eco b/app/assets/javascripts/app/views/layout_ref/sla_modal.jst.eco
index 4fdf58372..b12b1afe1 100644
--- a/app/assets/javascripts/app/views/layout_ref/sla_modal.jst.eco
+++ b/app/assets/javascripts/app/views/layout_ref/sla_modal.jst.eco
@@ -49,10 +49,10 @@
     </div>
     <div class="filter-controls">
       <div class="filter-control filter-control-remove js-remove is-disabled" title=<%- @T('Remote') %>>
-        <svg class="icon icon-minus"><use xlink:href="#icon-minus" /></svg>
+        <%- @Icon('minus-small') %>
       </div>
       <div class="filter-control filter-control-add js-add" title=<%- @T('Add') %>>
-        <svg class="icon icon-plus"><use xlink:href="#icon-plus" /></svg>
+        <%- @Icon('plus-small') %>
       </div>
     </div>
   </div>
diff --git a/app/assets/stylesheets/zammad.css.scss b/app/assets/stylesheets/zammad.css.scss
index 4426a2e77..be69bf043 100644
--- a/app/assets/stylesheets/zammad.css.scss
+++ b/app/assets/stylesheets/zammad.css.scss
@@ -5808,7 +5808,7 @@ output {
   justify-content: center;
   width: 30px;
   height: 30px;
-  border: 1px solid hsl(198,19%,86%);
+  box-shadow: 0 0 0 1px hsl(198,19%,86%) inset;
   border-radius: 100%;
   background: white;
   cursor: pointer;
@@ -5831,8 +5831,6 @@ output {
   }
   
   .icon {
-    width: 13px;
-    height: 13px;
     fill: hsl(0,0%,61%);
   }
 }