diff --git a/app/assets/javascripts/app/views/layout_ref/local_modal.jst.eco b/app/assets/javascripts/app/views/layout_ref/local_modal.jst.eco
index c5f61a467..dfa2a6ac3 100644
--- a/app/assets/javascripts/app/views/layout_ref/local_modal.jst.eco
+++ b/app/assets/javascripts/app/views/layout_ref/local_modal.jst.eco
@@ -120,7 +120,7 @@
 
 
               </select>
-              <div class="select-arrow icon"></div>
+              <svg class="icon-arrow-down"><use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#icon-arrow-down"></use></svg>
             </div>
               
               
@@ -279,7 +279,7 @@
 
 
               </select>
-              <div class="select-arrow icon"></div>
+              <svg class="icon-arrow-down"><use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#icon-arrow-down"></use></svg>
             </div>
               
               
@@ -304,7 +304,7 @@
         <div class="dropdown-toggle" id="profileAction" data-toggle="dropdown">
           <svg class="dropdown-icon"><use xlink:href="#icon-cog" /></svg>
           <label>Aktion</label>
-          <span class="select-arrow icon"></span>
+          <svg class="icon-arrow-down"><use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#icon-arrow-down"></use></svg>
         </div>
         <ul class="dropdown-menu dropdown-menu-right" role="menu" aria-labelledby="profileAction">
           <li role="presentation"><a role="menuitem" tabindex="-1">Kontaktdaten bearbeiten</a>
diff --git a/app/assets/javascripts/app/views/layout_ref/organization_profile.jst.eco b/app/assets/javascripts/app/views/layout_ref/organization_profile.jst.eco
index 5767433c2..ffa22af0a 100644
--- a/app/assets/javascripts/app/views/layout_ref/organization_profile.jst.eco
+++ b/app/assets/javascripts/app/views/layout_ref/organization_profile.jst.eco
@@ -6,7 +6,7 @@
         <div class="dropdown-toggle" id="organizationProfile" data-toggle="dropdown">
           <svg class="dropdown-icon"><use xlink:href="#icon-cog" /></svg>
           <label>Aktion</label>
-          <span class="select-arrow icon"></span>
+          <svg class="icon-arrow-down"><use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#icon-arrow-down"></use></svg>
         </div>
         <ul class="dropdown-menu dropdown-menu-right" role="menu" aria-labelledby="organizationProfile">
           <li role="presentation"><a role="menuitem" tabindex="-1">Kontaktdaten bearbeiten</a>
@@ -87,7 +87,7 @@
                 <svg class="priority-icon"><use xlink:href="#icon-priority" /></svg>
               </div>
               <div class="flex">
-                <div class="name">Superb Service!</div>
+                <div class="name">Superb Service here_with_some_extrem_example_sting_witch_can_really_be!</div>
                 <div class="time">43 minutes ago</div>
               </div>
             <li class="task level-2">
diff --git a/app/assets/javascripts/app/views/layout_ref/setup.jst.eco b/app/assets/javascripts/app/views/layout_ref/setup.jst.eco
index 25a346dc5..e9df90a66 100644
--- a/app/assets/javascripts/app/views/layout_ref/setup.jst.eco
+++ b/app/assets/javascripts/app/views/layout_ref/setup.jst.eco
@@ -142,7 +142,7 @@
                 <option selected>IMAP</option>
                 <option>POP3</option>
               </select>
-              <div class="select-arrow icon"></div>
+              <svg class="icon-arrow-down"><use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#icon-arrow-down"></use></svg>
             </div>
           </div>
           <div class="form-group">
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 da49d2b35..cb00503e1 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
@@ -6,7 +6,7 @@
         <div class="dropdown-toggle" id="profileAction" data-toggle="dropdown">
           <svg class="dropdown-icon"><use xlink:href="#icon-cog" /></svg>
           <label>Aktion</label>
-          <span class="select-arrow icon"></span>
+          <svg class="icon-arrow-down"><use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#icon-arrow-down"></use></svg>
         </div>
         <ul class="dropdown-menu dropdown-menu-right" role="menu" aria-labelledby="profileAction">
           <li role="presentation"><a role="menuitem" tabindex="-1">Kontaktdaten bearbeiten</a>