diff --git a/app/assets/images/sprite.svg b/app/assets/images/sprite.svg
index c5ead504e..885b2d569 100644
--- a/app/assets/images/sprite.svg
+++ b/app/assets/images/sprite.svg
@@ -9,6 +9,7 @@
         <path d="M41.9411437,311.857905 C41.8674423,311.340726 41.6070309,311.090217 41.0980002,311.034661 C40.9142382,311.015469 40.7285108,311.001327 40.5437661,311.001327 C35.1851864,310.999307 29.8266068,310.999307 24.4670445,311.003347 C24.219408,311.003347 23.969806,311.034661 23.7241349,311.077086 C23.3408878,311.139713 23.1237145,311.395272 23.0618054,311.781136 C23.0244634,312.013463 23.0028443,312.25286 23.0028443,312.489227 C22.9989136,316.132713 22.9998963,319.77721 23.0008789,323.420696 C23.0008789,323.524738 23.0028443,323.62979 23.0087404,323.733832 C23.0559093,324.546975 23.3389225,324.842939 24.1329317,324.858091 C25.1873524,324.877283 26.1995176,324.874252 27.2539383,324.880313 C27.476025,324.882333 27.9133197,324.880313 27.9133197,324.880313 L27.9133197,325.233854 C27.9133197,326.575287 27.9545925,327.91571 27.9585232,329.259164 C27.9595059,329.515733 27.9044755,329.830889 28.2061598,329.964224 C28.5009652,330.094529 28.694554,329.83998 28.8812641,329.66422 C30.5174341,328.133895 32.1565522,326.60559 33.7858434,325.068195 C33.9352115,324.927789 34.0855623,324.877283 34.2830819,324.878293 C36.2828452,324.882333 38.2826086,324.882333 40.2804066,324.880313 C40.5309911,324.880313 40.7825584,324.870212 41.0311777,324.846979 C41.6237365,324.794453 41.8733384,324.553036 41.958832,323.951007 C41.9843818,323.764136 41.9981394,323.572214 41.9981394,323.383322 C42.0001048,319.797412 42.0010874,316.210492 41.9981394,312.622562 C41.996174,312.369023 41.9765203,312.110434 41.9411437,311.857905 L41.9411437,311.857905 L41.9411437,311.857905 Z M26.9975446,315 C26.446616,315 26,315.443865 26,316 C26,316.552285 26.4463114,317 26.9975446,317 L34.0024554,317 C34.553384,317 35,316.556135 35,316 C35,315.447715 34.5536886,315 34.0024554,315 L26.9975446,315 L26.9975446,315 Z M27.0006529,319 C26.4480076,319 26,319.443865 26,320 C26,320.552285 26.4484532,321 27.0006529,321 L38.027347,321 C38.5799924,321 39.028,320.556135 39.028,320 C39.028,319.447715 38.5795467,319 38.027347,319 L27.0006529,319 L27.0006529,319 Z" id="dark-message" fill="#586066" sketch:type="MSShapeGroup"></path>
         <path d="M4.63842857,316.446435 C6.0955925,316.446435 7.27685714,315.227209 7.27685714,313.723217 C7.27685714,312.219226 6.0955925,311 4.63842857,311 C3.18126464,311 2,312.219226 2,313.723217 C2,315.227209 3.18126464,316.446435 4.63842857,316.446435 L4.63842857,316.446435 L4.63842857,316.446435 Z M11.6386813,316.446957 C13.0959848,316.446957 14.2773626,315.227614 14.2773626,313.723478 C14.2773626,312.219343 13.0959848,311 11.6386813,311 C10.1813778,311 9,312.219343 9,313.723478 C9,315.227614 10.1813778,316.446957 11.6386813,316.446957 L11.6386813,316.446957 L11.6386813,316.446957 Z M17.6386813,316.446957 C19.0959848,316.446957 20.2773626,315.227614 20.2773626,313.723478 C20.2773626,312.219343 19.0959848,311 17.6386813,311 C16.1813778,311 15,312.219343 15,313.723478 C15,315.227614 16.1813778,316.446957 17.6386813,316.446957 L17.6386813,316.446957 L17.6386813,316.446957 Z M15.2232198,317.311217 L7.69893407,317.311217 C7.05594505,317.311217 6.53478022,317.84913 6.53478022,318.512261 L6.53478022,325.378348 C6.53478022,326.042261 7.05594505,326.579391 7.69893407,326.579391 L8.05707692,326.579391 L8.05707692,335.070696 L14.7278352,335.070696 L14.7278352,326.579391 L15.2232198,326.579391 C15.8662088,326.579391 16.3868681,326.042 16.3868681,325.378348 L16.3868681,318.512261 C16.3866154,317.849391 15.8662088,317.311217 15.2232198,317.311217 L15.2232198,317.311217 L15.2232198,317.311217 Z M4.89343956,325.378609 L4.89343956,318.512522 C4.89343956,318.083131 4.99024176,317.678783 5.15326374,317.311479 L1.26752747,317.311479 C0.625043956,317.311479 0.103879121,317.849392 0.103879121,318.512522 L0.103879121,325.378609 C0.103879121,326.042522 0.625043956,326.579653 1.26752747,326.579653 L1.62592308,326.579653 L1.62592308,335.070957 L6.41523077,335.070957 L6.41523077,327.953392 C5.51216484,327.472348 4.89343956,326.498522 4.89343956,325.378609 L4.89343956,325.378609 L4.89343956,325.378609 Z M21.7572418,317.311218 L17.7691429,317.311218 C17.9321648,317.678522 18.0292198,318.083131 18.0292198,318.512261 L18.0292198,325.378348 C18.0292198,326.554348 17.3468022,327.567566 16.3696813,328.020957 L16.3696813,335.070696 L21.2623626,335.070696 L21.2623626,326.579392 L21.756989,326.579392 C22.3997253,326.579392 22.9211429,326.042 22.9211429,325.378348 L22.9211429,318.512261 C22.9213956,317.849392 22.3997253,317.311218 21.7572418,317.311218 L21.7572418,317.311218 L21.7572418,317.311218 Z" id="dark-group" fill="#586066" sketch:type="MSShapeGroup"></path>
         <path d="M47.6386813,316.446957 C49.0959848,316.446957 50.2773626,315.227614 50.2773626,313.723478 C50.2773626,312.219343 49.0959848,311 47.6386813,311 C46.1813778,311 45,312.219343 45,313.723478 C45,315.227614 46.1813778,316.446957 47.6386813,316.446957 L47.6386813,316.446957 L47.6386813,316.446957 Z M51.2232198,317.311217 L43.6989341,317.311217 C43.0559451,317.311217 42.5347802,317.84913 42.5347802,318.512261 L42.5347802,325.378348 C42.5347802,326.042261 43.0559451,326.579391 43.6989341,326.579391 L44.0570769,326.579391 L44.0570769,335.070696 L50.7278352,335.070696 L50.7278352,326.579391 L51.2232198,326.579391 C51.8662088,326.579391 52.3868681,326.042 52.3868681,325.378348 L52.3868681,318.512261 C52.3866154,317.849391 51.8662088,317.311217 51.2232198,317.311217 L51.2232198,317.311217 L51.2232198,317.311217 Z" id="dark-person" fill="#586066" sketch:type="MSShapeGroup"></path>
