diff --git a/indra/newview/skins/default/xui/de/panel_preferences_grids.xml b/indra/newview/skins/default/xui/de/panel_preferences_grids.xml
index f22aefb175..34dce348d6 100644
--- a/indra/newview/skins/default/xui/de/panel_preferences_grids.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_grids.xml
@@ -1,43 +1,45 @@
 <?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 name="layoutfix">
+		<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>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_grids.xml b/indra/newview/skins/default/xui/en/panel_preferences_grids.xml
index eeee045de9..7e75940d7a 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_grids.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_grids.xml
@@ -9,252 +9,261 @@
  width="540"
  label="Grids"
  name="grids_panel">
-  <!-- Grid Selector -->
-  <text 
-    type="string"
-    length="1"
-    name="grid_selector_label"
+	<panel
+	 name="layoutfix"
+	 layout="topleft"
+	 top="0"
+	 left="0"
+	 height="440"
+	 width="540">
+	  <!-- Grid Selector -->
+	  <text 
+		type="string"
+		length="1"
+		name="grid_selector_label"
 		height="15"
-    width="200"
-    left="30"
-    bottom="-30"
+		width="100"
+		left="30"
+		top_pad="10"
 		follows="left|top" >
-    Select a grid:
-  </text>
-  <combo_box 
-    max_chars="20"
-    allow_text_entry="false"
-    name="grid_selector"
+		Select a grid:
+	  </text>
+	  <combo_box 
+		max_chars="20"
+		allow_text_entry="false"
+		name="grid_selector"
 		height="23"
-    width="200"
-    bottom_delta="-2"
-    left="160" />
-  <button 
-    label="Default"
-    label_selected="Default"
-    name="btn_default"
-    height="23"
-    width="75"
-    left_delta="210"
-    bottom_delta="0"
-    halign="center"
-    follows="left|top" />
-  <text
-    type="string"
-    length="1"
-    name="default_grid"
-    height="15"
-    width="200"
-    left_delta="85"
-    bottom_delta="2"
-    follows="left|top" >
-    ([DEFAULT])
-  </text>
-  <!-- Buttons -->
-  <button 
-    label="Delete"
-    label_selected="Delete"
-    name="btn_delete"
+		width="200"
+		top_delta="-2"
+		left="160" />
+	  <button 
+		label="Default"
+		label_selected="Default"
+		name="btn_default"
 		height="23"
-    width="75"
-    left="160"
-    bottom_delta="-27"
+		width="75"
+		left_delta="210"
 		halign="center"
+		top_delta="0"
 		follows="left|top" />
-  <button
-    label="New"
-    label_selected="New"
-    enabled="true"
-    name="btn_new"
-		height="23"
-    width="75"
-    left_delta="78"
-    bottom_delta="0"
-		halign="center"
-		follows="left|top" />
-  <!--
-  <button
-    label="Copy"
-    label_selected="Copy"
-    enabled="true"
-    name="btn_copy"
-		height="23"
-    width="75"
-    left_delta="78"
-    bottom_delta="0"
-		halign="center"
-		follows="left|top" />
-  -->
-  <!-- Advanced -->
-  <button
-    label="Advanced"
-    label_selected="Advanced"
-    name="btn_advanced"
-		height="23"
-    width="75"
-    left_delta="78"
-    bottom_delta="0"
-		halign="center"
-		follows="left|top" />
-  <!-- Login URI -->
-  <text
-    type="string"
-    length="1"
-    name="loginuri_label"
+	  <text
+		type="string"
+		length="1"
+		name="default_grid"
 		height="15"
