diff --git a/InvenTree/stock/templates/stock/item_base.html b/InvenTree/stock/templates/stock/item_base.html
index dc83144dfd..541789e39b 100644
--- a/InvenTree/stock/templates/stock/item_base.html
+++ b/InvenTree/stock/templates/stock/item_base.html
@@ -73,7 +73,7 @@ InvenTree | {% trans "Stock Item" %} - {{ item }}
 </div>
 
 <div class='btn-group action-buttons' role='group'>
-    <!-- QR label menu -->
+    <!-- Barcode actions menu -->
     <div class='dropdown dropdown-buttons'>
         <button id='barcode-options' title='{% trans "Barcode actions" %}' class='btn btn-default dropdown-toggle' type='button' data-toggle='dropdown'><span class='fas fa-qrcode'></span> <span class='caret'></span></button>
         <ul class='dropdown-menu' role='menu'>
diff --git a/InvenTree/stock/templates/stock/location.html b/InvenTree/stock/templates/stock/location.html
index f92539cab8..8b5e1d6e28 100644
--- a/InvenTree/stock/templates/stock/location.html
+++ b/InvenTree/stock/templates/stock/location.html
@@ -12,25 +12,36 @@
     <h3>{% trans "Stock" %}</h3>
     <p>{% trans "All stock items" %}</p>
     {% endif %}
-    <p>
-        <div class='btn-group action-buttons'>
-            <button class='btn btn-default' id='location-create' title='{% trans "Create new stock location" %}'>
-                <span class='fas fa-plus-circle icon-green'/>
-            </button>
-            {% if location %}
-            {% include "qr_button.html" %}
-            <button class='btn btn-default' id='location-count' title='{% trans "Count stock items" %}'>
-                <span class='fas fa-clipboard-list'/>
-            </button>
-            <button class='btn btn-default btn-glyph' id='location-edit' title='{% trans "Edit stock location" %}'>
-                <span class='fas fa-edit icon-blue'/>
-            </button>
-            <button class='btn btn-default btn-glyph' id='location-delete' title='{% trans "Delete stock location" %}'>
-                <span class='fas fa-trash-alt icon-red'/>
-            </button>
-            {% endif %}
+    <div class='btn-group action-buttons' role='group'>
+        <button class='btn btn-default' id='location-create' title='{% trans "Create new stock location" %}'>
+            <span class='fas fa-plus-circle icon-green'/>
+        </button>
+        <!-- Barcode actions menu -->
+        {% if location %}
+        <div class='dropdown dropdown-buttons'>
+            <button id='barcode-options' title='{% trans "Barcode actions" %}' class='btn btn-default dropdown-toggle' type='button' data-toggle='dropdown'><span class='fas fa-qrcode'></span> <span class='caret'></span></button>
+            <ul class='dropdown-menu' role='menu'>
+                <li><a href='#' id='show-qr-code'><span class='fas fa-qrcode'></span> {% trans "Show QR Code" %}</a></li>
+                <li class='disabled'><a href='#' id='print-label'><span class='fas fa-tag'></span> {% trans "Print Label" %}</a></li>
+                <li><a href='#' id='barcode-check-in'><span class='fas fa-arrow-right'></span> {% trans "Check-in Items" %}</a></li>
+            </ul>
         </div>
-    </p>
+        <div class='dropdown dropdown-buttons'>
+            <button id='stock-actions' title='{% trans "Stock actions" %}' class='btn btn-default dropdown-toggle' type='button' data-toggle='dropdown'><span class='fas fa-boxes'></span> <span class='caret'></span></button>
+            <ul class='dropdown-menu' role='menu'>
+                <li><a href='#' id='location-count'><span class='fas fa-clipboard-list'></span>
+                 {% trans "Count stock" %}</a></li>
+            </ul>
+        </div>
+        <div class='dropdown dropdown-buttons'>
+            <button id='location-actions' title='{% trans "Location actions" %}' class='btn btn-default dropdown-toggle' type='button' data-toggle="dropdown"><span class='fas fa-sitemap'></span> <span class='caret'></span></button>
+            <ul class='dropdown-menu' role='menu'>
+                <li><a href='#' id='location-edit'><span class='fas fa-edit icon-green'></span> {% trans "Edit location" %}</a></li>
+                <li><a href='#' id='location-delete'><span class='fas fa-trash-alt icon-red'></span> {% trans "Delete location" %}</a></li>
+            </ul>
+        </div>
+        {% endif %}
+    </div>
 </div>
 <div class='col-sm-6'>
     {% if location %}
diff --git a/InvenTree/stock/templates/stock/location_delete.html b/InvenTree/stock/templates/stock/location_delete.html
index ef5cee7541..68e34b987b 100644
--- a/InvenTree/stock/templates/stock/location_delete.html
+++ b/InvenTree/stock/templates/stock/location_delete.html
@@ -1,7 +1,10 @@
 {% extends "modal_delete_form.html" %}
 
+{% load i18n %}
+{% load inventree_extras %}
+
 {% block pre_form_content %}
-Are you sure you want to delete stock location '{{ location.name }}'?
+{% trans "Are you sure you want to delete this stock location?" %}
 
 <br>
 
@@ -33,7 +36,7 @@ If this location is deleted, these items will be moved to the top level 'Stock'
 
 <ul class='list-group'>
     {% for item in location.stock_items.all %}
-    <li class='list-group-item'><b>{{ item.part.full_name }}</b> - <i>{{ item.part.description }}</i><span class='badge'>{{ item.quantity }}</span></li>
+    <li class='list-group-item'><b>{{ item.part.full_name }}</b> - <i>{{ item.part.description }}</i><span class='badge'>{% decimal item.quantity %}</span></li>
     {% endfor %}
 </ul>
 {% endif %}