diff --git a/!NetSurf/Resources/Sprites,ff9 b/!NetSurf/Resources/Sprites,ff9
index 7e82f4964..6a804507f 100755
Binary files a/!NetSurf/Resources/Sprites,ff9 and b/!NetSurf/Resources/Sprites,ff9 differ
diff --git a/!NetSurf/Resources/de/Messages b/!NetSurf/Resources/de/Messages
index 9b8d0f5e2..849acb75a 100644
--- a/!NetSurf/Resources/de/Messages
+++ b/!NetSurf/Resources/de/Messages
@@ -701,7 +701,7 @@ con_theme:Themes
 con_cache:Cache
 con_home:Home page
 con_inter:Interface
-con_language:Language
+con_lang:Language
 con_security:Security
 
 
diff --git a/!NetSurf/Resources/de/Templates,fec b/!NetSurf/Resources/de/Templates,fec
index b2eef5366..f9a41877c 100755
Binary files a/!NetSurf/Resources/de/Templates,fec and b/!NetSurf/Resources/de/Templates,fec differ
diff --git a/!NetSurf/Resources/en/Messages b/!NetSurf/Resources/en/Messages
index 8b8fba880..d9ab3e4de 100644
--- a/!NetSurf/Resources/en/Messages
+++ b/!NetSurf/Resources/en/Messages
@@ -700,7 +700,7 @@ con_theme:Themes
 con_cache:Cache
 con_home:Home page
 con_inter:Interface
-con_language:Language
+con_lang:Language
 con_security:Security
 
 
diff --git a/!NetSurf/Resources/en/Templates,fec b/!NetSurf/Resources/en/Templates,fec
index e7c51e864..5440595d4 100644
Binary files a/!NetSurf/Resources/en/Templates,fec and b/!NetSurf/Resources/en/Templates,fec differ
diff --git a/!NetSurf/Resources/fr/Messages b/!NetSurf/Resources/fr/Messages
index 4f8ece132..cf6ba16f8 100644
--- a/!NetSurf/Resources/fr/Messages
+++ b/!NetSurf/Resources/fr/Messages
@@ -701,7 +701,7 @@ con_theme:Themes
 con_cache:Cache
 con_home:Home page
 con_inter:Interface
-con_language:Language
+con_lang:Language
 con_security:Security
 
 
diff --git a/!NetSurf/Resources/fr/Templates,fec b/!NetSurf/Resources/fr/Templates,fec
index fd82917a2..5ba3cca84 100644
Binary files a/!NetSurf/Resources/fr/Templates,fec and b/!NetSurf/Resources/fr/Templates,fec differ
diff --git a/!NetSurf/Resources/nl/Messages b/!NetSurf/Resources/nl/Messages
index bdcf72761..b83929719 100644
--- a/!NetSurf/Resources/nl/Messages
+++ b/!NetSurf/Resources/nl/Messages
@@ -703,7 +703,7 @@ con_theme:Themes
 con_cache:Cache
 con_home:Home page
 con_inter:Interface
-con_language:Language
+con_lang:Language
 con_security:Security
 
 
diff --git a/!NetSurf/Resources/nl/Templates,fec b/!NetSurf/Resources/nl/Templates,fec
index c922942a7..358ab81bb 100644
Binary files a/!NetSurf/Resources/nl/Templates,fec and b/!NetSurf/Resources/nl/Templates,fec differ
diff --git a/riscos/configure.c b/riscos/configure.c
index bba07b289..b933b8e49 100644
--- a/riscos/configure.c
+++ b/riscos/configure.c
@@ -80,7 +80,7 @@ void ro_gui_configure_initialise(void) {
 	ro_gui_configure_register("con_home",
 			ro_gui_options_home_initialise,
 			ro_gui_wimp_event_finalise);
-	ro_gui_configure_register("con_language",
+	ro_gui_configure_register("con_lang",
 			ro_gui_options_language_initialise,
 			ro_gui_wimp_event_finalise);
 	ro_gui_configure_register("con_inter",
diff --git a/riscos/dialog.c b/riscos/dialog.c
index f2e394f40..ee159229c 100644
--- a/riscos/dialog.c
+++ b/riscos/dialog.c
@@ -249,17 +249,12 @@ wimp_window * ro_gui_dialog_load_template(const char *template_name)
 	wimp_window *window;
 	os_error *error;
 
+	/* Template names must be <= 11 chars long */
+	assert(strlen(template_name) <= 11);
+
 	/* wimp_load_template won't accept a const char * */
 	strncpy(name, template_name, sizeof name);
 
-	/* there is an OS bug such that wimp_load_template with a 12 character
-	 * name will sometimes fail. to work around it we truncate such names to a
-	 * 10 character wildcarded name, eg 'con_language' -> 'con_langua*' */
-	if (strlen(template_name) > 11) {
-		name[10] = '*';
-		name[11] = '\0';
-	}
-
 	/* find required buffer sizes */
 	error = xwimp_load_template(wimp_GET_SIZE, 0, 0, wimp_NO_FONTS,
 			name, 0, &window_size, &data_size, &context);
@@ -283,12 +278,6 @@ wimp_window * ro_gui_dialog_load_template(const char *template_name)
 		die("NoMemory");
 	}
 
-	/* the OS has updated our name, so we reset it back if required*/
-	if (strlen(template_name) > 11) {
-		name[10] = '*';
-		name[11] = '\0';
-	}
-
 	/* load template */
 	error = xwimp_load_template(window, data, data + data_size,
 			wimp_NO_FONTS, name, 0, 0, 0, 0);