-    width="100"
-    left="30"
-    bottom_delta="-32"
+		width="150"
+		left="370"
+		top_pad="5"
+		follows="left|top" >
+		([DEFAULT])
+	  </text>
+	  <!-- Buttons -->
+	  <button 
+		label="Delete"
+		label_selected="Delete"
+		name="btn_delete"
+		height="23"
+		width="75"
+		left="160"
+		top_pad="5"
+		halign="center"
+		follows="left|top" />
+	  <button
+		label="New"
+		label_selected="New"
+		enabled="true"
+		name="btn_new"
+		height="23"
+		width="75"
+		left_delta="78"
+		top_delta="0"
+		halign="center"
+		follows="left|top" />
+	  <!--
+	  <button
+		label="Copy"
+		label_selected="Copy"
+		enabled="true"
+		name="btn_copy"
+		height="23"
+		width="75"
+		left_delta="78"
+		top_delta="0"
+		halign="center"
+		follows="left|top" />
+	  -->
+	  <!-- Advanced -->
+	  <button
+		label="Advanced"
+		label_selected="Advanced"
+		name="btn_advanced"
+		height="23"
+		width="75"
+		left_delta="78"
+		top_delta="0"
+		halign="center"
+		follows="left|top" />
+	  <!-- Login URI -->
+	  <text
+		type="string"
+		length="1"
+		name="loginuri_label"
+		height="15"
+		width="100"
+		left="30"
+		top_pad="10"
 		follows="left|top">
-    Login URI:
-  </text>
-  <line_editor
-    max_length="254"
-    enabled="true"
-    name="loginuri"
+		Login URI:
+	  </text>
+	  <line_editor
+		max_length="254"
+		enabled="true"
+		name="loginuri"
 		handle_edit_keys_directly="true"
 		height="23"
-    left="160"
-    right="-12"
-    bottom_delta="-2"
+		left="160"
+		right="-12"
+		top_delta="-5"
 		halign="right"
 		follows="left|top|right" />
-  <button
-    label="Add"
-    label_selected="Add"
-    name="btn_add"
+	  <button
+		label="Add"
+		label_selected="Add"
+		name="btn_add"
 		height="23"
-    width="100"
-    left="160"
+		width="100"
+		left="160"
+		top_pad="5"
 		halign="center"
 		follows="left|top" />
-  <!-- Grid Name -->
-  <text
-    type="string"
-    length="1"
-    name="gridname_label"
+	  <!-- Grid Name -->
+	  <text
+		type="string"
+		length="1"
+		name="gridname_label"
 		height="15"
-    width="100"
-    left="30"
-    bottom_delta="-40"
+		width="100"
+		left="30"
+		top_pad="10"
 		follows="left|top">
-    Grid Name:
-  </text>
-  <line_editor
-    max_length="254"
-    enabled="false"
-    name="gridname"
+		Grid Name:
+	  </text>
+	  <line_editor
+		max_length="254"
+		enabled="false"
+		name="gridname"
 		handle_edit_keys_directly="true"
 		height="23"
-    left="160"
-    right="-12"
-    bottom_delta="-2"
+		left="160"
+		right="-12"
+		top_delta="-5"
 		halign="right"
 		follows="left|top|right" />
-  <!-- Grid Message -->
-  <text type="string" length="1" enabled="false" name="gridmessage_label"
-		height="15" width="100" left="30" bottom_delta="-50"
-		h_pad="0" v_pad="0" halign="left"
-		follows="left|top" >
-    Grid Info:
-  </text>
-  <text_editor name="gridmessage" type="string" length="1" bottom="-185" embedded_items="false" enabled="true" follows="left|top|right"
-	     handle_edit_keys_directly="true"
-       height="50" left="161" right="-13" bottom_delta="-3" max_length="512" />
-       
-  <!-- Advanced settings -->
+	  <!-- Grid Message -->
+	  <text type="string" length="1" enabled="false" name="gridmessage_label"
+			height="15" width="100" left="30" top_pad="8"
+			h_pad="0" v_pad="0" halign="left"
+			follows="left|top" >
+		Grid Info:
+	  </text>
+	  <text_editor name="gridmessage" type="string" length="1" embedded_items="false" enabled="true" follows="left|top|right"
+			 handle_edit_keys_directly="true"
+		   height="50" left="161" right="-13" top_delta="-3" max_length="512" />
+		   
+	  <!-- Advanced settings -->
 
