diff --git a/src/octoprint/templates/tabs/gcodeviewer.jinja2 b/src/octoprint/templates/tabs/gcodeviewer.jinja2
index edc0b48b..1655631b 100644
--- a/src/octoprint/templates/tabs/gcodeviewer.jinja2
+++ b/src/octoprint/templates/tabs/gcodeviewer.jinja2
@@ -6,13 +6,13 @@
     </div>
 
     <div class="layer-buttons btn-group-toolbar row-fluid">
-        <button type="button" class="btn btn-primary btn-medium span6" data-bind = "click: incrementLayer, enable: layerSelectionEnabled() && layerUpEnabled()">
-            <i class="icon-white icon-arrow-up"></i>
-            <span>{{ _('Layer Up') }}</span>
-        </button>
         <button type="button" class="btn btn-primary btn-medium span6" data-bind = "click: decrementLayer, enable: layerSelectionEnabled() && layerDownEnabled()">
-            <i class="icon-white icon-arrow-down"></i>
-            <span>{{ _('Layer Down') }}</span>
+            <i class="icon-white icon-arrow-left"></i>
+            <span>{{ _('Previous layer') }}</span>
+        </button>
+        <button type="button" class="btn btn-primary btn-medium span6" data-bind = "click: incrementLayer, enable: layerSelectionEnabled() && layerUpEnabled()">
+            <span>{{ _('Next layer') }}</span>
+            <i class="icon-white icon-arrow-right"></i>
         </button>
     </div>