diff --git a/octoprint/static/css/ui.css b/octoprint/static/css/ui.css
index 92f6857..b7ca7a9 100644
--- a/octoprint/static/css/ui.css
+++ b/octoprint/static/css/ui.css
@@ -46,6 +46,12 @@ body {
     padding: 0px 15px;
 }
 
+.print-control .btn {
+    padding-left: 4px;
+    padding-right: 4px;
+}
+
+
 /** Tables */
 
 table {
diff --git a/octoprint/static/js/ui.js b/octoprint/static/js/ui.js
index d96485a..a799e51 100644
--- a/octoprint/static/js/ui.js
+++ b/octoprint/static/js/ui.js
@@ -1240,7 +1240,7 @@ $(function() {
 
         //~~ Print job control
 
-        $("#job_print").click(function() {
+        $("#job_print, #job_restart").click(function() {
             $.ajax({
                 url: AJAX_BASEURL + "control/print",
                 type: "POST",
diff --git a/octoprint/templates/index.html b/octoprint/templates/index.html
index 814ac7b..5af55f7 100644
--- a/octoprint/templates/index.html
+++ b/octoprint/templates/index.html
@@ -74,9 +74,11 @@
                                     <div class="bar" id="job_progressBar" data-bind="style: { width: progress() + '%' }"></div>
                                 </div>
 
-                                <button class="btn btn-primary" data-bind="enable: isOperational() && isReady() && !isPrinting() && !isPaused()" id="job_print"><i class="icon-print icon-white"></i> <span>Print</span></button>
-                                <button class="btn" id="job_pause" data-bind="css: {active: isPaused}"><i class="icon-pause"></i> <span>Pause</span></button>
-                                <button class="btn" id="job_cancel"><i class="icon-stop"></i> Cancel</button>
+                                <div class="row-fluid print-control">
+                                    <button class="btn btn-primary span4" data-bind="enable: isOperational() && isReady() && !isPrinting(), css: {'btn-danger': isPaused()}" id="job_print"><i class="icon-print icon-white"></i> <span data-bind="text: (isPaused() ? 'Restart' : 'Print')">Print</span></button>
+                                    <button class="btn span4" id="job_pause" data-bind="css: {active: isPaused}"><i class="icon-pause"></i> <span>Pause</span></button>
+                                    <button class="btn span4" id="job_cancel"><i class="icon-stop"></i> Cancel</button>
+                                </div>
                             </div>
                         </div>
                     </div>