diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 036bb2b6a4..dae7f52450 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -19009,5 +19009,17 @@ Change of this parameter will affect the layout of buttons in notification toast
     <key>Value</key>
     <integer>0</integer>
   </map>
+
+    <key>FSEnableVolumeControls</key>
+    <map>
+        <key>Comment</key>
+        <string>If true, Firestorm will show volume controls (sounds, media, stream) in upper right corner of the screen. Useful, if skin already has its own controls.</string>
+        <key>Persist</key>
+        <integer>1</integer>
+        <key>Type</key>
+        <string>Boolean</string>
+        <key>Value</key>
+        <integer>1</integer>
+    </map>
 </map>
 </llsd>
diff --git a/indra/newview/app_settings/settings_phoenix.xml b/indra/newview/app_settings/settings_phoenix.xml
index 7dfbd9fed2..959d48d09f 100644
--- a/indra/newview/app_settings/settings_phoenix.xml
+++ b/indra/newview/app_settings/settings_phoenix.xml
@@ -395,5 +395,17 @@
     <integer>1</integer>
   </map>
 
+  <key>FSEnableVolumeControls</key>
+  <map>
+    <key>Comment</key>
+    <string>If true, Firestorm will show volume controls (sounds, media, stream) in upper right corner of the screen. Useful, if skin already has its own controls.</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>0</integer>
+  </map>
+
 </map>
 </llsd>
diff --git a/indra/newview/llstatusbar.cpp b/indra/newview/llstatusbar.cpp
index 134619c85c..50614b1be2 100644
--- a/indra/newview/llstatusbar.cpp
+++ b/indra/newview/llstatusbar.cpp
@@ -204,6 +204,9 @@ LLStatusBar::LLStatusBar(const LLRect& rect)
 
 	gSavedSettings.getControl("ShowNetStats")->getSignal()->connect(boost::bind(&LLStatusBar::updateNetstatVisibility, this, _2));
 
+	// <FS:PP> Option to hide volume controls (sounds, media, stream) in upper right
+	gSavedSettings.getControl("FSEnableVolumeControls")->getSignal()->connect(boost::bind(&LLStatusBar::updateVolumeControlsVisibility, this, _2));
+
 	buildFromFile("panel_status_bar.xml");
 }
 
@@ -409,6 +412,14 @@ BOOL LLStatusBar::postBuild()
 		updateNetstatVisibility(LLSD(FALSE));
 	}
 
+	// <FS:PP> Option to hide volume controls (sounds, media, stream) in upper right
+	mVolumeIconsWidth = mBtnVolume->getRect().getWidth() + mStreamToggle->getRect().getWidth() + mMediaToggle->getRect().getWidth();
+	if (!gSavedSettings.getBOOL("FSEnableVolumeControls"))
+	{
+		updateVolumeControlsVisibility(LLSD(FALSE));
+	}
+	// </FS:PP>
+
 	return TRUE;
 }
 
@@ -571,9 +582,15 @@ void LLStatusBar::setVisibleForMouselook(bool visible)
 	mTextTime->setVisible(visible);
 	mBalancePanel->setVisible(visible);
 	mBoxBalance->setVisible(visible);
-	mBtnVolume->setVisible(visible);
-	mStreamToggle->setVisible(visible);		// ## Zi: Media/Stream separation
-	mMediaToggle->setVisible(visible);
+	// <FS:PP> Option to hide volume controls (sounds, media, stream) in upper right
+	// mBtnVolume->setVisible(visible);
+	// mStreamToggle->setVisible(visible);		// ## Zi: Media/Stream separation
+	// mMediaToggle->setVisible(visible);
+	BOOL FSEnableVolumeControls = gSavedSettings.getBOOL("FSEnableVolumeControls");
+	mBtnVolume->setVisible(visible && FSEnableVolumeControls);
+	mStreamToggle->setVisible(visible && FSEnableVolumeControls); // ## Zi: Media/Stream separation
+	mMediaToggle->setVisible(visible && FSEnableVolumeControls);
+	// </FS:PP>
 	BOOL showNetStats = gSavedSettings.getBOOL("ShowNetStats");
 	mSGBandwidth->setVisible(visible && showNetStats);
 	mSGPacketLoss->setVisible(visible && showNetStats);
@@ -1357,6 +1374,27 @@ void LLStatusBar::updateNetstatVisibility(const LLSD& data)
 	mBalancePanel->setRect(rect);
 }
 
