diff --git a/editor/images/wireframe.png b/editor/images/wireframe.png
new file mode 100644
index 00000000..89db7e9e
Binary files /dev/null and b/editor/images/wireframe.png differ
diff --git a/editor/svg-editor.css b/editor/svg-editor.css
index 8375ee5e..9d92acfe 100644
--- a/editor/svg-editor.css
+++ b/editor/svg-editor.css
@@ -246,6 +246,21 @@ body {
 	left: 2px;
 }
 
+#workarea.wireframe #svgzoom * {
+	fill: none;
+	stroke: #000;
+	stroke-width: 1px;
+	stroke-opacity: 1.0;
+	stroke-dasharray: none;
+	opacity: 1;
+	pointer-events: stroke;
+}
+
+#workarea.wireframe #svgzoom text {
+	fill: #000;
+	stroke: none;
+}
+
 /* TODO: fix this */
 div.color_block {
 	background-image: url('images/none.png');
diff --git a/editor/svg-editor.html b/editor/svg-editor.html
index f0c388f8..f4af44db 100644
--- a/editor/svg-editor.html
+++ b/editor/svg-editor.html
@@ -89,6 +89,7 @@ script type="text/javascript" src="locale/locale.min.js"></script-->
 		<img class="push_button" id="tool_save" src="images/save.png" title="Save Image [S]" alt="Save"/>
 		<img class="push_button" id="tool_docprops" src="images/document-properties.png" title="Document Properties [I]"/>
 		<img class="push_button" id="tool_source" src="images/source.png" title="Edit Source [U]" alt="Source"/>
+		<img class="tool_button" id="tool_wireframe" src="images/wireframe.png" title="Wireframe Mode [F]" alt="Wireframe"/>
 	</div>
 
     <!-- History buttons -->
diff --git a/editor/svg-editor.js b/editor/svg-editor.js
index 83d488d1..bbb8e9a4 100644
--- a/editor/svg-editor.js
+++ b/editor/svg-editor.js
@@ -807,6 +807,11 @@ function svg_edit_setup() {
 		svgCanvas.setZoom(multiplier);
 	};
 
+	var clickWireframe = function() {
+		 $('#tool_wireframe').toggleClass('push_button_pressed');
+		$('#workarea').toggleClass('wireframe');
+	}
+
 	var showSourceEditor = function(){
 		if (editingsource) return;
 		editingsource = true;
@@ -923,6 +928,7 @@ function svg_edit_setup() {
 	$('#tool_save').click(clickSave);
 	$('#tool_open').click(clickOpen);
 	$('#tool_source').click(showSourceEditor);
+	$('#tool_wireframe').click(clickWireframe);
 	$('#tool_source_cancel,#svg_source_overlay,#tool_docprops_cancel').click(cancelOverlays);
 	$('#tool_source_save').click(saveSourceEditor);
 	$('#tool_docprops_save').click(saveDocProperties);
@@ -1027,6 +1033,7 @@ function svg_edit_setup() {
 			[modKey+'i', function(evt){showDocProperties();evt.preventDefault();}],
 			[modKey+'c', function(evt){clickClone();evt.preventDefault();}],
 			[modKey+'g', function(evt){clickGroup();evt.preventDefault();}],
+			[modKey+'f', function(evt){clickWireframe();evt.preventDefault();}],
 			[modKey+'x', function(evt){toggleSidePanel();}],
 			['esc', cancelOverlays, false],
 		];