diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index 4d65345c62..49b813fa69 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -530,6 +530,7 @@ void LLViewerObject::markDead()
 	}
 }
 
+// <FS:Beq> Add visible (rendered) face count to inspect
 S32 LLViewerObject::getNumVisibleFaces() const 
 { 
 	int v{0}; 
@@ -537,13 +538,16 @@ S32 LLViewerObject::getNumVisibleFaces() const
 	{ 
 		for (int i = 0;i < mDrawable->getNumFaces();i++)
 		{
-			if(mDrawable->getFace(i)->getTextureEntry()->getAlpha() != 0.f)
+			const LLFace* f = mDrawable->getFace(i);
+			if (f && f->getTextureEntry() && f->getTextureEntry()->getAlpha() != 0.0f)
+			{
 				v++;
+			}
 		} 
 	}
 	return v;
 };
-
+// </FS:Beq>
 
 void LLViewerObject::dump() const
 {
diff --git a/indra/newview/skins/default/xui/de/floater_about.xml b/indra/newview/skins/default/xui/de/floater_about.xml
index a207122a78..f06b624702 100644
--- a/indra/newview/skins/default/xui/de/floater_about.xml
+++ b/indra/newview/skins/default/xui/de/floater_about.xml
@@ -21,7 +21,7 @@ mit Open-Source-Beiträgen von:
 			</text_editor>
 		</panel>
 <!-- Firestorm Credits -->
-		<panel label="Firestorm" name="fs_credits_panel" height="860">
+		<panel label="Firestorm" name="fs_credits_panel" height="930">
 			<scroll_container name="fs_credits_scroll_container">
 				<panel name="fs_credits_scroll_container_content_panel">
 					<text name="firestorm_intro" height="120">
diff --git a/indra/newview/skins/default/xui/de/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/de/menu_inventory_gear_default.xml
index 6b6c20fa53..88c5a3962d 100644
--- a/indra/newview/skins/default/xui/de/menu_inventory_gear_default.xml
+++ b/indra/newview/skins/default/xui/de/menu_inventory_gear_default.xml
@@ -13,9 +13,6 @@
 		<menu_item_check name="inventory_search_by_description" label="Beschreibung"/>
 		<menu_item_check name="inventory_search_by_uuid" label="UUID"/>
 		<menu_item_check name="inventory_search_by_all" label="Allem"/>
-		<menu_item_check name="inventory_filter_only_modify" label="Nur modifizierbar"/>
-		<menu_item_check name="inventory_filter_only_copy" label="Nur kopierbar"/>
-		<menu_item_check name="inventory_filter_only_transfer" label="Nur transferierbar"/>
 <!-- Not implemented yet
 		<menu_item_check name="inventory_show_partial_results" label="Zeige unvollständige Suchergebnisse"/>
 -->
@@ -36,6 +33,9 @@
 	<menu_item_check name="inventory_filter_show_links" label="Verknüpfungen anzeigen"/>
 	<menu_item_check name="inventory_filter_only_links" label="Nur Verknüpfungen anzeigen"/>
 	<menu_item_check name="inventory_filter_hide_links" label="Verknüpfungen verstecken"/>
+	<menu_item_check name="inventory_filter_only_modify" label="Nur modifizierbar"/>
+	<menu_item_check name="inventory_filter_only_copy" label="Nur kopierbar"/>
+	<menu_item_check name="inventory_filter_only_transfer" label="Nur transferierbar"/>
 	<!-- ## Zi: Filter Links Menu -->
 	<menu_item_call label="Papierkorb ausleeren" name="empty_trash"/>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/floater_about.xml b/indra/newview/skins/default/xui/en/floater_about.xml
index bbf727d85c..b6dd94fe92 100644
--- a/indra/newview/skins/default/xui/en/floater_about.xml
+++ b/indra/newview/skins/default/xui/en/floater_about.xml
@@ -91,7 +91,7 @@ Dummy Name replaced at run time
       </text_editor>
     </panel>
     <panel
-      height="847"
+      height="910"
       border="true"
       label="Firestorm Credits"
       help_topic="about_fscredits_tab"
@@ -140,7 +140,7 @@ The Firestorm Development Team:
                  top_pad="4"
                  width="450"
                  wrap="true">
-Ansariel Hiller, ArminWeatherHax, Arrehn Oberlander, Beq Janus, Cinder Roxley, Holy Gavenkrantz, Jessica Lyon, Kadah Coba, Kitty Barnett, Liny Odell, LordGregGreg Back, Mobius Ryba, Nicky Dasmijn, PanteraPolnocy, Selo Jacobus, Tankmaster Finesmith, Techwolf Lupindo, Tonya Souther, Tozh Taurog, Vortex Saito, WoLf Loonie, Wolfspirit Magic and Zi Ree.
+Ansariel Hiller, ArminWeatherHax, Arrehn Oberlander, Beq Janus, Cinder Roxley, Holy Gavenkrantz, Jessica Lyon, Kadah Coba, Kitty Barnett, Liny Odell, LordGregGreg Back, Mobius Ryba, Nicky Dasmijn, PanteraPolnocy, ScentualLust, Selo Jacobus, Tankmaster Finesmith, Techwolf Lupindo, Tonya Souther, Tozh Taurog, Vortex Saito, WoLf Loonie, Wolfspirit Magic and Zi Ree.
                 </text>
                 <text
                  follows="top|left"
@@ -194,7 +194,7 @@ Afrika Burton, Albatroz Hird, Alexru Resident, alison Seesaw, AnaLucia Loon, Ang
                 </text>
                 <text
                  follows="top|left"
-                 height="15"
+                 height="78"
                  layout="topleft"
                  left="5"
                  name="fs_art_intro"
diff --git a/indra/newview/skins/default/xui/es/floater_about.xml b/indra/newview/skins/default/xui/es/floater_about.xml
index 1eafe62a0b..9569ac62bd 100644
--- a/indra/newview/skins/default/xui/es/floater_about.xml
+++ b/indra/newview/skins/default/xui/es/floater_about.xml
@@ -60,7 +60,7 @@ Los Linden son,
 con contribuciones de código de:
 			</text>
 		</panel>
-		<panel label="Créditos de Firestorm" name="fs_credits_panel" height="860">
+		<panel label="Créditos de Firestorm" name="fs_credits_panel" height="920">
 			<scroll_container name="fs_credits_scroll_container">
 				<panel name="fs_credits_scroll_container_content_panel">
 					<text name="firestorm_intro" height="120">
diff --git a/indra/newview/skins/default/xui/ru/floater_about.xml b/indra/newview/skins/default/xui/ru/floater_about.xml
index 2d7f49011c..5d2469f891 100644
--- a/indra/newview/skins/default/xui/ru/floater_about.xml
+++ b/indra/newview/skins/default/xui/ru/floater_about.xml
@@ -21,7 +21,7 @@ Linden это:
 				и переводами от:
 			</text>
 		</panel>
-		<panel label="Firestorm" name="fs_credits_panel" height="870">
+		<panel label="Firestorm" name="fs_credits_panel" height="960">
 			<scroll_container name="fs_credits_scroll_container">
 				<panel name="fs_credits_scroll_container_content_panel">
 					<text name="firestorm_intro" height="130">
@@ -35,7 +35,7 @@ Linden это:
 					<text name="fs_support_intro">
 						Специальные благодарности для команды поддержки, издателей wiki, учителей и переводчиков:
 					</text>
-					<text name="fs_art_intro">
+					<text name="fs_art_intro" height="90">
 						Firestorm использует Starlight, модифицированный для Firestorm. Он создан пользователями для пользователей, с целью предоставления альтернативного, более ясного и в более легкого в использовании интерфейса. Больше подробностей на &lt;nolink&gt;https://wiki.secondlife.com/wiki/Viewer_Skins/Starlight&lt;/nolink&gt;.
 
 Художники и дизайнеры интерфейса: