diff --git a/app/static/img/actions/submit.png b/app/static/img/actions/submit.png
new file mode 100644
index 0000000000000000000000000000000000000000..408ac099dd508f202436c1ba4e1332e3a6655ed3
Binary files /dev/null and b/app/static/img/actions/submit.png differ
diff --git a/app/static/js/create_item.js b/app/static/js/create_item.js
index 64f2bad3d9196ee6a046c55613c5ea0c844ec485..76e3dede94d4a9c26438fa55dc96af37773182de 100644
--- a/app/static/js/create_item.js
+++ b/app/static/js/create_item.js
@@ -1,27 +1,29 @@
 $(document).ready(function() {
 
-  // Prevent enter key to submit the form
-  // When scanning a code bar, the scanner usually
-  // send a CR as last character. We don't want that
-  // to submit the form.
-  $(window).keydown(function(event) {
+  // Focus to ICS id when loading the page
+  $("#ics_id").focus();
+
+  // Prevent enter key to submit the form when scanning a label
+  // and remove the ICS:ics_id: prefix
+  $("#ics_id").keydown(function(event) {
     if(event.keyCode == 13) {
       event.preventDefault();
+      var value = $(this).val();
+      $(this).val(value.replace('CSE:ics_id:', ''));
+      $("#serial_number").focus();
       return false;
     }
   });
 
-  // Focus to ICS id when loading the page
-  $("#ics_id").focus();
-
-  // remove 'CSE:ics_id:' prefix from ICS id
-  // allow to scan a label
-  $("#ics_id").keyup(function(event) {
-    var value = $(this).val();
-    if( value.length == 17 ) {
-      $(this).val(value.replace('CSE:ics_id:', ''));
-      // Change the focus to the serial number
-      $("#serial_number").focus();
+  // Prevent enter key to submit the form when scanning serial number
+  // Focus on the submit button so that scanning the Submit action
+  // will submit the form (due to the CR sent by the scanner)
+  $("#serial_number").keydown(function(event) {
+    console.log(event.keyCode);
+    if(event.keyCode == 13) {
+      event.preventDefault();
+      $("#submit").focus();
+      return false;
     }
   });
 
diff --git a/app/templates/_helpers.html b/app/templates/_helpers.html
index 7ad28ca4c5c958b6bc227bf86d87e0f8cfec9b91..7e78556c5e5b044fcb23a9bf0dc14cebeb20cf21 100644
--- a/app/templates/_helpers.html
+++ b/app/templates/_helpers.html
@@ -79,3 +79,10 @@
     </div>
   </div>
 {%- endmacro %}
+
+{% macro figure(filename, description) -%}
+  <figure class="figure">
+    <img src="{{ url_for('static', filename='img/' +  filename) }}" class="img-fluid mx-auto d-block" alt="{{ description }}">
+    <figcaption class="figure-caption text-center">{{ description }}</figcaption>
+  </figure>
+{%- endmacro %}
diff --git a/app/templates/inventory/create_item.html b/app/templates/inventory/create_item.html
index a42ae78f3f6b199d09c2db45789567f4302f38fc..19e3f94b2a2e9bbb590a1d8a78b0ea418b0f2a4d 100644
--- a/app/templates/inventory/create_item.html
+++ b/app/templates/inventory/create_item.html
@@ -1,27 +1,34 @@
 {% extends "inventory/items.html" %}
-{% from "_helpers.html" import render_field %}
+{% from "_helpers.html" import render_field, figure %}
 
 {% block title %}Register Item - CSEntry{% endblock %}
 
 {% block items_main %}
-  <form id="itemForm" method="POST">
-    {{ form.hidden_tag() }}
-    {{ render_field(form.ics_id) }}
-    {{ render_field(form.serial_number) }}
-    {{ render_field(form.quantity) }}
-    {{ render_field(form.manufacturer_id) }}
-    {{ render_field(form.model_id) }}
-    {{ render_field(form.location_id) }}
-    {{ render_field(form.status_id) }}
-    {{ render_field(form.parent_id) }}
-    {{ render_field(form.mac_addresses) }}
-    <div class="form-group row">
-      <div class="col-sm-10">
-        <button type="submit" class="btn btn-primary">Submit</button>
-        <button type="button" class="btn btn-primary" id="clear">Clear</button>
-      </div>
+  <div class="row">
+    <div class="col-sm-11">
+      <form id="itemForm" method="POST">
+        {{ form.hidden_tag() }}
+        {{ render_field(form.ics_id) }}
+        {{ render_field(form.serial_number) }}
+        {{ render_field(form.quantity) }}
+        {{ render_field(form.manufacturer_id) }}
+        {{ render_field(form.model_id) }}
+        {{ render_field(form.location_id) }}
+        {{ render_field(form.status_id) }}
+        {{ render_field(form.parent_id) }}
+        {{ render_field(form.mac_addresses) }}
+        <div class="form-group row">
+          <div class="col-sm-10">
+            <button type="submit" class="btn btn-primary" id="submit">Submit</button>
+            <button type="button" class="btn btn-primary" id="clear">Clear</button>
+          </div>
+        </div>
+      </form>
     </div>
-  </form>
+    <div class="col-sm-1">
+      {{ figure("actions/submit.png", "Submit") }}
+    </div>
+  </div>
 {%- endblock %}
 
 {% block csentry_scripts %}