diff --git a/editor/locale/locale.js b/editor/locale/locale.js
index 94efab03..fabd956c 100644
--- a/editor/locale/locale.js
+++ b/editor/locale/locale.js
@@ -8,7 +8,7 @@
  */
 var put_locale = function(svgCanvas, given_param){
 	var lang_param;
-	var good_langs = ['cs','nl','en','es','fr','ro','sk'];
+	var good_langs = ['cs','de','en','es','fr','nl','ro','sk'];
 	if(given_param) {
 		lang_param = given_param;
 	} else {
diff --git a/editor/svg-editor.css b/editor/svg-editor.css
index 05c00512..c6021728 100644
--- a/editor/svg-editor.css
+++ b/editor/svg-editor.css
@@ -618,11 +618,19 @@ span.zoom_tool {
 #svg_docprops_container #svg_docprops_docprops, 
 #svg_docprops_container #svg_docprops_prefs {
 	float: left;
-	width: 220px;
+	width: 221px;
 	margin: 5px .7em; 
 	overflow: hidden;
 }
 
+#svg_docprops_container #svg_docprops_prefs {
+	float: right;
+}
+
+#svg_docprops legend {
+	max-width: 195px;
+}
+
 #svg_docprops_docprops > legend, #svg_docprops_prefs > legend {
 	font-weight: bold;
 	font-size: 1.1em;
diff --git a/editor/svg-editor.js b/editor/svg-editor.js
index 2b2b9b26..2e985990 100644
--- a/editor/svg-editor.js
+++ b/editor/svg-editor.js
@@ -2033,7 +2033,7 @@ function svg_edit_setup() {
 			{sel:'#tool_open', fn: clickOpen, evt: 'click', key: [modKey+'O', true]},
 			{sel:'#tool_source', fn: showSourceEditor, evt: 'click', key: ['U', true]},
 			{sel:'#tool_wireframe', fn: clickWireframe, evt: 'click', key: ['F', true]},
-			{sel:'#tool_source_cancel,#svg_source_overlay,#tool_docprops_cancel', fn: cancelOverlays, evt: 'click', key: ['esc', false, false]},
+			{sel:'#tool_source_cancel,#svg_source_overlay,#tool_docprops_cancel', fn: cancelOverlays, evt: 'click', key: ['esc', false, false], hidekey: true},
 			{sel:'#tool_source_save', fn: saveSourceEditor, evt: 'click'},
 			{sel:'#tool_docprops_save', fn: saveDocProperties, evt: 'click'},
 			{sel:'#tool_docprops', fn: showDocProperties, evt: 'click', key: [modKey+'I', true]},
@@ -2108,7 +2108,7 @@ function svg_edit_setup() {
 						});
 						
 						// Put shortcut in title
-						if(opts.sel) {
+						if(opts.sel && !opts.hidekey) {
 							var new_title = btn.attr('title').split('[')[0] + '[' + keyval + ']';
 							key_assocs[keyval] = opts.sel;
 							btn.attr('title', new_title);