diff --git a/index.html b/index.html
index 91efbe58..b0cb5181 100644
--- a/index.html
+++ b/index.html
@@ -52,6 +52,13 @@
         <span id="display-fps">12 fps</span>
       </li>
     </ul>
+
+    <ul class="tools-group">
+      <li class="tool-grid">
+        <input id="show-grid" type="checkbox"/>
+        <label for="show-grid">Show grid</label>
+      </li>
+    </ul>
   
   </div>
 
diff --git a/js/Constants.js b/js/Constants.js
index ffa5d03f..8ef4e4da 100644
--- a/js/Constants.js
+++ b/js/Constants.js
@@ -12,5 +12,8 @@ var Constants = {
 	/*
 	 * Default entry point for piskel web service:
 	 */
-	PISKEL_SERVICE_URL: 'http://2.piskel-app.appspot.com'
+	PISKEL_SERVICE_URL: 'http://2.piskel-app.appspot.com',
+
+	GRID_STROKE_WIDTH: 1,
+	GRID_STROKE_COLOR: "lightgray"
 };
\ No newline at end of file
diff --git a/js/Events.js b/js/Events.js
index df4dfb89..ce13ed7a 100644
--- a/js/Events.js
+++ b/js/Events.js
@@ -29,6 +29,8 @@ Events = {
 	 */
 	REDRAW_PREVIEWFILM: "REDRAW_PREVIEWFILM",
 
+	GRID_DISPLAY_STATE_CHANGED: "GRID_DISPLAY_STATE_CHANGED",
+
 	/**
 	 * The framesheet was reseted and is now probably drastically different.
 	 * Number of frames, content of frames, color used for the palette may have changed.
diff --git a/js/ToolSelector.js b/js/ToolSelector.js
index 0f69feaf..ed0c51e0 100644
--- a/js/ToolSelector.js
+++ b/js/ToolSelector.js
@@ -67,6 +67,17 @@ pskl.ToolSelector = (function() {
 		}
 	};
 
+	/**
+	 * Get state for the checkbox that control the display of the grid
+	 * on the drawing canvas.
+	 * @private
+	 */
+	var isShowGridChecked_ = function() {
+		var showGridCheckbox = $('#show-grid');
+		var isChecked = showGridCheckbox.is(':checked');
+		return isChecked;
+	};
+
 	return {
 		init: function() {
 			
@@ -75,6 +86,13 @@ pskl.ToolSelector = (function() {
 			selectTool_(toolInstances.simplePen);
 			// Activate listener on tool panel:
 			$("#tools-container").click(onToolIconClicked_);
+
+			// Show/hide the grid on drawing canvas:
+			$.publish(Events.GRID_DISPLAY_STATE_CHANGED, [isShowGridChecked_()])
+			$('#show-grid').change(function(evt) {
+				var checked = isShowGridChecked_();
+				$.publish(Events.GRID_DISPLAY_STATE_CHANGED, [checked])		
+			});
 		}
 	};
 })();
diff --git a/js/controller/DrawingController.js b/js/controller/DrawingController.js
index b1a639f8..c6fa5dc9 100644
--- a/js/controller/DrawingController.js
+++ b/js/controller/DrawingController.js
@@ -6,14 +6,14 @@
 		// TODO(vincz): Store user prefs in a localstorage string ?
 		var renderingOptions = {
 			"dpi": dpi,
-			"gridStrokeWidth" : 1,
-			"gridStrokeColor" : "lightgray"
+			"hasGrid" : true
 		};
 
 		// jQuery deep copy of the rendering config:
 		overlayRenderingOptions = $.extend(true, {}, renderingOptions);
-		overlayRenderingOptions.gridStrokeColor = "transparent";
+		overlayRenderingOptions.hasGrid = false;
 		
+
 		/**
 		 * @public
 		 */
diff --git a/js/rendering/FrameRenderer.js b/js/rendering/FrameRenderer.js
index 0490dfac..14f6ae42 100644
--- a/js/rendering/FrameRenderer.js
+++ b/js/rendering/FrameRenderer.js
@@ -5,8 +5,7 @@
 	ns.FrameRenderer = function (container, renderingOptions, className) {
 		
 		this.defaultRenderingOptions = {
-			"gridStrokeWidth" : 0,
-			"gridStrokeColor" : "lightgray"
+			"hasGrid" : false
 		};
 		renderingOptions = $.extend(true, {}, this.defaultRenderingOptions, renderingOptions);
 
@@ -22,16 +21,22 @@
 		this.dpi = renderingOptions.dpi;
 		this.className = className;
 		this.canvas = null;
-		console.log(renderingOptions)
-		this.gridStrokeWidth = renderingOptions.gridStrokeWidth;
-		this.gridStrokeColor = renderingOptions.gridStrokeColor;	
+		this.hasGrid = renderingOptions.hasGrid;
+		this.gridStrokeWidth = 0;
+		
+		this.lastRenderedFrame = null;
 
 		// Flag to know if the config was altered
 		this.canvasConfigDirty = true;
+
+		if(this.hasGrid) {
+			$.subscribe(Events.GRID_DISPLAY_STATE_CHANGED, $.proxy(this.showGrid, this));	
+		}	
 	};
 
 	ns.FrameRenderer.prototype.init = function (frame) {
 		this.render(frame);
+		this.lastRenderedFrame = frame;
 	};
 
 	ns.FrameRenderer.prototype.updateDPI = function (newDPI) {
@@ -39,12 +44,27 @@
 		this.canvasConfigDirty = true;
 	};
 
+	ns.FrameRenderer.prototype.showGrid = function (evt, show) {
+		
+		this.gridStrokeWidth = 0;
+		if(show) {
+			this.gridStrokeWidth = Constants.GRID_STROKE_WIDTH;
+		}
+		
+		this.canvasConfigDirty = true;
+
+		if(this.lastRenderedFrame) {
+			this.render(this.lastRenderedFrame);
+		}
+	};
+
 	ns.FrameRenderer.prototype.render = function (frame) {
 		for(var col = 0, width = frame.getWidth(); col < width; col++) {
 			for(var row = 0, height = frame.getHeight(); row < height; row++) {
 				this.drawPixel(col, row, frame, this.getCanvas_(frame, col, row), this.dpi);
 			}
 		}
+		this.lastRenderedFrame = frame;
 	};
 
 	ns.FrameRenderer.prototype.drawPixel = function (col, row, frame) {
@@ -61,6 +81,7 @@
 			context.fillStyle = color;
 			context.fillRect(this.getFrameY_(col), this.getFrameY_(row), this.dpi, this.dpi);
 		}
+		this.lastRenderedFrame = frame;
 	};
 
 	ns.FrameRenderer.prototype.clear = function (col, row, frame) {
@@ -100,8 +121,8 @@
 	 */
 	ns.FrameRenderer.prototype.drawGrid_ = function(canvas, width, height, col, row) {
 		var ctx = canvas.getContext("2d");
-		ctx.lineWidth = this.gridStrokeWidth;
-		ctx.strokeStyle = this.gridStrokeColor;
+		ctx.lineWidth = Constants.GRID_STROKE_WIDTH;
+		ctx.strokeStyle = Constants.GRID_STROKE_COLOR;
 		for(var c=1; c < col; c++) {			
 	        ctx.moveTo(this.getFrameX_(c), 0);
 	        ctx.lineTo(this.getFrameX_(c), height);
@@ -121,6 +142,7 @@
 	ns.FrameRenderer.prototype.getCanvas_ = function (frame) {
 		if(this.canvasConfigDirty) {
 			$(this.canvas).remove();
+			
 			var col = frame.getWidth(),
 				row = frame.getHeight();