diff --git a/InvenTree/InvenTree/static/css/inventree.css b/InvenTree/InvenTree/static/css/inventree.css
index d37c3550e5..2f54a50219 100644
--- a/InvenTree/InvenTree/static/css/inventree.css
+++ b/InvenTree/InvenTree/static/css/inventree.css
@@ -88,6 +88,12 @@
     width: 100%;
 }
 
+.basecurrency {
+    color: #050;
+    font-style: italic;
+    font-weight: bold;
+}
+
 .bomselect {
     max-width: 250px;
 }
diff --git a/InvenTree/templates/InvenTree/settings/currency.html b/InvenTree/templates/InvenTree/settings/currency.html
index e895fd6dcd..662df702aa 100644
--- a/InvenTree/templates/InvenTree/settings/currency.html
+++ b/InvenTree/templates/InvenTree/settings/currency.html
@@ -6,4 +6,49 @@
 
 {% block settings %}
 
+<table class='table table-striped table-condensed' id='currency-table'/>
+</table>
+{% endblock %}
+
+{% block js_ready %}
+{{ block.super }}
+
+    $("#currency-table").bootstrapTable({
+        url: "{% url 'api-currency-list' %}",
+        sortable: true,
+        search: true,
+        formatNoMatches: function() { return "No currencies found"; },
+        rowStyle: function(row, index) {
+            if (row.base) {
+                return {classes: 'basecurrency'};
+            } else {
+                return {};
+            }
+        },
+        columns: [
+            {
+                field: 'pk',
+                title: 'ID',
+                visible: false,
+            },
+            {
+                field: 'symbol',
+                title: 'Symbol',
+            },
+            {
+                field: 'suffix',
+                title: 'Currency',
+            },
+            {
+                field: 'description',
+                title: 'Description',
+            },
+            {
+                field: 'value',
+                title: 'Value',
+            }
+        ]
+    });
+
+
 {% endblock %}
\ No newline at end of file
diff --git a/InvenTree/templates/InvenTree/settings/tabs.html b/InvenTree/templates/InvenTree/settings/tabs.html
index 5e9b1503a2..78d15dbcfe 100644
--- a/InvenTree/templates/InvenTree/settings/tabs.html
+++ b/InvenTree/templates/InvenTree/settings/tabs.html
@@ -1,11 +1,11 @@
 <ul class='nav nav-pills nav-stacked'>
     <li{% ifequal tab 'user' %} class='active'{% endifequal %}>
-        <a href="{% url 'settings-user' %}">User</a>
+        <a href="{% url 'settings-user' %}"><span class='glyphicon glyphicon-user'></span> User</a>
     </li>
     <li{% ifequal tab 'currency' %} class='active'{% endifequal %}>
-        <a href="{% url 'settings-currency' %}">Currency</a>
+        <a href="{% url 'settings-currency' %}"><span class='glyphicon glyphicon-usd'></span> Currency</a>
     </li>
     <li{% ifequal tab 'part' %} class='active'{% endifequal %}>
-        <a href="{% url 'settings-part' %}">Part</a>
+        <a href="{% url 'settings-part' %}"><span class='glyphicon glyphicon-briefcase'></span> Part</a>
     </li>
 </ul>
\ No newline at end of file
diff --git a/InvenTree/templates/InvenTree/settings/user.html b/InvenTree/templates/InvenTree/settings/user.html
index cd50aad1d3..cea588467b 100644
--- a/InvenTree/templates/InvenTree/settings/user.html
+++ b/InvenTree/templates/InvenTree/settings/user.html
@@ -7,16 +7,16 @@
 {% block settings %}
 
 <div class='row'>
-        <div class='col-sm-6'>
-            <h4>User Information</h4>
+    <div class='col-sm-6'>
+        <h4>User Information</h4>
+    </div>
+    <div class='col-sm-6'>
+        <div class='btn-group' style='float: right;'>
+            <div class='btn btn-primary' type='button' id='edit-user' title='Edit User Information'>Edit</div>
+            <div class='btn btn-primary' type='button' id='edit-password' title='Change Password'>Set Password</div>
         </div>
-        <div class='col-sm-6'>
-            <div class='btn-group' style='float: right;'>
-                <div class='btn btn-primary' type='button' id='edit-user' title='Edit User Information'>Edit</div>
-                <div class='btn btn-primary' type='button' id='edit-password' title='Change Password'>Set Password</div>
-            </div>
-        </div>
-    </div>    
+    </div>
+</div>    
 
 <table class='table table-striped table-condensed'>
     <tr>