diff --git a/css/tools.css b/css/tools.css
index d4622d9c..7aeb3f49 100644
--- a/css/tools.css
+++ b/css/tools.css
@@ -45,6 +45,10 @@
   background-image: url(../img/tools/icons/rectangle.png);
 }
 
+.tool-icon.tool-move {
+  background-image: url(../img/tools/icons/hand.png);
+}
+
 /*.tool-icon.tool-palette {
   background-image: url(../img/tools/icons/color-palette.png);
 }*/
@@ -69,6 +73,10 @@
   cursor: url(../img/tools/cursors/rectangle.png) 4 21, pointer;
 }
 
+.tool-move .drawing-canvas-container:hover {
+  cursor: url(../img/tools/cursors/hand.png) 14 12, pointer;
+}
+
 .tool-icon.selected {
   cursor: auto;
   background-color: #eee;
diff --git a/index.html b/index.html
index 2d444879..ef1cf081 100644
--- a/index.html
+++ b/index.html
@@ -30,6 +30,7 @@
       <li class="tool-icon tool-paint-bucket" data-tool-id="tool-paint-bucket" title="Bucket tool"></li>
       <li class="tool-icon tool-stroke" data-tool-id="tool-stroke" title="Stroke tool"></li>
       <li class="tool-icon tool-rectangle" data-tool-id="tool-rectangle" title="Rectangle tool"></li>
+      <li class="tool-icon tool-move" data-tool-id="tool-move" title="Move tool"></li>
     </ul>
     
     <ul class="tools-group">
@@ -102,6 +103,7 @@
   <script src="js/drawingtools/Stroke.js"></script>
   <script src="js/drawingtools/PaintBucket.js"></script>
   <script src="js/drawingtools/Rectangle.js"></script>
+  <script src="js/drawingtools/Move.js"></script>
   <script src="js/ToolSelector.js"></script>
 
   <!-- Application controller and initialization -->
diff --git a/js/ToolSelector.js b/js/ToolSelector.js
index f00e3576..0f69feaf 100644
--- a/js/ToolSelector.js
+++ b/js/ToolSelector.js
@@ -14,7 +14,8 @@ pskl.ToolSelector = (function() {
 		"eraser" : new pskl.drawingtools.Eraser(),
 		"paintBucket" : new pskl.drawingtools.PaintBucket(),
 		"stroke" : new pskl.drawingtools.Stroke(),
-		"rectangle" : new pskl.drawingtools.Rectangle()
+		"rectangle" : new pskl.drawingtools.Rectangle(),
+		"move" : new pskl.drawingtools.Move()
 	};
 	var currentSelectedTool = toolInstances.simplePen;
 	var previousSelectedTool = toolInstances.simplePen;
diff --git a/js/drawingtools/Stroke.js b/js/drawingtools/Stroke.js
index a592fde2..92bb8450 100644
--- a/js/drawingtools/Stroke.js
+++ b/js/drawingtools/Stroke.js
@@ -34,7 +34,7 @@
 
 		// The fake canvas where we will draw the preview of the stroke:
 		// Drawing the first point of the stroke in the fake overlay canvas:
-		drawer.updateOverlay(col, row, color);
+		drawer.overlay.setPixel(col, row, color);
 		drawer.renderOverlay();
 	};
 
diff --git a/js/model/Frame.js b/js/model/Frame.js
index 19e52064..72fcdd04 100644
--- a/js/model/Frame.js
+++ b/js/model/Frame.js
@@ -81,5 +81,4 @@
 			this.pixels = this.previousStates[this.stateIndex];
 		}	
 	};
-
 })();
\ No newline at end of file