+// <FS:PP> Option to hide volume controls (sounds, media, stream) in upper right
+void LLStatusBar::updateVolumeControlsVisibility(const LLSD& data)
+{
+	const S32 cVolumeIconsWidth = mVolumeIconsWidth;
+	BOOL showVolumeControls = data.asBoolean();
+	S32 translateFactor = (showVolumeControls ? -1 : 1);
+
+	mBtnVolume->setVisible(showVolumeControls);
+	mStreamToggle->setVisible(showVolumeControls);
+	mMediaToggle->setVisible(showVolumeControls);
+
+	LLRect rect = mTimeMediaPanel->getRect();
+	rect.translate(cVolumeIconsWidth * translateFactor, 0);
+	mTimeMediaPanel->setRect(rect);
+
+	rect = mBalancePanel->getRect();
+	rect.translate(cVolumeIconsWidth * translateFactor, 0);
+	mBalancePanel->setRect(rect);
+}
+// </FS:PP>
+
 // <FS:Zi> Pathfinding rebake functions
 BOOL LLStatusBar::rebakeRegionCallback(const LLSD& notification,const LLSD& response)
 {
diff --git a/indra/newview/llstatusbar.h b/indra/newview/llstatusbar.h
index 2c8f4de715..18fd3f42ff 100644
--- a/indra/newview/llstatusbar.h
+++ b/indra/newview/llstatusbar.h
@@ -295,6 +295,7 @@ private:
 	void setParcelInfoText(const std::string& new_text);
 
 	void updateNetstatVisibility(const LLSD& data);
+	void updateVolumeControlsVisibility(const LLSD& data); // <FS:PP> Option to hide volume controls (sounds, media, stream) in upper right
 
 private:
 	LLTextBox	*mTextBalance;
@@ -315,6 +316,7 @@ private:
 	LLView		*mScriptOut;
 	LLFrameTimer	mClockUpdateTimer;
 
+	S32				mVolumeIconsWidth; // <FS:PP> Option to hide volume controls (sounds, media, stream) in upper right
 	S32				mBalance;
 	S32				mHealth;
 	S32				mSquareMetersCredit;
diff --git a/indra/newview/skins/default/xui/de/panel_preferences_UI.xml b/indra/newview/skins/default/xui/de/panel_preferences_UI.xml
index 17d1341763..1ef0411f83 100644
--- a/indra/newview/skins/default/xui/de/panel_preferences_UI.xml
+++ b/indra/newview/skins/default/xui/de/panel_preferences_UI.xml
@@ -31,7 +31,8 @@
 		<check_box name="FSAdvancedTooltips" label="Erweiterte Informationen in den Hovertips anzeigen (klassischer Phoenix-Stil)"/>
 		<check_box name="FSShowGroupTitleInTooltip" label="Gruppentitel von Avataren in Hovertips anzeigen"/>
 		<check_box label="Pie-Menü aktivieren" name="UsePieMenu" tool_tip="Aktiviert das klassische V1.x-Kontextmenü in Kuchenform anstelle des standardmäßigen Kontextmenüs."/>
-		<check_box name="ShowNetStats" label="Laganzeige aktivieren" tool_tip="Aktiviert die Laganzeige in der Statuszeile"/>
+		<check_box name="ShowNetStats" label="Laganzeige aktivieren" width="145" tool_tip="Aktiviert die Laganzeige in der Statuszeile"/>
+		<check_box label="Show volume controls in upper right" name="FSEnableVolumeControls" tool_tip="If checked, Firestorm will show volume controls (sounds, media, stream) in upper right corner of the screen. Useful, if skin already has its own controls." />
 		<check_box name="FSUseStandaloneGroupFloater" label="Eigene Fenster für Gruppenprofile verwenden" tool_tip="Falls aktiviert, werden Gruppenprofile in eigenen Fenstern geöffnet."/>
 		<check_box name="FSUseStandaloneTeleportHistoryFloater" label="Eigenes Fenster für Teleport-Liste verwenden" tool_tip="Falls aktiviert, wird bei Verwendung des Shortcuts für die Teleport-Liste diese in einem eigenen Fenster geöffnet."/>
 		<check_box name="FSUseStandalonePlaceDetailsFloater" label="Eigene Fenster für Landmarken, Ortsdetails und Teleport-Listen-Details verwenden" tool_tip="Falls aktiviert, werden Landmarken, Ortsdetails und Details zu Einträgen in der Teleport-Liste in eigenen Fenstern geöffnet."/>
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_UI.xml b/indra/newview/skins/default/xui/en/panel_preferences_UI.xml
index f8003063dd..024f3a586d 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_UI.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_UI.xml
@@ -248,9 +248,18 @@
        name="ShowNetStats"
        label="Show lag meter"
        left="5"
-       width="270"
+       width="110"
        tool_tip="Show lag meter in the Status Overlay"/>
 
+      <check_box
+       control_name="FSEnableVolumeControls"
+       height="16"
+       name="FSEnableVolumeControls"
+       label="Show volume controls in upper right"
+       left_pad="5"
+       width="256"
+       tool_tip="If checked, Firestorm will show volume controls (sounds, media, stream) in upper right corner of the screen. Useful, if skin already has its own controls."/>
+
       <check_box
        top_pad="2"
        control_name="FSUseStandaloneGroupFloater"
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_UI.xml b/indra/newview/skins/default/xui/es/panel_preferences_UI.xml
index e16b5afc0f..53c68f805c 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_UI.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_UI.xml
@@ -30,7 +30,8 @@
 			<check_box name="FSAdvancedTooltips" label="Mostrar información extendida en las bulas (estilo clásico de Phoenix)"/>
 			<check_box name="FSShowGroupTitleInTooltip" label="Mostrar títulos de grupo del avatar en las bulas"/>			
 			<check_box label="Usar menús circulares" name="UsePieMenu" tool_tip="Usar los clásicos menús circulares V1.x (tipo 'tarta') en vez de los menús contextuales rectangulares cuando hagas clic con el botón derecho sobre el terreno, avatares, objetos o accesorios"/>
-			<check_box name="ShowNetStats" label="Mostrar medidor de lag" tool_tip="Muestra el medidor de lag en la barra de estado" left="5"/>
+			<check_box name="ShowNetStats" label="Mostrar medidor de lag" width="150" tool_tip="Muestra el medidor de lag en la barra de estado" left="5"/>
+			<check_box label="Show volume controls in upper right" name="FSEnableVolumeControls" tool_tip="If checked, Firestorm will show volume controls (sounds, media, stream) in upper right corner of the screen. Useful, if skin already has its own controls." />
 			<check_box name="FSUseStandaloneGroupFloater" label="Usar ventanas independientes para los perfiles de grupo" width="270" tool_tip="Si se activa, los perfiles de grupo se abrirán en ventanas separadas."/>
 			<check_box name="FSUseStandaloneTeleportHistoryFloater" label="Usar una ventana independiente para el historial de teleportes" width="270" tool_tip="Si se activa, al usar el atajo para el historial de teleportes, éste se abrirá en una ventana separada."/>
 			<check_box name="FSUseStandalonePlaceDetailsFloater" label="Usar ventanas independientes para hitos, detalles de lugar y de historial de teleportes" width="270" tool_tip="Si se activa, los hitos, los detalles de lugar y los del historial de teleportes se abrirán en ventanas separadas."/>
diff --git a/indra/newview/skins/default/xui/it/panel_preferences_UI.xml b/indra/newview/skins/default/xui/it/panel_preferences_UI.xml
index 2444eda164..d07c859398 100644
--- a/indra/newview/skins/default/xui/it/panel_preferences_UI.xml
+++ b/indra/newview/skins/default/xui/it/panel_preferences_UI.xml
@@ -29,7 +29,7 @@
         <check_box name="FSAdvancedTooltips" label="Mostra informazioni estese in hovertips (stile Phoenix)"/>
         <check_box name="FSShowGroupTitleInTooltip" label="Mostra il titolo del gruppo in hovertips"/>
         <check_box label="Usa Menu a torta (pie menu)" name="UsePieMenu" tool_tip="Utilizza il menu circolare (a torta) come quello del Viewer 1.x invece dei menu contestuali rettangolari del Viewer 2/3" />
-        <check_box name="ShowNetStats" label="Mostra l'indicatore lag" tool_tip="Mostra l'indicatore della lagg nella barra di stato (Vicino l'orario di SL)" />
+        <check_box name="ShowNetStats" label="Mostra l'indicatore lag" width="140" tool_tip="Mostra l'indicatore della lagg nella barra di stato (Vicino l'orario di SL)" />
         <text name="ScriptDialogsPerObjectLabel" width="180">
             Quanti menu Script per oggetto:
         </text>
diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_UI.xml b/indra/newview/skins/default/xui/pl/panel_preferences_UI.xml
index 617d3689d9..6ca2c7a2a4 100644
--- a/indra/newview/skins/default/xui/pl/panel_preferences_UI.xml
+++ b/indra/newview/skins/default/xui/pl/panel_preferences_UI.xml
@@ -29,7 +29,8 @@
         <check_box name="FSAdvancedTooltips" label="Rozszerzone informacje w chmurkach (klasyczny styl Phoenixa)"/>
         <check_box name="FSShowGroupTitleInTooltip" label="Pokazuj tytuły grupowe awatarów w chmurkach"/>		
         <check_box label="Użyj menu kołowego (pie menu)" name="UsePieMenu" tool_tip="Używaj klasycznego, okrągłego menu znanego z 1.x po kliknięciu na awatary, obiekty, teren lub dodatki - zamiast prostokątnych menu kontekstowych." />
-        <check_box name="ShowNetStats" label="Pokaż miernik lagów" tool_tip="Pokaż miernik lagów w pasku statusu" />
+        <check_box name="ShowNetStats" label="Pokaż miernik lagów" width="135" tool_tip="Pokaż miernik lagów w pasku statusu" />
+        <check_box label="Pokaż kontrolki głośności w prawym górnym rogu" name="FSEnableVolumeControls" tool_tip="Zaznacz, aby Firestorm pokazywał kontrolki głośności (dźwięków, mediów, muzyki strumieniowej) w prawym górnym rogu ekranu. Przydatne, jeśli skórka posiada swoje własne kontrolki." />
         <check_box name="FSUseStandaloneGroupFloater" label="Używaj osobnych okien dla profili grup" tool_tip="Gdy włączysz tą opcję, to profile grup będą otwierane w osobnych oknach." />
         <check_box name="FSUseStandaloneTeleportHistoryFloater" label="Używaj osobnego okna dla historii teleportacji" tool_tip="Gdy włączysz tą opcję, to użycie skrótu klawiszowego odpowiedzialnego za otwarcie historii teleportacji pokaże ją w osobnym oknie." />
         <check_box name="FSUseStandalonePlaceDetailsFloater" label="Używaj osobnych okien dla landmarków, informacji o miejscach i historii teleportacji" tool_tip="Gdy włączysz tą opcję, to landmarki, informacje o miejscach i historia teleportacji będą otwierane w osobnych oknach." />
diff --git a/indra/newview/skins/starlight/xui/en/panel_status_bar.xml b/indra/newview/skins/starlight/xui/en/panel_status_bar.xml
index 7eb0de739f..2bae17626b 100644
--- a/indra/newview/skins/starlight/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/starlight/xui/en/panel_status_bar.xml
@@ -252,23 +252,25 @@
      top="2"
      width="40" />
   </panel>
-  	<!-- Draw distance widget here -->
-   <panel
-    height="17"
-    width="128"
-    top="1"
-	left_pad="12"
+  <panel
+    height="18"
+    left_pad="7"
+    width="258"
+    top="0"
     follows="right|top"
-    name="drawdistance_panel"
+    name="time_and_media_bg"
     background_opaque="true"
-    background_visible="true">
+    background_visible="true"
+    bg_opaque_color="MouseGray">
+
+  	<!-- Draw distance widget here -->
     <icon
      follows="right|top"
      height="16"
      image_name="Draw_Distance"
      name="dd_icon"
      tool_tip="Draw Distance"
-     top="0"
+     top="2"
      left="1"
      visible="true"
      width="16"
@@ -283,24 +285,14 @@
      initial_value="160"
      layout="topleft"
      tool_tip="Maximum distance away from camera to be rezzed (meters)"
-     top="1"
+     top="3"
      left_pad="2"
      max_val="1024"
      min_val="32"
      name="drawdistance" 
      top_delta="0"
      width="98" />
-  </panel>
-  <panel
-    height="18"
-    left_pad="7"
-    width="130"
-    top="0"
-    follows="right|top"
-    name="time_and_media_bg"
-    background_opaque="true"
-    background_visible="true"
-    bg_opaque_color="MouseGray">
+
     <text
      type="string"
      font="SansSerifSmall"
@@ -310,7 +302,7 @@
      height="16"
      top="5"
      layout="topleft"
-     left="0"
+     left="135"
      name="TimeText"
      tool_tip="Current time (Pacific)"
      width="50">
diff --git a/indra/newview/skins/starlight/xui/pl/panel_status_bar.xml b/indra/newview/skins/starlight/xui/pl/panel_status_bar.xml
index 18c4305194..d80f8f24fa 100644
--- a/indra/newview/skins/starlight/xui/pl/panel_status_bar.xml
+++ b/indra/newview/skins/starlight/xui/pl/panel_status_bar.xml
@@ -21,11 +21,9 @@
 		<text name="balance" tool_tip="Kliknij aby odświeżyć saldo L$"/>
 		<button label="KUP L$" name="buyL" tool_tip="Kliknij aby kupić więcej L$"/>
 	</panel>
-	<panel name="drawdistance_panel">
+	<panel name="time_and_media_bg">
 		<icon name="dd_icon" tool_tip="Pole widzenia"/>
 		<slider tool_tip="Maksymalny dystans rezzowania od kamery (metry)" name="drawdistance"/>
-	</panel>
-	<panel name="time_and_media_bg">
 		<text name="TimeText" tool_tip="Obecny czas (Pacyficzny)"/>
 		<button name="stream_toggle_btn" tool_tip="Odtwórz/Zatrzymaj strumień audio tej działki"/>
 		<button name="media_toggle_btn" tool_tip="Odtwórz/Zatrzymaj wszystkie media (Muzyka, Wideo, WWW)"/>
diff --git a/indra/newview/skins/starlightcui/xui/en/panel_status_bar.xml b/indra/newview/skins/starlightcui/xui/en/panel_status_bar.xml
index f594d64ddf..1dca8b9e6d 100644
--- a/indra/newview/skins/starlightcui/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/starlightcui/xui/en/panel_status_bar.xml
@@ -250,23 +250,24 @@
      top="2"
      width="40" />
   </panel>
-  	<!-- Draw distance widget here -->
-   <panel
-    height="17"
-    width="128"
-    top="1"
-	left_pad="12"
+  <panel
+    height="18"
+    left_pad="7"
+    width="130"
+    top="0"
     follows="right|top"
-    name="drawdistance_panel"
-    background_opaque="true"
+    name="time_and_media_bg"
+    background_opaque="false"
     background_visible="true">
+
+  	<!-- Draw distance widget here -->
     <icon
      follows="right|top"
      height="16"
      image_name="Draw_Distance"
      name="dd_icon"
      tool_tip="Draw Distance"
-     top="0"
+     top="2"
      left="1"
      visible="true"
      width="16"
@@ -281,23 +282,14 @@
      initial_value="160"
      layout="topleft"
      tool_tip="Maximum distance away from camera to be rezzed (meters)"
-     top="1"
+     top="3"
      left_pad="2"
      max_val="1024"
      min_val="32"
      name="drawdistance" 
      top_delta="0"
      width="98" />
-  </panel>
-  <panel
-    height="18"
-    left_pad="7"
-    width="130"
-    top="0"
-    follows="right|top"
-    name="time_and_media_bg"
-    background_opaque="false"
-    background_visible="true">
+
     <text
      type="string"
      font="SansSerifSmall"
@@ -307,7 +299,7 @@
      height="16"
      top="5"
      layout="topleft"
-     left="0"
+     left="135"
      name="TimeText"
      tool_tip="Current time (Pacific)"
      width="50">
diff --git a/indra/newview/skins/starlightcui/xui/pl/panel_status_bar.xml b/indra/newview/skins/starlightcui/xui/pl/panel_status_bar.xml
index 18c4305194..d80f8f24fa 100644
--- a/indra/newview/skins/starlightcui/xui/pl/panel_status_bar.xml
+++ b/indra/newview/skins/starlightcui/xui/pl/panel_status_bar.xml
@@ -21,11 +21,9 @@
 		<text name="balance" tool_tip="Kliknij aby odświeżyć saldo L$"/>
 		<button label="KUP L$" name="buyL" tool_tip="Kliknij aby kupić więcej L$"/>
 	</panel>
-	<panel name="drawdistance_panel">
+	<panel name="time_and_media_bg">
 		<icon name="dd_icon" tool_tip="Pole widzenia"/>
 		<slider tool_tip="Maksymalny dystans rezzowania od kamery (metry)" name="drawdistance"/>
-	</panel>
-	<panel name="time_and_media_bg">
 		<text name="TimeText" tool_tip="Obecny czas (Pacyficzny)"/>
 		<button name="stream_toggle_btn" tool_tip="Odtwórz/Zatrzymaj strumień audio tej działki"/>
 		<button name="media_toggle_btn" tool_tip="Odtwórz/Zatrzymaj wszystkie media (Muzyka, Wideo, WWW)"/>