diff --git a/InvenTree/templates/InvenTree/settings/navbar.html b/InvenTree/templates/InvenTree/settings/navbar.html
deleted file mode 100644
index 46150f57d1..0000000000
--- a/InvenTree/templates/InvenTree/settings/navbar.html
+++ /dev/null
@@ -1,139 +0,0 @@
-{% load i18n %}
-
-
\ No newline at end of file
diff --git a/InvenTree/templates/InvenTree/settings/settings.html b/InvenTree/templates/InvenTree/settings/settings.html
index fd920e42b4..7599733975 100644
--- a/InvenTree/templates/InvenTree/settings/settings.html
+++ b/InvenTree/templates/InvenTree/settings/settings.html
@@ -8,8 +8,8 @@
{% inventree_title %} | {% trans "Settings" %}
{% endblock %}
-{% block menubar %}
-{% include "InvenTree/settings/navbar.html" %}
+{% block sidebar %}
+{% include "InvenTree/settings/sidebar.html" %}
{% endblock %}
{% block content %}
@@ -21,7 +21,6 @@
{% include "InvenTree/settings/user_labels.html" %}
{% include "InvenTree/settings/user_reports.html" %}
{% include "InvenTree/settings/user_display.html" %}
-{% include "InvenTree/settings/user_forms.html" %}
{% if user.is_staff %}
@@ -320,15 +319,6 @@ $("#import-part").click(function() {
launchModalForm("{% url 'api-part-import' %}?reset", {});
});
-
-enableNavbar({
- label: 'settings',
- toggleId: '#item-menu-toggle',
-});
-
-attachNavCallbacks({
- name: 'settings',
- default: 'account'
-});
+enableSidebar('settings');
{% endblock %}
diff --git a/InvenTree/templates/InvenTree/settings/sidebar.html b/InvenTree/templates/InvenTree/settings/sidebar.html
new file mode 100644
index 0000000000..21716eaaec
--- /dev/null
+++ b/InvenTree/templates/InvenTree/settings/sidebar.html
@@ -0,0 +1,30 @@
+{% load i18n %}
+{% load static %}
+{% load inventree_extras %}
+
+{% include "sidebar_header.html" with text="User Settings" icon='fa-user' %}
+
+{% include "sidebar_item.html" with label='account' text="Account Settings" icon="fa-cog" %}
+{% include "sidebar_item.html" with label='user-display' text="Display Settings" icon="fa-desktop" %}
+{% include "sidebar_item.html" with label='user-home' text="Home Page" icon="fa-home" %}
+{% include "sidebar_item.html" with label='user-search' text="Search Settings" icon="fa-search" %}
+{% include "sidebar_item.html" with label='user-labels' text="Label Printing" icon="fa-tag" %}
+{% include "sidebar_item.html" with label='user-reports' text="Reporting" icon="fa-file-pdf" %}
+
+{% if user.is_staff %}
+
+{% include "sidebar_header.html" with text="Global Settings" icon='fa-cogs' %}
+
+{% include "sidebar_item.html" with label='server' text="Server Configuration" icon="fa-server" %}
+{% include "sidebar_item.html" with label='login' text="Login Settings" icon="fa-fingerprint" %}
+{% include "sidebar_item.html" with label='barcodes' text="Barcode Support" icon="fa-qrcode" %}
+{% include "sidebar_item.html" with label='currencies' text="Currencies" icon="fa-dollar-sign" %}
+{% include "sidebar_item.html" with label='reporting' text="Reporting" icon="fa-file-pdf" %}
+{% include "sidebar_item.html" with label='parts' text="Parts" icon="fa-shapes" %}
+{% include "sidebar_item.html" with label='category' text="Categories" icon="fa-sitemap" %}
+{% include "sidebar_item.html" with label='stock' text="Stock" icon="fa-boxes" %}
+{% include "sidebar_item.html" with label='build-order' text="Build Orders" icon="fa-tools" %}
+{% include "sidebar_item.html" with label='purchase-order' text="Purchase Orders" icon="fa-shopping-cart" %}
+{% include "sidebar_item.html" with label='sales-order' text="Sales Orders" icon="fa-truck" %}
+
+{% endif %}
\ No newline at end of file
diff --git a/InvenTree/templates/InvenTree/settings/user_display.html b/InvenTree/templates/InvenTree/settings/user_display.html
index 1415e4c37b..40fa0ba0e9 100644
--- a/InvenTree/templates/InvenTree/settings/user_display.html
+++ b/InvenTree/templates/InvenTree/settings/user_display.html
@@ -15,6 +15,8 @@
{% include "InvenTree/settings/setting.html" with key="STICKY_HEADER" icon="fa-bars" user_setting=True %}
+ {% include "InvenTree/settings/setting.html" with key="FORMS_CLOSE_USING_ESCAPE" icon="fa-window-close" user_setting=True %}
+ {% include "InvenTree/settings/setting.html" with key="PART_SHOW_QUANTITY_IN_FORMS" icon="fa-hashtag" user_setting=True %}
diff --git a/InvenTree/templates/InvenTree/settings/user_forms.html b/InvenTree/templates/InvenTree/settings/user_forms.html
deleted file mode 100644
index f5eecc574b..0000000000
--- a/InvenTree/templates/InvenTree/settings/user_forms.html
+++ /dev/null
@@ -1,23 +0,0 @@
-{% extends "panel.html" %}
-
-{% load i18n %}
-{% load inventree_extras %}
-
-{% block label %}user-forms{% endblock %}
-
-{% block heading %}
-{% trans "Form Settings" %}
-{% endblock %}
-
-{% block content %}
-
-
-
-
- {% include "InvenTree/settings/setting.html" with key="FORMS_CLOSE_USING_ESCAPE" icon="fa-window-close" user_setting=True %}
- {% include "InvenTree/settings/setting.html" with key="PART_SHOW_QUANTITY_IN_FORMS" icon="fa-hashtag" user_setting=True %}
-
-
-