diff --git a/editor/svg-editor.css b/editor/svg-editor.css
index 0d99975e..698932f5 100644
--- a/editor/svg-editor.css
+++ b/editor/svg-editor.css
@@ -734,6 +734,7 @@ span.zoom_tool {
 
 #tool_docprops_back {
 	margin-left: 1em;
+	overflow: auto;
 }
 
 #svg_docprops_container #svg_docprops_docprops, 
diff --git a/editor/svg-editor.html b/editor/svg-editor.html
index d6ffa13d..fdd8f831 100644
--- a/editor/svg-editor.html
+++ b/editor/svg-editor.html
@@ -312,7 +312,10 @@ script type="text/javascript" src="locale/locale.min.js"></script-->
 		</div>
 		
 		<div class="toolset" id="tool_font_family">
-			<input id="font_family" type="text" title="Change Font Family" size="12"/>
+			<label>
+				<!-- Font family -->
+				<input id="font_family" type="text" title="Change Font Family" size="12"/>
+			</label>
 			<div id="font_family_dropdown" class="dropdown">
 				<button></button>
 				<ul>
@@ -329,7 +332,10 @@ script type="text/javascript" src="locale/locale.min.js"></script-->
 			<span id="font_sizeLabel">size:</span>
 			<input id="font_size" title="Change Font Size" size="3" value="0" type="text"/>
 		</label>
-		<input id="text" type="text" title="Change text contents" size="35"/>
+		<label>
+			<!-- Text content -->
+			<input id="text" type="text" title="Change text contents" size="35"/>
+		</label>
 	</div>
 	
 	<div id="path_node_panel">
diff --git a/editor/svg-editor.js b/editor/svg-editor.js
index ffba4c64..6f09a599 100644
--- a/editor/svg-editor.js
+++ b/editor/svg-editor.js
@@ -1737,7 +1737,7 @@ function svg_edit_setup() {
 				'margin-top': {s: '2px', l: '4px', xl: '5px'},
 				'height': {s: 'auto', l: 'auto', xl: 'auto'},
 				'border': {s: '1px solid #555', l: 'auto', xl: 'auto'},
-				'font-size': {s: '.9em', l: '2em', xl: '2.5em'}
+				'font-size': {s: '.9em', l: '1.2em', xl: '1.4em'}
 			},
 			"#zoom_panel": {
 				'margin-top': {s: '3px', l: '4px', xl: '5px'}
@@ -1757,11 +1757,13 @@ function svg_edit_setup() {
 				'line-height': {s: '18px', l: '34px', xl: '40px'},
 				'margin-top': {s: '3px'}
 			},
-			"div.toolset, #tools_top label, #tools_bottom label": {
+			"#tools_top label, #tools_bottom label": {
 				'font-size': {s: '1em', l: '1.5em', xl: '2em'},
-				'margin-top': {s: '1px', l: '3px', xl: '5px'},
-				'height': {s: '25px', l: '43px', xl: '64px'}
+				'height': {s: '25px', l: '42px', xl: '64px'}
 			}, 
+			"div.toolset": {
+				'height': {s: '25px', l: '42px', xl: '64px'}
+			},
 			"#tool_bold, #tool_italic": {
 				'font-size': {s: '1.5em', l: '3em', xl: '4.5em'}
 			},