diff --git a/activities/Gears.activity/css/activity.css b/activities/Gears.activity/css/activity.css
index 307315bd6..cf77fcb59 100644
--- a/activities/Gears.activity/css/activity.css
+++ b/activities/Gears.activity/css/activity.css
@@ -31,6 +31,24 @@
   background-image: url(../icons/toolbar-help.svg);
 }
 
+#fullscreen-button {
+	background-image: url(../icons/view-fullscreen.svg);
+}
+
+#unfullscreen-button {
+	background-image: url(../icons/view-return.svg);
+	border: 0;
+	border-radius: 0px;
+	margin: 1px;
+	width: 45px;
+	height: 45px;
+	top: 0;
+	right: 5%;
+	position: absolute;
+	visibility: hidden;
+	z-index: 5;
+}
+
 @media screen and (max-width: 567px) {
 	.toolbar {
 		padding-left: 10px;
diff --git a/activities/Gears.activity/icons/view-fullscreen.svg b/activities/Gears.activity/icons/view-fullscreen.svg
new file mode 100644
index 000000000..f71058c69
--- /dev/null
+++ b/activities/Gears.activity/icons/view-fullscreen.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" ?><!DOCTYPE svg  PUBLIC '-//W3C//DTD SVG 1.1//EN'  'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd' [
+	<!ENTITY stroke_color "#010101">
+	<!ENTITY fill_color "#FFFFFF">
+]><svg enable-background="new 0 0 55 55" height="55px" version="1.1" viewBox="0 0 55 55" width="55px" x="0px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px"><g display="block" id="view-expand">
+	<path d="M4.875,5v45h45V5H4.875z M23.638,44.051H12.574c-0.071,0-0.141-0.013-0.21-0.021   c-0.042-0.005-0.084-0.004-0.126-0.013c-0.033-0.007-0.064-0.02-0.097-0.028c-0.079-0.021-0.158-0.04-0.234-0.071   c-0.013-0.006-0.025-0.015-0.038-0.021c-0.09-0.04-0.178-0.084-0.262-0.14c-0.096-0.063-0.187-0.137-0.269-0.219   c-0.083-0.083-0.157-0.175-0.222-0.272c-0.03-0.046-0.051-0.096-0.076-0.144c-0.028-0.052-0.06-0.102-0.083-0.157   c-0.032-0.076-0.052-0.156-0.072-0.235c-0.008-0.03-0.021-0.06-0.027-0.091c-0.019-0.098-0.027-0.196-0.029-0.296   c0-0.015-0.004-0.028-0.004-0.043V31.236c0-0.969,0.783-1.751,1.749-1.751c0.968,0,1.751,0.782,1.751,1.751v6.839l8.012-8.015   c0.684-0.682,1.792-0.682,2.476,0c0.682,0.684,0.682,1.792,0,2.477L16.8,40.549h6.838v0.003c0.966,0,1.75,0.782,1.75,1.748   C25.389,43.267,24.604,44.051,23.638,44.051z M42.573,25.114c-0.968,0-1.751-0.783-1.751-1.751v-6.84l-9.013,9.013   c-0.342,0.342-0.79,0.513-1.238,0.513c-0.447,0-0.896-0.171-1.237-0.513c-0.683-0.684-0.683-1.791,0-2.475l9.011-9.012h-6.834   c-0.966,0-1.751-0.785-1.751-1.751c0-0.966,0.785-1.751,1.751-1.751h11.062c0.104,0,0.209,0.012,0.312,0.031   c0.007,0.001,0.015,0.001,0.021,0.002c0.055,0.011,0.106,0.031,0.16,0.047c0.058,0.017,0.116,0.03,0.172,0.053   c0.032,0.013,0.062,0.033,0.093,0.049c0.071,0.034,0.144,0.067,0.21,0.112c0.057,0.037,0.105,0.083,0.156,0.127   c0.037,0.031,0.077,0.057,0.112,0.091c0.047,0.047,0.083,0.101,0.124,0.152c0.03,0.039,0.066,0.074,0.094,0.115   c0.061,0.091,0.11,0.187,0.151,0.285c0.003,0.006,0.007,0.011,0.01,0.017c0.034,0.083,0.057,0.168,0.077,0.255   c0.007,0.025,0.018,0.05,0.022,0.076c0.012,0.061,0.014,0.124,0.019,0.186c0.005,0.051,0.016,0.102,0.016,0.153l0.002,11.065   C44.324,24.332,43.54,25.114,42.573,25.114z" fill="&fill_color;"/>
+</g></svg>
\ No newline at end of file
diff --git a/activities/Gears.activity/icons/view-return.svg b/activities/Gears.activity/icons/view-return.svg
new file mode 100644
index 000000000..dade2d208
--- /dev/null
+++ b/activities/Gears.activity/icons/view-return.svg
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   enable-background="new 0 0 55 55"
+   height="45"
+   version="1.1"
+   viewBox="0 0 45 45"
+   width="45"
+   x="0px"
+   xml:space="preserve"
+   y="0px"
+   id="svg2"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="view-return.svg"><metadata
+     id="metadata25"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+     id="defs23" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1024"
+     inkscape:window-height="541"
+     id="namedview21"
+     showgrid="false"
+     inkscape:zoom="4.2909091"
+     inkscape:cx="27.5"
+     inkscape:cy="27.5"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" /><g
+     display="block"
+     id="view-return"
+     transform="matrix(0.92783505,0,0,0.92783505,-2.8994845,-3.0154641)"
+     style="display:block"><g
+       id="g5"><rect
+         height="45"
+         width="45"
+         x="4.875"
+         y="5"
+         id="rect7"
+         style="fill:#ffffff;stroke:#010101;stroke-width:3.5" /><g
+         id="g9"><line
+           x1="23.573999"
+           x2="12.574"
+           y1="31.298"
+           y2="42.299"
+           id="line11"
+           style="fill:none;stroke:#010101;stroke-width:3.5;stroke-linecap:round" /><polyline
+           points="12.512,31.298 23.574,31.298      23.574,42.361    "
+           id="polyline13"
+           style="fill:none;stroke:#010101;stroke-width:3.5;stroke-linecap:round" /></g><g
+         id="g15"><line
+           x1="30.572001"
+           x2="42.571999"
+           y1="24.299"
+           y2="12.298"
+           id="line17"
+           style="fill:none;stroke:#010101;stroke-width:3.5;stroke-linecap:round" /><polyline
+           points="41.635,24.299 30.572,24.299      30.572,13.234    "
+           id="polyline19"
+           style="fill:none;stroke:#010101;stroke-width:3.5;stroke-linecap:round" /></g></g></g></svg>
\ No newline at end of file
diff --git a/activities/Gears.activity/index.html b/activities/Gears.activity/index.html
index ff088534f..8130107ed 100644
--- a/activities/Gears.activity/index.html
+++ b/activities/Gears.activity/index.html
@@ -28,10 +28,12 @@
       <button class="toolbutton" id="clear-button" title="Clear"></button>
       <button class="toolbutton" id="help-button" title="Help"></button>
       <button class="toolbutton pull-right" id="stop-button" title="Stop"></button>
+      <button class="toolbutton pull-right" id="fullscreen-button" title="Fullscreen"></button>
     </div>
     <div id="canvas">
       <canvas id="gearsketch_canvas"></canvas>
     </div>
+    <button class="toolbutton" id="unfullscreen-button" title="Unfullscreen"></button>
   </body>
 
 </html>
diff --git a/activities/Gears.activity/js/activity.js b/activities/Gears.activity/js/activity.js
index 3c69f727f..27412b05b 100644
--- a/activities/Gears.activity/js/activity.js
+++ b/activities/Gears.activity/js/activity.js
@@ -117,6 +117,22 @@ define(["sugar-web/activity/activity","sugar-web/graphics/radiobuttonsgroup","ge
             gearSketch.playDemo();
         });
 
+        // Full screen.
+        document.getElementById("fullscreen-button").addEventListener('click', function() {
+            document.getElementById("main-toolbar").style.opacity = 0;
+            document.getElementById("canvas").style.top = "0px";
+            gearSketch.canvasOffsetY = gearSketch.canvas.getBoundingClientRect().top;
+            gearSketch.updateCanvasSize();
+            document.getElementById("unfullscreen-button").style.visibility = "visible";
+        });
+        document.getElementById("unfullscreen-button").addEventListener('click', function() {
+            document.getElementById("main-toolbar").style.opacity = 1;
+            document.getElementById("canvas").style.top = "55px";
+            gearSketch.canvasOffsetY = gearSketch.canvas.getBoundingClientRect().top;
+            gearSketch.updateCanvasSize();
+            document.getElementById("unfullscreen-button").style.visibility = "hidden";
+        });
+
     });
 
 });