diff --git a/app/assets/javascripts/app/views/widget/template.jst.eco b/app/assets/javascripts/app/views/widget/template.jst.eco
index e2cbc561a..85fef91e7 100644
--- a/app/assets/javascripts/app/views/widget/template.jst.eco
+++ b/app/assets/javascripts/app/views/widget/template.jst.eco
@@ -4,8 +4,10 @@
       <label class="" for="template_name"><%- @T('Select Template') %></label>
       <div id="form-template"></div>
     </div>
-    <button type="submit" class="btn" data-type="template_delete"><%- @T('Delete') %></button>
-    <button type="submit" class="btn" data-type="template_select"><%- @T('Apply') %></button>
+    <div class="horizontal">
+      <button type="submit" class="btn btn--action" data-type="template_delete"><%- @T('Delete') %></button>
+      <button type="submit" class="btn btn--action align-right" data-type="template_select"><%- @T('Apply') %></button>
+    </div>
   </form>
   <hr>
   <form>
@@ -13,8 +15,10 @@
       <label class="" for="template_name"><%- @T('Save as template') %></label>
       <input type="text" name="template_name" id="template_name" class="form-control" value="<%= @template.name %>"/>
     </div>
-    <button type="submit" class="btn" data-type="template_save"><%- @T('Save') %></button>
-</form>
+    <div class="horizontal">
+      <button type="submit" class="btn btn--action align-right" data-type="template_save"><%- @T('Save') %></button>
+    </div>
+  </form>
 </div>
 
 <div class="templates-welcome">
diff --git a/app/assets/stylesheets/zammad.scss b/app/assets/stylesheets/zammad.scss
index f66d4c576..73acb3bd0 100644
--- a/app/assets/stylesheets/zammad.scss
+++ b/app/assets/stylesheets/zammad.scss
@@ -5879,6 +5879,10 @@ footer {
   padding-bottom: 14px;
 }
 
+.templates-manage fieldset {
+  margin: 0;
+}
+
 .template-attributes {
   margin: 17px 0 19px;
 }