diff --git a/InvenTree/templates/InvenTree/settings/navbar.html b/InvenTree/templates/InvenTree/settings/navbar.html
index d5da2ca5de..ca38d9bc6b 100644
--- a/InvenTree/templates/InvenTree/settings/navbar.html
+++ b/InvenTree/templates/InvenTree/settings/navbar.html
@@ -18,17 +18,19 @@
         </a>
     </li>
 
-    <li class='list-group-item' title='{% trans "Appearance" %}'>
-        <a href='#' class='nav-toggle' id='select-appearance'>
-            <span class='fas fa-fill'></span> {% trans "Appearance" %}
+    <li class='list-group-item' title='{% trans "Home Page" %}'>
+        <a href='#' class='nav-toggle' id='select-user-home'>
+            <span class='fas fa-home'></span> {% trans "Home Page" %}
         </a>
     </li>
 
-    <li class='list-group-item' title='{% trans "Settings" %}'>
-        <a href='#' class='nav-toggle' id='select-user-settings'>
-            <span class='fas fa-cog'></span> {% trans "Settings" %}
-        </a>
-    </li>
+    <!--
+        <li class='list-group-item' title='{% trans "Settings" %}'>
+            <a href='#' class='nav-toggle' id='select-user-settings'>
+                <span class='fas fa-cog'></span> {% trans "Settings" %}
+            </a>
+        </li>
+    -->
 
     {% if user.is_staff %}
 
diff --git a/InvenTree/templates/InvenTree/settings/settings.html b/InvenTree/templates/InvenTree/settings/settings.html
index 246f36a0b4..61b1d3ead1 100644
--- a/InvenTree/templates/InvenTree/settings/settings.html
+++ b/InvenTree/templates/InvenTree/settings/settings.html
@@ -16,6 +16,7 @@
 
 {% include "InvenTree/settings/user.html" %}
 {% include "InvenTree/settings/user_settings.html" %}
+{% include "InvenTree/settings/user_homepage.html" %}
 
 {% if user.is_staff %}
 
diff --git a/InvenTree/templates/InvenTree/settings/user_homepage.html b/InvenTree/templates/InvenTree/settings/user_homepage.html
new file mode 100644
index 0000000000..7bb2bbda42
--- /dev/null
+++ b/InvenTree/templates/InvenTree/settings/user_homepage.html
@@ -0,0 +1,40 @@
+{% extends "panel.html" %}
+
+{% load i18n %}
+{% load inventree_extras %}
+
+{% block label %}user-home{% endblock %}
+
+{% block heading %}
+{% trans "Home Page Settings" %}
+{% endblock %}
+
+{% block content %}
+
+<div class='row'>
+    <table class='table table-striped table-condensed'>
+        {% include "InvenTree/settings/header.html" %}
+        <tbody>
+            {% include "InvenTree/settings/setting.html" with key="HOMEPAGE_PART_STARRED" user_setting=True %}
+            {% include "InvenTree/settings/setting.html" with key="HOMEPAGE_PART_LATEST" user_setting=True %}
+            {% include "InvenTree/settings/setting.html" with key="HOMEPAGE_BOM_VALIDATION" user_setting=True %}
+            <tr><td colspan='5'></td></tr>
+            {% include "InvenTree/settings/setting.html" with key="HOMEPAGE_STOCK_RECENT" user_setting=True %}
+            {% include "InvenTree/settings/setting.html" with key="HOMEPAGE_STOCK_LOW" user_setting=True %}
+            {% include "InvenTree/settings/setting.html" with key="HOMEPAGE_STOCK_DEPLETED" user_setting=True %}
+            {% include "InvenTree/settings/setting.html" with key="HOMEPAGE_STOCK_NEEDED" user_setting=True %}
+            {% include "InvenTree/settings/setting.html" with key="HOMEPAGE_STOCK_EXPIRED" user_setting=True %}
+            {% include "InvenTree/settings/setting.html" with key="HOMEPAGE_STOCK_STALE" user_setting=True %}
+            <tr><td colspan='5'></td></tr>
+            {% include "InvenTree/settings/setting.html" with key="HOMEPAGE_BUILD_PENDING" user_setting=True %}
+            {% include "InvenTree/settings/setting.html" with key="HOMEPAGE_BUILD_OVERDUE" user_setting=True %}
+            <tr><td colspan='5'></td></tr>
+            {% include "InvenTree/settings/setting.html" with key="HOMEPAGE_PO_OUTSTANDING" user_setting=True %}
+            {% include "InvenTree/settings/setting.html" with key="HOMEPAGE_PO_OVERDUE" user_setting=True %}
+            <tr><td colspan='5'></td></tr>
+            {% include "InvenTree/settings/setting.html" with key="HOMEPAGE_SO_OUTSTANDING" user_setting=True %}
+            {% include "InvenTree/settings/setting.html" with key="HOMEPAGE_SO_OVERDUE" user_setting=True %}
+        </tbody>
+    </table>
+</div>
+{% endblock %}
\ No newline at end of file
diff --git a/InvenTree/templates/InvenTree/settings/user_settings.html b/InvenTree/templates/InvenTree/settings/user_settings.html
index 00c1ac6f5a..a9b9b0a82f 100644
--- a/InvenTree/templates/InvenTree/settings/user_settings.html
+++ b/InvenTree/templates/InvenTree/settings/user_settings.html
@@ -14,27 +14,7 @@
 <div class='row'>
     <table class='table table-striped table-condensed'>
         {% include "InvenTree/settings/header.html" %}
