diff --git a/indra/newview/skins/default/xui/de/floater_preferences.xml b/indra/newview/skins/default/xui/de/floater_preferences.xml
index 2d6e3cb379..efadcaf7bc 100644
--- a/indra/newview/skins/default/xui/de/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/de/floater_preferences.xml
@@ -17,5 +17,6 @@
 		<panel label="Benutzerinterface" name="starlightUI1"/>
 		<panel label="Oberflächendesign" name="skins"/>
 		<panel label="Firestorm" name="firestorm"/>
+		<panel label="Grids" name="grids"/>
 	</tab_container>
 </floater>
diff --git a/indra/newview/skins/default/xui/de/panel_login.xml b/indra/newview/skins/default/xui/de/panel_login.xml
index 65bbaaac92..83e773f919 100644
--- a/indra/newview/skins/default/xui/de/panel_login.xml
+++ b/indra/newview/skins/default/xui/de/panel_login.xml
@@ -34,6 +34,7 @@
 			<text name="grid_selection_text">
 				Gridauswahl:
 			</text>
+			<button label="Grid-Manager" name="grids_btn"/>
 		</layout_panel>
 		<layout_panel name="links">
 			<text name="create_new_account_text">
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_grids.xml b/indra/newview/skins/default/xui/de/panel_preferences_grids.xml
new file mode 100644
index 0000000000..f22aefb175
--- /dev/null
+++ b/indra/newview/skins/default/xui/de/panel_preferences_grids.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel label="Grids" name="grids_panel">
+	<text name="grid_selector_label">
+		Gridauswahl:
+	</text>
+	<button label="Standard" label_selected="Standard" name="btn_default"/>
+	<button label="Löschen" label_selected="Löschen" name="btn_delete"/>
+	<button label="Neu" label_selected="Neu" name="btn_new"/>
+	<button label="Kopieren" label_selected="Kopieren" name="btn_copy"/>
+	<button label="Erweitert" label_selected="Erweitert" name="btn_advanced"/>
+	<text name="loginuri_label">
+		Login-URI:
+	</text>
+	<button label="Hinzufügen" label_selected="Hinzufügen" name="btn_add"/>
+	<text name="gridname_label">
+		Gridname:
+	</text>
+	<text name="gridmessage_label">
+		Gridinformation:
+	</text>
+	<text name="loginpage_label">
+		Loginseite:
+	</text>
+	<text name="helperuri_label">
+		Helper-URL:
+	</text>
+	<text name="website_label">
+		Website:
+	</text>
+	<text name="support_label">
+		Support-URL:
+	</text>
+	<text name="register_label">
+		Konto-URL:
+	</text>
+	<text name="password_label">
+		Passwort-URL:
+	</text>
+	<text name="search_label">
+		URL für Suche:
+	</text>
+	<check_box label="Rendering-Kompatibilität" name="render_compat"/>
+</panel>
diff --git a/indra/newview/skins/starlightcui/xui/de/floater_preferences.xml b/indra/newview/skins/starlightcui/xui/de/floater_preferences.xml
index df4f4894a9..a2b033d6ae 100644
--- a/indra/newview/skins/starlightcui/xui/de/floater_preferences.xml
+++ b/indra/newview/skins/starlightcui/xui/de/floater_preferences.xml
@@ -18,12 +18,6 @@
 		<panel label="Benutzerinterface" name="starlightUI1"/>
 		<panel label="Oberflächendesign" name="skins"/>
 		<panel label="Firestorm" name="firestorm"/>
-    <panel
-      class="panel_preference_grids"
-      filename="panel_preferences_grids.xml"
-      label="Grids"
-      layout="topleft"
-      help_topic="preferences_grids_tab"
-      name="grids" />
+		<panel label="Grids" name="grids"/>
 	</tab_container>
 </floater>