diff --git a/src/main/resources/templates/charts/chartFunctions.ftl b/src/main/resources/templates/charts/chartFunctions.ftl
index 4e027ab28dff969d4c5ca5de7d1930ebbd30aad9..691a80b10b817f7f04a02a6c528d91bb293d90c3 100644
--- a/src/main/resources/templates/charts/chartFunctions.ftl
+++ b/src/main/resources/templates/charts/chartFunctions.ftl
@@ -1,3 +1,5 @@
+<#import "/spring.ftl" as s>
+
 <#function getChartName chart>
     <#if chart?? && chart.getName()??>
         <#if chart.getType().name() == "DEFAULT">
@@ -21,4 +23,36 @@
             </table>
         </div>
     </div>
+</#macro>
+
+<#macro buttonNew>
+    <a href="<@s.url '/charts/newChart'/>" class="waves-effect waves-light btn budgetmaster-blue"><i class="material-icons left">add</i>${locale.getString("title.chart.new")}</a>
+</#macro>
+
+<#macro buttonShow>
+    <a href="<@s.url '/charts/manage'/>" class="waves-effect waves-light btn budgetmaster-blue"><i class="material-icons left">edit</i>${locale.getString("home.menu.charts.action.manage")}</a>
+</#macro>
+
+<#macro buttons>
+    <div class="row hide-on-small-only valign-wrapper">
+        <div class="col s6 right-align">
+            <@buttonNew/>
+        </div>
+        <div class="col s6 left-align">
+            <@buttonShow/>
+        </div>
+    </div>
+
+    <div class="hide-on-med-and-up center-align">
+        <div class="row center-align">
+            <div class="row center-align">
+                <div class="col s12">
+                    <@buttonShow/>
+                </div>
+            </div>
+            <div class="col s12">
+                <@buttonNew/>
+            </div>
+        </div>
+    </div>
 </#macro>
\ No newline at end of file
diff --git a/src/main/resources/templates/charts/manage.ftl b/src/main/resources/templates/charts/manage.ftl
index a446156c4da39445089a09b5c6266af1c81fa03d..cb491756f94dce75a2280e8fbb79b5ce74d03a00 100644
--- a/src/main/resources/templates/charts/manage.ftl
+++ b/src/main/resources/templates/charts/manage.ftl
@@ -18,7 +18,7 @@
                     </div>
                 </div>
                 <br>
-                <div class="center-align"><a href="<@s.url '/charts/newChart'/>" class="waves-effect waves-light btn budgetmaster-blue"><i class="material-icons left">add</i>${locale.getString("title.chart.new")}</a></div>
+                <@chartFunctions.buttons/>
                 <br>
                 <div class="container">
                     <table class="bordered">