diff --git a/editor/svg-editor.css b/editor/svg-editor.css
index c6021728..842d8485 100644
--- a/editor/svg-editor.css
+++ b/editor/svg-editor.css
@@ -270,7 +270,7 @@ body {
 	stroke: #000;
 	stroke-width: 1px;
 	stroke-opacity: 1.0;
-	stroke-dasharray: none;
+	stroke-dasharray: 0;
 	opacity: 1;
 	pointer-events: stroke;
 	vector-effect: non-scaling-stroke;
diff --git a/editor/svg-editor.html b/editor/svg-editor.html
index 711b547d..364079f4 100644
--- a/editor/svg-editor.html
+++ b/editor/svg-editor.html
@@ -197,23 +197,31 @@ script type="text/javascript" src="locale/locale.min.js"></script-->
   </div>
 
 	<div id="circle_panel">
-		<label class="circle_tool">cx:</label>
-		<input id="circle_cx" class="circle_tool attr_changer" title="Change circle's cx coordinate" size="3" data-attr="cx"/>
-		<label class="circle_tool">cy:</label>
-		<input id="circle_cy" class="circle_tool attr_changer" title="Change circle's cy coordinate" size="3" data-attr="cy"/>
-		<label class="circle_tool">r:</label>
-		<input id="circle_r" class="circle_tool attr_changer" title="Change circle's radius" size="3" data-attr="r"/>
+		<div class="toolset">
+			<label class="circle_tool">cx:</label>
+			<input id="circle_cx" class="circle_tool attr_changer" title="Change circle's cx coordinate" size="3" data-attr="cx"/>
+			<label class="circle_tool">cy:</label>
+			<input id="circle_cy" class="circle_tool attr_changer" title="Change circle's cy coordinate" size="3" data-attr="cy"/>
+		</div>
+		<div class="toolset">
+			<label class="circle_tool">r:</label>
+			<input id="circle_r" class="circle_tool attr_changer" title="Change circle's radius" size="3" data-attr="r"/>
+		</div>
 	</div>
 
 	<div id="ellipse_panel">
-		<label class="ellipse_tool">cx:</label>
-		<input id="ellipse_cx" class="ellipse_tool attr_changer" title="Change ellipse's cx coordinate" size="3" data-attr="cx"/>
-		<label class="ellipse_tool">cy:</label>
-		<input id="ellipse_cy" class="ellipse_tool attr_changer" title="Change ellipse's cy coordinate" size="3" data-attr="cy"/>
-		<label class="ellipse_tool">rx:</label>
-		<input id="ellipse_rx" class="ellipse_tool attr_changer" title="Change ellipse's x radius" size="3" data-attr="rx"/>
-		<label class="ellipse_tool">ry:</label>
-		<input id="ellipse_ry" class="ellipse_tool attr_changer" title="Change ellipse's y radius" size="3" data-attr="ry"/>
+		<div class="toolset">
+			<label class="ellipse_tool">cx:</label>
+			<input id="ellipse_cx" class="ellipse_tool attr_changer" title="Change ellipse's cx coordinate" size="3" data-attr="cx"/>
+			<label class="ellipse_tool">cy:</label>
+			<input id="ellipse_cy" class="ellipse_tool attr_changer" title="Change ellipse's cy coordinate" size="3" data-attr="cy"/>
+			</div>
+		<div class="toolset">
+			<label class="ellipse_tool">rx:</label>
+			<input id="ellipse_rx" class="ellipse_tool attr_changer" title="Change ellipse's x radius" size="3" data-attr="rx"/>
+			<label class="ellipse_tool">ry:</label>
+			<input id="ellipse_ry" class="ellipse_tool attr_changer" title="Change ellipse's y radius" size="3" data-attr="ry"/>
+		</div>
 	</div>
 
 	<div id="line_panel">
diff --git a/editor/svgicons/jquery.svgicons.js b/editor/svgicons/jquery.svgicons.js
index 998a649c..536eba87 100644
--- a/editor/svgicons/jquery.svgicons.js
+++ b/editor/svgicons/jquery.svgicons.js
@@ -344,8 +344,8 @@ $(function() {
 				var id = this.id;
 				var no_dupes = ($(svgdoc).find('#' + id).length <= 1);
 				if(isOpera) no_dupes = false; // Opera didn't clone svg_el, so not reliable
-				if(!force && no_dupes) return;
-				var new_id = id + svg_num + i;
+				// if(!force && no_dupes) return;
+				var new_id = 'x' + id + svg_num + i;
 				$(this).attr('id', new_id);			
 	
 				svg_el.find('[fill="url(#' + id + ')"]').each(function() {