diff --git a/app/assets/javascripts/app/controllers/ticket_zoom/article_new.coffee b/app/assets/javascripts/app/controllers/ticket_zoom/article_new.coffee
index 73ef9913f..915a6a61a 100644
--- a/app/assets/javascripts/app/controllers/ticket_zoom/article_new.coffee
+++ b/app/assets/javascripts/app/controllers/ticket_zoom/article_new.coffee
@@ -330,11 +330,10 @@ class App.TicketZoomArticleNew extends App.Controller
     @el.find('.js-articleTypes').addClass('is-hidden')
 
   setArticleType: (type) ->
-    typeIcon = @$('.js-selectedType')
     @type = type
     @$('[name=type]').val(type)
     @articleNewEdit.attr('data-type', type)
-    typeIcon.find('use').attr 'xlink:href', "#icon-#{@type}"
+    @$('.js-selectableTypes').addClass('hide').filter("[data-type='#{ type }']").removeClass('hide')
 
     # show/hide attributes
     for articleType in @articleTypes
diff --git a/app/assets/javascripts/app/views/ticket_zoom/article_new.jst.eco b/app/assets/javascripts/app/views/ticket_zoom/article_new.jst.eco
index b8bdecf07..e380f4038 100644
--- a/app/assets/javascripts/app/views/ticket_zoom/article_new.jst.eco
+++ b/app/assets/javascripts/app/views/ticket_zoom/article_new.jst.eco
@@ -7,7 +7,11 @@
     <div class="js-avatar"></div>
     <div class="editControls-item is-hidden pop-select">
       <div class="editControls-iconHolder centered js-selectedArticleType">
-        <%- @Icon(@article.type, 'editControls-icon js-selectedType') %>
+        <% for articleType in @articleTypes: %>
+        <div class="editControls-icon js-selectableTypes<%- ' hide' if articleType.icon != @article.icon %>" data-type="<%- articleType.name %>">
+        <%- @Icon(articleType.icon) %>
+        </div>
+        <% end %>
       </div>
       <div class="pop-selector is-hidden js-articleTypes">
         <% for articleType in @articleTypes: %>
diff --git a/app/assets/stylesheets/zammad.scss b/app/assets/stylesheets/zammad.scss
index bcc156b7f..bbd98205c 100644
--- a/app/assets/stylesheets/zammad.scss
+++ b/app/assets/stylesheets/zammad.scss
@@ -3985,7 +3985,7 @@ footer {
     justify-content: center;
   }
 
-  .editControls-icon {
+  .editControls-icon .icon {
     width: 16px;
     height: 16px;
     fill: hsl(210,2%,78%);