+        <path d="M53.9947712,311 C53.4453742,311 53,311.439458 53,312.002462 L53,331.997538 C53,332.551183 53.4509254,333 53.9947712,333 L71.0052288,333 C71.5546258,333 72,332.560542 72,331.997538 L72,312.002462 C72,311.448817 71.5490746,311 71.0052288,311 L53.9947712,311 Z M56.9975446,315 C56.446616,315 56,315.443865 56,316 C56,316.552285 56.4463114,317 56.9975446,317 L64.0024554,317 C64.553384,317 65,316.556135 65,316 C65,315.447715 64.5536886,315 64.0024554,315 L56.9975446,315 Z M57.0006529,319 C56.4480076,319 56,319.443865 56,320 C56,320.552285 56.4484532,321 57.0006529,321 L68.027347,321 C68.5799924,321 69.028,320.556135 69.028,320 C69.028,319.447715 68.5795467,319 68.027347,319 L57.0006529,319 Z M57.0006529,323 C56.4480076,323 56,323.443865 56,324 C56,324.552285 56.4484532,325 57.0006529,325 L68.027347,325 C68.5799924,325 69.028,324.556135 69.028,324 C69.028,323.447715 68.5795467,323 68.027347,323 L57.0006529,323 Z M57.0006529,327 C56.4480076,327 56,327.443865 56,328 C56,328.552285 56.4484532,329 57.0006529,329 L68.027347,329 C68.5799924,329 69.028,328.556135 69.028,328 C69.028,327.447715 68.5795467,327 68.027347,327 L57.0006529,327 Z" id="dark-templates" fill="#586066" sketch:type="MSShapeGroup"></path>
         <path d="M92.9411437,4.85790489 C92.8674423,4.34072579 92.6070309,4.09021716 92.0980002,4.03466081 C91.9142382,4.01546861 91.7285108,4.001327 91.5437661,4.001327 C86.1851864,3.99930677 80.8266068,3.99930677 75.4670445,4.00334723 C75.219408,4.00334723 74.969806,4.03466081 74.7241349,4.07708566 C74.3408878,4.13971281 74.1237145,4.39527202 74.0618054,4.78113612 C74.0244634,5.01346267 74.0028443,5.25286003 74.0028443,5.48922704 C73.9989136,9.13271344 73.9998963,12.7772099 74.0008789,16.4206963 C74.0008789,16.5247382 74.0028443,16.6297902 74.0087404,16.7338321 C74.0559093,17.5469751 74.3389225,17.8429389 75.1329317,17.8580906 C76.1873524,17.8772828 77.1995176,17.8742525 78.2539383,17.8803131 C78.476025,17.8823334 78.9133197,17.8803131 78.9133197,17.8803131 L78.9133197,18.2338536 C78.9133197,19.5752869 78.9545925,20.91571 78.9585232,22.2591636 C78.9595059,22.5157329 78.9044755,22.8308889 79.2061598,22.9642242 C79.5009652,23.0945291 79.694554,22.83998 79.8812641,22.6642199 C81.5174341,21.133895 83.1565522,19.6055903 84.7858434,18.0681946 C84.9352115,17.9277886 85.0855623,17.8772828 85.2830819,17.8782929 C87.2828452,17.8823334 89.2826086,17.8823334 91.2804066,17.8803131 C91.5309911,17.8803131 91.7825584,17.870212 92.0311777,17.8469793 C92.6237365,17.7944533 92.8733384,17.5530357 92.958832,16.9510069 C92.9843818,16.7641356 92.9981394,16.5722137 92.9981394,16.3833221 C93.0001048,12.7974122 93.0010874,9.21049233 92.9981394,5.62256228 C92.996174,5.3690233 92.9765203,5.11043375 92.9411437,4.85790489 L92.9411437,4.85790489 L92.9411437,4.85790489 Z M77.9975446,8 C77.446616,8 77,8.44386482 77,9 C77,9.55228475 77.4463114,10 77.9975446,10 L85.0024554,10 C85.553384,10 86,9.55613518 86,9 C86,8.44771525 85.5536886,8 85.0024554,8 L77.9975446,8 L77.9975446,8 Z M78.0006529,12 C77.4480076,12 77,12.4438648 77,13 C77,13.5522847 77.4484532,14 78.0006529,14 L89.027347,14 C89.5799924,14 90.028,13.5561352 90.028,13 C90.028,12.4477153 89.5795467,12 89.027347,12 L78.0006529,12 L78.0006529,12 Z" id="Message" fill="#F0FAFF" sketch:type="MSShapeGroup"></path>
         <path d="M5.92009147,43.374 C3.47609147,43.358 1.50109147,41.359 1.51609147,38.916 C1.53409147,36.491 3.51809147,34.516 5.94709147,34.516 L5.97609147,34.516 C7.15809147,34.523 8.26709147,34.992 9.09709147,35.834 C9.92809147,36.674 10.3820915,37.791 10.3750915,38.974 C10.3650915,40.15 9.90309147,41.258 9.06709147,42.087 C8.23309147,42.917 7.12309147,43.374 5.94909147,43.374 L5.92009147,43.374 M5.98309147,33 L5.94509147,33 C2.68109147,33 0.0220914661,35.636 9.14660647e-05,38.907 C-0.0179085339,42.191 2.62309147,44.869 5.90709147,44.89 L5.94909147,44.89 C7.03809147,44.89 8.06209147,44.596 8.94009147,44.08 L12.5530915,47.695 L12.6450915,47.783 C12.7820915,47.92 12.9600915,47.988 13.1390915,47.988 C13.3180915,47.988 13.4970915,47.92 13.6330915,47.783 L14.7970915,46.622 C15.0690915,46.348 15.0690915,45.905 14.7970915,45.633 L14.7060915,45.54 L11.0880915,41.924 C11.5930915,41.058 11.8830915,40.056 11.8900915,38.983 C11.9140915,35.699 9.26709147,33.022 5.98309147,33" id="Search" fill-opacity="0.5" fill="#ECECEC" sketch:type="MSShapeGroup"></path>
         <path d="M20,67.09 L20,64.814 L19.678,64.709 L17.242,63.914 L16.592,62.344 L17.842,59.701 L16.232,58.09 L15.93,58.246 L13.644,59.405 L12.076,58.755 L11.09,56 L8.814,56 L7.914,58.758 L6.344,59.408 L3.699,58.16 L2.09,59.768 L2.244,60.072 L3.402,62.356 L2.754,63.925 L0,64.911 L0,67.187 L0.32,67.291 L2.758,68.088 L3.408,69.656 L2.158,72.301 L3.768,73.911 L4.068,73.757 L6.353,72.597 L7.924,73.248 L8.91,76 L11.186,76 L11.291,75.68 L12.086,73.244 L13.654,72.594 L16.299,73.842 L17.908,72.234 L17.756,71.932 L16.596,69.648 L17.246,68.078 L20,67.09 L20,67.09 Z M10,69.188 C8.24,69.188 6.812,67.762 6.812,66 C6.812,64.24 8.24,62.815 10,62.815 C11.76,62.815 13.185,64.24 13.185,66 C13.185,67.762 11.76,69.188 10,69.188 L10,69.188 L10,69.188 Z" id="cog" fill="#4D4D4D" sketch:type="MSShapeGroup"></path>
diff --git a/app/assets/stylesheets/zammad.css.scss b/app/assets/stylesheets/zammad.css.scss
index e62a9a780..acacc62ff 100644
--- a/app/assets/stylesheets/zammad.css.scss
+++ b/app/assets/stylesheets/zammad.css.scss
@@ -1300,6 +1300,12 @@ ol.tabs li {
     background-position: -42px -311px;
   }
 
+  .dark.templates.icon {
+    width: 19px;
+    height: 22px;
+    background-position: -53px -311px;
+  }
+
   .split.action.icon {
     width: 18px;
     height: 15px;