diff --git a/src/main/resources/templates/accounts/accounts.ftl b/src/main/resources/templates/accounts/accounts.ftl
index 9eae615473a72cd0539834b721cd4eddf238661a..604721dd34ce44c5df805a790a12cec903e4a351 100644
--- a/src/main/resources/templates/accounts/accounts.ftl
+++ b/src/main/resources/templates/accounts/accounts.ftl
@@ -17,7 +17,7 @@
                     </div>
                 </div>
                 <br>
-                <div class="center-align"><a href="<@s.url '/accounts/newAccount'/>" id="button-new-account" class="waves-effect waves-light btn background-blue"><i class="material-icons left">add</i>${locale.getString("title.account.new")}</a></div>
+                <div class="center-align"><@header.buttonLink url='/accounts/newAccount' icon='add' localizationKey='title.account.new' id='button-new-account'/></div>
                 <br>
                 <div class="container account-container">
                     <table class="bordered">
diff --git a/src/main/resources/templates/accounts/newAccount.ftl b/src/main/resources/templates/accounts/newAccount.ftl
index 3b64c0b298ce7e650b5f058fc3dac19e88e3f815..4ad99ca1534c5d098b6bab59651b7518c79e4e4e 100644
--- a/src/main/resources/templates/accounts/newAccount.ftl
+++ b/src/main/resources/templates/accounts/newAccount.ftl
@@ -45,26 +45,22 @@
                         <#-- buttons -->
                         <div class="row hide-on-small-only">
                             <div class="col s6 right-align">
-                                <a href="<@s.url '/accounts'/>" class="waves-effect waves-light btn background-blue"><i class="material-icons left">clear</i>${locale.getString("cancel")}</a>
+                                <@header.buttonLink url='/accounts' icon='clear' localizationKey='cancel'/>
                             </div>
 
                             <div class="col s6 left-align">
-                                <button id="button-save-account" class="btn waves-effect waves-light background-blue" type="submit" name="action">
-                                    <i class="material-icons left">save</i>${locale.getString("save")}
-                                </button>
+                                <@header.buttonSubmit name='action' icon='save' localizationKey='save' id='button-save-account'/>
                             </div>
                         </div>
                         <div class="hide-on-med-and-up">
                             <div class="row center-align">
                                 <div class="col s12">
-                                    <a href="<@s.url '/accounts'/>" class="waves-effect waves-light btn background-blue"><i class="material-icons left">clear</i>${locale.getString("cancel")}</a>
+                                    <@header.buttonLink url='/accounts' icon='clear' localizationKey='cancel'/>
                                 </div>
                             </div>
                             <div class="row center-align">
                                 <div class="col s12">
-                                    <button id="button-save-account" class="btn waves-effect waves-light background-blue" type="submit" name="buttonSave">
-                                        <i class="material-icons left">save</i>${locale.getString("save")}
-                                    </button>
+                                    <@header.buttonSubmit name='action' icon='save' localizationKey='save' id='button-save-account'/>
                                 </div>
                             </div>
                         </div>