diff --git a/src/css/settings-application.css b/src/css/settings-application.css
index c6648250..0a01421b 100644
--- a/src/css/settings-application.css
+++ b/src/css/settings-application.css
@@ -73,11 +73,35 @@
   flex-shrink: 0;
 }
 
-.settings-item-grid-size .size-picker-option {
+.grid-spacing-container .size-picker-option[data-size='1'] {
+  padding: 7px;
+}
+.grid-spacing-container .size-picker-option[data-size='2'] {
+  padding: 6px;
+}
+.grid-spacing-container .size-picker-option[data-size='4'] {
+  padding: 5px;
+}
+.grid-spacing-container .size-picker-option[data-size='8'] {
+  padding: 4px;
+}
+.grid-spacing-container .size-picker-option[data-size='16'] {
+  padding: 3px;
+}
+.grid-spacing-container .size-picker-option[data-size='32'] {
+  padding: 2px;
+}
+.grid-spacing-container .size-picker-option[data-size='64'] {
+  padding: 1px;
+}
+
+.settings-item-grid-size .size-picker-option,
+.settings-item-grid-spacing .size-picker-option {
   border-color: #888;
 }
 
-.settings-item-grid-size .size-picker-option:not(.selected):hover {
+.settings-item-grid-size .size-picker-option:not(.selected):hover,
+.settings-item-grid-spacing .size-picker-option:not(.selected):hover {
   border-color: white;
 }
 
diff --git a/src/js/rendering/frame/FrameRenderer.js b/src/js/rendering/frame/FrameRenderer.js
index 57745132..4aedd6e3 100644
--- a/src/js/rendering/frame/FrameRenderer.js
+++ b/src/js/rendering/frame/FrameRenderer.js
@@ -333,7 +333,6 @@
       displayContext.scale(1 / z, 1 / z);
 
       var drawOrClear;
-      var drawing = true;
       if (gridColor === Constants.TRANSPARENT_COLOR) {
         drawOrClear = displayContext.clearRect.bind(displayContext);
       } else {
diff --git a/src/templates/settings/preferences/grid.html b/src/templates/settings/preferences/grid.html
index c7256f82..c10ea221 100644
--- a/src/templates/settings/preferences/grid.html
+++ b/src/templates/settings/preferences/grid.html
@@ -20,8 +20,8 @@
       </div>
     </div>
     <div class="settings-item settings-item-grid-spacing">
-      <label>Grid Spacing</label>
-      <div class="grid-spacing-container spacing-picker-container">
+      <label>Grid spacing</label>
+      <div class="grid-spacing-container size-picker-container">
         <div class="size-picker-option"
           title="1px" rel="tooltip" data-placement="top" data-size="1"></div>
         <div class="size-picker-option"