diff --git a/themes/grav/templates/configuration.html.twig b/themes/grav/templates/configuration.html.twig
index 97847f01..9d067f65 100644
--- a/themes/grav/templates/configuration.html.twig
+++ b/themes/grav/templates/configuration.html.twig
@@ -2,6 +2,7 @@
 
 {% block titlebar %}
     <div class="button-bar">
+        <a class="button" href="{{ base_url }}"><i class="fa fa-reply"></i> Back</a>
         <button class="button" type="submit" name="task" value="save" form="blueprints"><i class="fa fa-check"></i> Save</button>
     </div>
     <h1><i class="fa fa-fw fa-th"></i> Configuration - System</h1>
diff --git a/themes/grav/templates/pages.html.twig b/themes/grav/templates/pages.html.twig
index aecc6bc1..5dcd3b38 100644
--- a/themes/grav/templates/pages.html.twig
+++ b/themes/grav/templates/pages.html.twig
@@ -75,6 +75,7 @@
 {% block titlebar %}
     <div class="button-bar">
         {% if mode == 'list' %}
+            <a class="button" href="{{ base_url }}"><i class="fa fa-reply"></i> Back</a>
             <a class="button" href="#modal" data-remodal-target="modal"><i class="fa fa-plus"></i> Add Page</a>
             <a class="button" href="#modular" data-remodal-target="modular"><i class="fa fa-plus"></i> Add Modular</a>
         {% elseif mode == 'edit' %}
diff --git a/themes/grav/templates/plugins.html.twig b/themes/grav/templates/plugins.html.twig
index fe3a7217..599e7038 100644
--- a/themes/grav/templates/plugins.html.twig
+++ b/themes/grav/templates/plugins.html.twig
@@ -18,8 +18,9 @@
     {% if not admin.route or installing %}
         <div class="button-bar">
         {% if (installing) %}
-            <a class="button" href="{{ base_url_relative }}/plugins"><i class="fa fa-reply"></i> Back to installed</a>
+            <a class="button" href="{{ base_url_relative }}/plugins"><i class="fa fa-reply"></i> Back</a>
         {% else %}
+            <a class="button" href="{{ base_url }}"><i class="fa fa-reply"></i> Back</a>
             <a class="button" href="{{ base_url_relative }}/plugins/install"><i class="fa fa-plus"></i> Add</a>
         {% endif %}
         </div>
diff --git a/themes/grav/templates/settings.html.twig b/themes/grav/templates/settings.html.twig
index 75c8920e..d82dfcaf 100644
--- a/themes/grav/templates/settings.html.twig
+++ b/themes/grav/templates/settings.html.twig
@@ -2,6 +2,7 @@
 
 {% block titlebar %}
     <div class="button-bar">
+        <a class="button" href="{{ base_url }}"><i class="fa fa-reply"></i> Back</a>
         <button class="button" type="submit" name="task" value="save" form="blueprints"><i class="fa fa-check"></i> Save</button>
     </div>
     <h1><i class="fa fa-fw fa-th"></i> Configuration - Site</h1>
diff --git a/themes/grav/templates/themes.html.twig b/themes/grav/templates/themes.html.twig
index 04895f16..1c3c4ad5 100644
--- a/themes/grav/templates/themes.html.twig
+++ b/themes/grav/templates/themes.html.twig
@@ -18,8 +18,9 @@
     {% if not admin.route or installing %}
         <div class="button-bar">
         {% if (installing) %}
-            <a class="button" href="{{ base_url_relative }}/themes"><i class="fa fa-reply"></i> Back to installed</a>
+            <a class="button" href="{{ base_url_relative }}/themes"><i class="fa fa-reply"></i> Back</a>
         {% else %}
+            <a class="button" href="{{ base_url }}/"><i class="fa fa-reply"></i> Back</a>
             <a class="button" href="{{ base_url_relative }}/themes/install"><i class="fa fa-plus"></i> Add</a>
         {% endif %}
         </div>
diff --git a/themes/grav/templates/users.html.twig b/themes/grav/templates/users.html.twig
index 5f686818..dca50194 100644
--- a/themes/grav/templates/users.html.twig
+++ b/themes/grav/templates/users.html.twig
@@ -12,6 +12,7 @@
         <h1><i class="fa fa-fw fa-child"></i> Users</h1>
     {% else %}
         <div class="button-bar">
+            <a class="button" href="{{ base_url }}"><i class="fa fa-reply"></i> Back</a>
             <button class="button" type="submit" name="task" value="save" form="blueprints"><i class="fa fa-check"></i> Save</button>
         </div>
         <h1><i class="fa fa-fw fa-user"></i> User: {{ user.username|e }}</h1>