-  <!-- Grid Splash Page -->
-  <text type="string" length="1" enabled="false" name="loginpage_label"
-		height="15" width="100" left="30" bottom_delta="-22" visible="false"
-		h_pad="0" v_pad="0" halign="left"
-		follows="left|top" >
-    Splash Page:
-  </text>
-  <line_editor max_length="254" enabled="false" name="loginpage"
-		handle_edit_keys_directly="true" visible="false"
-		height="23" left="160" right="-12" bottom_delta="-4"
-		halign="right"
-		follows="left|top|right" />
-  <!-- Helper URI -->
-  <text type="string" length="1" enabled="false" name="helperuri_label"
-		height="15" width="100" left="30" bottom_delta="-20" visible="false"
-		h_pad="0" v_pad="0" halign="left"
-		follows="left|top" >
-    Helper URL:
-  </text>
-  <line_editor max_length="254" enabled="false" name="helperuri"
-		handle_edit_keys_directly="true" visible="false"
-		height="23" left="160" right="-12" bottom_delta="-4"
-		halign="right"
-		follows="left|top|right" />
-  <!-- Web Site -->
-  <text type="string" length="1" enabled="false" name="website_label"
-  height="15" width="100" left="30" bottom_delta="-20" visible="false"
-  h_pad="0" v_pad="0" halign="left"
-  follows="left|top" >
-    Web Site:
-  </text>
-  <line_editor max_length="254" enabled="false" name="website"
-  handle_edit_keys_directly="true" visible="false"
-  height="23" left="160" right="-12" bottom_delta="-4"
-  halign="right"
-  follows="left|top|right" />
-  <!-- Support URL -->
-  <text type="string" length="1" enabled="false" name="support_label"
-  height="15" width="100" left="30" bottom_delta="-20" visible="false"
-  h_pad="0" v_pad="0" halign="left"
-  follows="left|top" >
-    Support URL:
-  </text>
-  <line_editor max_length="254" enabled="false" name="support"
-  handle_edit_keys_directly="true" visible="false"
-  height="23" left="160" right="-12" bottom_delta="-4"
-  halign="right"
-  follows="left|top|right" />
-  <!-- Account URL -->
-  <text type="string" length="1" enabled="false" name="register_label"
-  height="15" width="100" left="30" bottom_delta="-20" visible="false"
-  h_pad="0" v_pad="0" halign="left"
-  follows="left|top" >
-    Account URL:
-  </text>
-  <line_editor max_length="254" enabled="false" name="register"
-  handle_edit_keys_directly="true" visible="false"
-  height="23" left="160" right="-12" bottom_delta="-4"
-  halign="right"
-  follows="left|top|right" />
-  <!-- Password URL -->
-  <text type="string" length="1" enabled="false" name="password_label"
-  height="15" width="100" left="30" bottom_delta="-20" visible="false"
-  h_pad="0" v_pad="0" halign="left"
-  follows="left|top" >
-    Password URL:
-  </text>
-  <line_editor max_length="254" enabled="false" name="password"
-  handle_edit_keys_directly="true" visible="false"
-  height="23" left="160" right="-12" bottom_delta="-4"
-  halign="right"
-  follows="left|top|right" />
-  <!-- Search URL -->
-  <text type="string" length="1" enabled="false" name="search_label"
-  height="15" width="100" left="30" bottom_delta="-20" visible="false"
-  h_pad="0" v_pad="0" halign="left"
-  follows="left|top" >
-    Search URL:
-  </text>
-  <line_editor max_length="254" enabled="false" name="search"
-  handle_edit_keys_directly="true" visible="false"
-  height="23" left="160" right="-12" bottom_delta="-4"
-  halign="right"
-  follows="left|top|right" />
-  <!-- Rendering Compatibility -->
-  <check_box enabled="true" radio_style="false"
-		label="Rendering Compatibility" name="render_compat" visible="false"
-		height="23" left="160" bottom_delta="-35"
-		h_pad="0" v_pad="0" halign="left"
-		follows="left|top" />
-  <button label="?" label_selected="?" enabled="true" name="btn_help_render_compat"
-		height="23" width="23" left_delta="205" bottom_delta="-1" visible="false"
-		halign="center" follows="left|top" />
-</panel>
+	  <!-- Grid Splash Page -->
+	  <text type="string" length="1" enabled="false" name="loginpage_label"
+			height="15" width="100" left="30" top_pad="10" visible="false"
+			h_pad="0" v_pad="0" halign="left"
+			follows="left|top" >
+		Splash Page:
+	  </text>
+	  <line_editor max_length="254" enabled="false" name="loginpage"
+			handle_edit_keys_directly="true" visible="false"
+			height="23" left="160" right="-12" top_delta="-5"
+			halign="right"
+			follows="left|top|right" />
+	  <!-- Helper URI -->
+	  <text type="string" length="1" enabled="false" name="helperuri_label"
+			height="15" width="100" left="30" top_pad="8" visible="false"
+			h_pad="0" v_pad="0" halign="left"
+			follows="left|top" >
+		Helper URL:
+	  </text>
+	  <line_editor max_length="254" enabled="false" name="helperuri"
+			handle_edit_keys_directly="true" visible="false"
+			height="23" left="160" right="-12" top_delta="-5"
+			halign="right"
+			follows="left|top|right" />
+	  <!-- Web Site -->
+	  <text type="string" length="1" enabled="false" name="website_label"
+	  height="15" width="100" left="30" top_pad="8" visible="false"
+	  h_pad="0" v_pad="0" halign="left"
+	  follows="left|top" >
+		Web Site:
+	  </text>
+	  <line_editor max_length="254" enabled="false" name="website"
+	  handle_edit_keys_directly="true" visible="false"
+	  height="23" left="160" right="-12" top_delta="-5"
+	  halign="right"
+	  follows="left|top|right" />
+	  <!-- Support URL -->
+	  <text type="string" length="1" enabled="false" name="support_label"
+	  height="15" width="100" left="30" top_pad="8" visible="false"
+	  h_pad="0" v_pad="0" halign="left"
+	  follows="left|top" >
+		Support URL:
+	  </text>
+	  <line_editor max_length="254" enabled="false" name="support"
+	  handle_edit_keys_directly="true" visible="false"
+	  height="23" left="160" right="-12" top_delta="-5"
+	  halign="right"
+	  follows="left|top|right" />
+	  <!-- Account URL -->
+	  <text type="string" length="1" enabled="false" name="register_label"
+	  height="15" width="100" left="30" top_pad="8" visible="false"
+	  h_pad="0" v_pad="0" halign="left"
+	  follows="left|top" >
+		Account URL:
+	  </text>
+	  <line_editor max_length="254" enabled="false" name="register"
+	  handle_edit_keys_directly="true" visible="false"
+	  height="23" left="160" right="-12" top_delta="-5"
+	  halign="right"
+	  follows="left|top|right" />
+	  <!-- Password URL -->
+	  <text type="string" length="1" enabled="false" name="password_label"
+	  height="15" width="100" left="30" top_pad="8" visible="false"
+	  h_pad="0" v_pad="0" halign="left"
+	  follows="left|top" >
+		Password URL:
+	  </text>
+	  <line_editor max_length="254" enabled="false" name="password"
+	  handle_edit_keys_directly="true" visible="false"
+	  height="23" left="160" right="-12" top_delta="-5"
+	  halign="right"
+	  follows="left|top|right" />
+	  <!-- Search URL -->
+	  <text type="string" length="1" enabled="false" name="search_label"
+	  height="15" width="100" left="30" top_pad="8" visible="false"
+	  h_pad="0" v_pad="0" halign="left"
+	  follows="left|top" >
+		Search URL:
+	  </text>
+	  <line_editor max_length="254" enabled="false" name="search"
+	  handle_edit_keys_directly="true" visible="false"
+	  height="23" left="160" right="-12" top_delta="-5"
+	  halign="right"
+	  follows="left|top|right" />
+	  <!-- Rendering Compatibility -->
+	  <check_box enabled="true" radio_style="false"
+			label="Rendering Compatibility" name="render_compat" visible="false"
+			height="23" left="160" top_pad="5"
+			h_pad="0" v_pad="0" halign="left"
+			follows="left|top" />
+	  <button label="?" label_selected="?" enabled="true" name="btn_help_render_compat"
+			height="23" width="23" left_delta="205" top_delta="0" visible="false"
+			halign="center" follows="left|top" />
+	</panel>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_grids.xml b/indra/newview/skins/default/xui/pl/panel_preferences_grids.xml
index b9a62cb88f..a34ffcd024 100644
--- a/indra/newview/skins/default/xui/pl/panel_preferences_grids.xml
+++ b/indra/newview/skins/default/xui/pl/panel_preferences_grids.xml
@@ -1,42 +1,44 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel label="Siatki" name="grids_panel">
-  <text name="grid_selector_label">
-    Wybierz siatkę:
-  </text>
-  <button label="Domyślna" label_selected="Domyślna" name="btn_default" />
-  <button label="Usuń" label_selected="Usuń" name="btn_delete" />
-  <button label="Nowa" label_selected="Nowa" name="btn_new" />
-  <button label="Zaawansowane" label_selected="Zaawansowane" name="btn_advanced" />
-  <text name="loginuri_label">
-    URI logowania:
-  </text>
-  <button label="Dodaj" label_selected="Dodaj" name="btn_add" />
-  <text name="gridname_label">
-    Nazwa:
-  </text>
-  <text name="gridmessage_label">
-    Informacje:
-  </text>
-  <text name="loginpage_label">
-    Powitanie:
-  </text>
-  <text name="helperuri_label">
-    URL pomocy:
-  </text>
-  <text name="website_label">
-    Strona www:
-  </text>
-  <text name="support_label">
-    URL wsparcia:
-  </text>
-  <text name="register_label">
-    URL konta:
-  </text>
-  <text name="password_label">
-    URL hasła:
-  </text>
-  <text name="search_label">
-    URL szukania:
-  </text>
-  <check_box label="Kompatybilność renderowania" name="render_compat" />
-</panel>
+	<panel name="layoutfix">
+	  <text name="grid_selector_label">
+		Wybierz siatkę:
+	  </text>
+	  <button label="Domyślna" label_selected="Domyślna" name="btn_default" />
+	  <button label="Usuń" label_selected="Usuń" name="btn_delete" />
+	  <button label="Nowa" label_selected="Nowa" name="btn_new" />
+	  <button label="Zaawansowane" label_selected="Zaawansowane" name="btn_advanced" />
+	  <text name="loginuri_label">
+		URI logowania:
+	  </text>
+	  <button label="Dodaj" label_selected="Dodaj" name="btn_add" />
+	  <text name="gridname_label">
+		Nazwa:
+	  </text>
+	  <text name="gridmessage_label">
+		Informacje:
+	  </text>
+	  <text name="loginpage_label">
+		Powitanie:
+	  </text>
+	  <text name="helperuri_label">
+		URL pomocy:
+	  </text>
+	  <text name="website_label">
+		Strona www:
+	  </text>
+	  <text name="support_label">
+		URL wsparcia:
+	  </text>
+	  <text name="register_label">
+		URL konta:
+	  </text>
+	  <text name="password_label">
+		URL hasła:
+	  </text>
+	  <text name="search_label">
+		URL szukania:
+	  </text>
+	  <check_box label="Kompatybilność renderowania" name="render_compat" />
+	</panel>
+</panel>
\ No newline at end of file