diff --git a/editor/extensions/ext-imagelib.js b/editor/extensions/ext-imagelib.js
index e2418687..d289f3a2 100644
--- a/editor/extensions/ext-imagelib.js
+++ b/editor/extensions/ext-imagelib.js
@@ -183,6 +183,8 @@ svgEditor.addExtension("imagelib", function() {
 					background: white;\
 					margin: 0;\
 					padding: 0;\
+				}\
+				#imgbrowse > ul {\
 					overflow: auto;\
 				}\
 				#imgbrowse li {\
diff --git a/editor/svg-editor.js b/editor/svg-editor.js
index 388640a6..d71dd3fa 100644
--- a/editor/svg-editor.js
+++ b/editor/svg-editor.js
@@ -2495,7 +2495,12 @@
 			}
 			
 			var setIcon = Editor.setIcon = function(elem, icon_id, forcedSize) {
-				var icon = (typeof icon_id == 'string') ? $.getSvgIcon(icon_id).clone() : icon_id.clone();
+				var icon = (typeof icon_id == 'string') ? $.getSvgIcon(icon_id) : icon_id;
+				if(!icon) {
+					console.log('NOTE: Icon image missing: ' + icon_id);
+					return;
+				}
+				icon = icon.clone();
 				$(elem).empty().append(icon);
 				if(forcedSize) {
 					var obj = {};
diff --git a/editor/svgcanvas.js b/editor/svgcanvas.js
index cbd5c84c..73c415b8 100644
--- a/editor/svgcanvas.js
+++ b/editor/svgcanvas.js
@@ -5564,7 +5564,9 @@ var pathActions = this.pathActions = function() {
 		8: ['x','y','x1','y1'],
 		10: ['x','y','r1','r2','angle','largeArcFlag','sweepFlag'],
 		12: ['x'],
-		14: ['y']
+		14: ['y'],
+		16: ['x','y','x2','y2'],
+		18: ['x','y']
 	};
 	
 	function retPath() {
diff --git a/editor/svgicons/jquery.svgicons.js b/editor/svgicons/jquery.svgicons.js
index 2db257ea..0791d6f4 100644
--- a/editor/svgicons/jquery.svgicons.js
+++ b/editor/svgicons/jquery.svgicons.js
@@ -172,7 +172,9 @@ $(function() {
 								$(function() {
 									getIcons('ajax');
 								});							
-							} 
+							} else {
+								$(useFallback);
+							}
 						}
 					}
 				});