-        <tbody>
-            {% include "InvenTree/settings/setting.html" with key="HOMEPAGE_PART_STARRED" user_setting=True %}
-            {% include "InvenTree/settings/setting.html" with key="HOMEPAGE_PART_LATEST" user_setting=True %}
-            {% include "InvenTree/settings/setting.html" with key="HOMEPAGE_BOM_VALIDATION" user_setting=True %}
-            <tr><td colspan='5'></td></tr>
-            {% include "InvenTree/settings/setting.html" with key="HOMEPAGE_STOCK_RECENT" user_setting=True %}
-            {% include "InvenTree/settings/setting.html" with key="HOMEPAGE_STOCK_LOW" user_setting=True %}
-            {% include "InvenTree/settings/setting.html" with key="HOMEPAGE_STOCK_DEPLETED" user_setting=True %}
-            {% include "InvenTree/settings/setting.html" with key="HOMEPAGE_STOCK_NEEDED" user_setting=True %}
-            {% include "InvenTree/settings/setting.html" with key="HOMEPAGE_STOCK_EXPIRED" user_setting=True %}
-            {% include "InvenTree/settings/setting.html" with key="HOMEPAGE_STOCK_STALE" user_setting=True %}
-            <tr><td colspan='5'></td></tr>
-            {% include "InvenTree/settings/setting.html" with key="HOMEPAGE_BUILD_PENDING" user_setting=True %}
-            {% include "InvenTree/settings/setting.html" with key="HOMEPAGE_BUILD_OVERDUE" user_setting=True %}
-            <tr><td colspan='5'></td></tr>
-            {% include "InvenTree/settings/setting.html" with key="HOMEPAGE_PO_OUTSTANDING" user_setting=True %}
-            {% include "InvenTree/settings/setting.html" with key="HOMEPAGE_PO_OVERDUE" user_setting=True %}
-            <tr><td colspan='5'></td></tr>
-            {% include "InvenTree/settings/setting.html" with key="HOMEPAGE_SO_OUTSTANDING" user_setting=True %}
-            {% include "InvenTree/settings/setting.html" with key="HOMEPAGE_SO_OVERDUE" user_setting=True %}
-        </tbody>
+
     </table>
 </div>