diff --git a/editor/svg-editor.css b/editor/svg-editor.css
index 5b25747a..63523b8d 100644
--- a/editor/svg-editor.css
+++ b/editor/svg-editor.css
@@ -383,6 +383,7 @@
 	top: 75px;
 	left: 0;
 	padding-left: 2px;
+	background: #D8D8D8; /* Needed so flyout icons don't appear on the left */
 	z-index: 4;
 }
 
@@ -466,17 +467,13 @@
 }
 
 
-.magic_field > * {
-	float: left;
-}
-
 span.zoom_tool {
 	line-height: 26px;
 	padding: 3px;
 }
 
-.magic_field input {
-	margin-top: 5px;
+#zoom_panel label {
+	margin-top: 2px;
 }
 
 .dropdown {
diff --git a/editor/svg-editor.html b/editor/svg-editor.html
index e56c32dd..38c6d276 100644
--- a/editor/svg-editor.html
+++ b/editor/svg-editor.html
@@ -380,9 +380,11 @@ script type="text/javascript" src="locale/locale.min.js"></script-->
 <div id="tools_bottom" class="tools_panel">
 
     <!-- Zoom buttons -->
-	<div id="zoom_panel" class="magic_field">
-		<span id="zoomLabel" class="zoom_tool label">zoom:</span>
+	<div id="zoom_panel" class="toolset">
+		<label>
+		<span id="zoomLabel" class="zoom_tool">zoom:</span>
 		<input id="zoom" title="Change zoom level" size="3" value="100" type="text" />
+		</label>
 		<div id="zoom_dropdown" class="dropdown">
 			<button></button>
 			<ul>
diff --git a/editor/svg-editor.js b/editor/svg-editor.js
index bd71c7c9..2f04b4ad 100644
--- a/editor/svg-editor.js
+++ b/editor/svg-editor.js
@@ -200,7 +200,7 @@
 			
 			// Load extensions
 			// Bit of a hack to run extensions in local Opera
-			if(window.opera && document.location.href.indexOf('http') !== 0) {
+			if(window.opera && document.location.protocol === 'file:') {
 				setTimeout(extFunc, 1000);
 			} else {
 				extFunc();
@@ -2038,6 +2038,7 @@
 					".tool_button,\
 					.push_button,\
 					.tool_button_current,\
+					.push_button_pressed,\
 					.disabled,\
 					.tools_flyout .tool_button": {
 						'width': {s: '16px', l: '32px', xl: '48px'},
@@ -2063,11 +2064,11 @@
 					"div#workarea": {
 						'left': {s: '27px', l: '46px', xl: '65px'},
 						'top': {s: '50px', l: '88px', xl: '125px'},
-						'bottom': {s: '55px', l: '70px', xl: '77px'}
+						'bottom': {s: '55px', l: '98px', xl: '145px'}
 					},
 					"#tools_bottom": {
 						'left': {s: '27px', l: '46px', xl: '65px'},
-						'height': {s: '58px', l: '70px', xl: '77px'}
+						'height': {s: '58px', l: '98px', xl: '145px'}
 					},
 					"#color_tools": {
 						'border-spacing': {s: '0 1px'}
@@ -2076,7 +2077,8 @@
 						'height': {s: '20px'}
 					},
 					"#tool_opacity": {
-						'top': {s: '1px'}
+						'top': {s: '1px'},
+						'height': {s: 'auto', l:'auto', xl:'auto'}
 					},
 					"#tools_top input, #tools_bottom input": {
 						'margin-top': {s: '2px', l: '4px', xl: '5px'},