diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
index 36ac2bee7e..8b2048aea8 100644
--- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
@@ -195,6 +195,7 @@
                 image_unselected="ptt_lock_off.tga"
                 label=""
                 name="ptt_lock"
+				tool_tip=""
                 scale_image="true"
                 control_name="PushToTalkToggle">
             </bottomtray_button>
diff --git a/indra/newview/skins/default/xui/fr/panel_bottomtray.xml b/indra/newview/skins/default/xui/fr/panel_bottomtray.xml
index c4537861e3..7fdcd5ad04 100644
--- a/indra/newview/skins/default/xui/fr/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/fr/panel_bottomtray.xml
@@ -1,46 +1,105 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="bottom_tray">
 	<string name="DragIndicationImageName" value="Accordion_ArrowOpened_Off"/>
-	<string name="SpeakBtnToolTip" value="Active/Désactive le micro"/>
-	<string name="VoiceControlBtnToolTip" value="Affiche/Masque le panneau de contrôle de la voix"/>
+	<string name="SpeakBtnToolTip"
+		value="Ouvrir/fermer le micro (Pour la touche de fonction, voir Préférences → Son et Média"/>
+	<string name="VoiceControlBtnToolTip"
+		value="Paramètres du Chat Vocal Local"/>
 	<layout_stack name="toolbar_stack">
 		<layout_panel name="speak_panel">
-			<talk_button name="talk">
-				<speak_button label="Parler" label_selected="Parler" name="speak_btn"/>
-			</talk_button>
+			<talk_button name="talk"/>
+				<bottomtray_button name="ptt_lock"
+					tool_tip="Mode d'ouverture du micro. Désactivé (bleu) = maintenir la pression pour parler. Activé (rouge) = ouverture / fermeture par impulsion"/>
+				<speak_button name="speak_btn"
+					label="Parler"/>
 		</layout_panel>
 		<layout_panel name="gesture_panel">
-			<gesture_combo_list label="Geste" name="Gesture" tool_tip="Affiche/Masque les gestes"/>
+			<gesture_combo_list name="Gesture"
+				label="Geste"
+				tool_tip="Paramètres des Gestes (Ctl-G)"/>
 		</layout_panel>
 		<layout_panel name="movement_panel">
-			<bottomtray_button label="Bouger" name="movement_btn" tool_tip="Affiche/Masque le contrôle des déplacements"/>
+			<bottomtray_button name="movement_btn" 
+				label="Bouger"
+				tool_tip="Contrôle Déplacements"/>
 		</layout_panel>
 		<layout_panel name="cam_panel">
-			<bottomtray_button label="Affichage" name="camera_btn" tool_tip="Affiche/Masque le contrôle de la caméra"/>
+			<bottomtray_button name="camera_btn"
+				label="Caméra"
+				tool_tip="Contrôle Caméra"/>
 		</layout_panel>
+		<layout_panel name="bottom_sbpeople">
+            <bottomtray_button name="sidebar_people_btn"
+				tool_tip="Personnes (Ctl-A / Ctl-F / Ctl-G)"/>
+        </layout_panel>
 		<layout_panel name="snapshot_panel">
-			<bottomtray_button label="" name="snapshots" tool_tip="Prendre une photo"/>
+			<bottomtray_button name="snapshots"
+				label="Photo"
+				tool_tip="Aperçu de la Photo (Ctl-Maj-S)"/>
 		</layout_panel>
 		<layout_panel name="build_btn_panel">
-			<bottomtray_button label="Construire" name="build_btn" tool_tip="Affiche/Masque les outils pour la construction"/>
+			<bottomtray_button name="build_btn"
+				label="Construire"
+				tool_tip="Outils de build (Ctl-B)"/>
 		</layout_panel>
 		<layout_panel name="search_btn_panel">
-			<bottomtray_button label="Rechercher" name="search_btn" tool_tip="Affiche/Masque la recherche"/>
+			<bottomtray_button name="search_btn"
+				label="Rechercher"
+				tool_tip="Recherche (Ctl-F)"/>
 		</layout_panel>
 		<layout_panel name="world_map_btn_panel">
-			<bottomtray_button label="Carte" name="world_map_btn" tool_tip="Affiche/Masque la carte du monde"/>
+			<bottomtray_button name="world_map_btn" 
+				label="Carte" 
+				tool_tip="Carte du Monde (Ctl-M)"/>
 		</layout_panel>
 		<layout_panel name="mini_map_btn_panel">
-			<bottomtray_button label="Mini-carte" name="mini_map_btn" tool_tip="Affiche/Masque la mini-carte"/>
-		</layout_panel>
+            <bottomtray_button name="mini_map_btn"
+				tool_tip="Mini Carte (Ctl-Maj-M)"/>
+        </layout_panel>
+		<layout_panel name="bottom_sbme">
+            <bottomtray_button name="sidebar_me_btn"
+				tool_tip="Profil (clic-d avatar)"/>
+        </layout_panel>
+		<layout_panel name="bottom_sbplaces">
+            <bottomtray_button name="sidebar_places_btn"
+				tool_tip="Historique des TP et Repères"/>
+        </layout_panel>
+		<layout_panel name="bottom_sbhome">
+            <bottomtray_button name="sidebar_home_btn"
+				tool_tip="Accueil"/>
+        </layout_panel>
+		<layout_panel name="bottom_sbappearance">
+            <bottomtray_button name="sidebar_appearance_btn"
+				tool_tip="Apparence (clic-d avatar)"/>
+        </layout_panel>
+		<layout_panel name="bottom_sbinv">
+            <bottomtray_button name="sidebar_inv_btn"
+				tool_tip="Inventaire (Ctl-I)"/>
+        </layout_panel>
+<!-- ## Zi: AO button -->
+        <layout_panel name="ao_btn_panel">
+            <bottomtray_button name="ao_toggle_btn"
+				tool_tip="AO intégré en/hors (cao on/off)"/>
+			<bottomtray_button name="ao_btn"
+				tool_tip="Paramètres de l'AO intégré"/>
+        </layout_panel>
+<!-- ## Zi: AO button -->
+<!-- Quick Preferences panel    -WoLf -->
+        <layout_panel name="quickprefs_btn_panel">
+			<bottomtray_button name="quickprefs_toggle"
+				tool_tip="Préférences Rapides"/>
+        </layout_panel>
+<!-- Quick Preferences panel    -WoLf -->
 		<layout_panel name="im_well_panel">
 			<chiclet_im_well name="im_well">
-				<button name="Unread IM messages" tool_tip="Conversations"/>
+				<button name="Unread IM messages"
+					tool_tip="Conversations (Ctl-T)"/>
 			</chiclet_im_well>
 		</layout_panel>
 		<layout_panel name="notification_well_panel">
 			<chiclet_notification name="notification_well">
-				<button name="Unread" tool_tip="Notifications"/>
+				<button name="Unread"
+					tool_tip="Notifications"/>
 			</chiclet_notification>
 		</layout_panel>
 	</layout_stack>
diff --git a/indra/newview/skins/firestorm/xui/en/panel_bottomtray.xml b/indra/newview/skins/firestorm/xui/en/panel_bottomtray.xml
index 91a152eddb..472dd62bfa 100644
--- a/indra/newview/skins/firestorm/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/firestorm/xui/en/panel_bottomtray.xml
@@ -193,6 +193,7 @@
                 image_unselected="ptt_lock_off.tga"
                 label=""
                 name="ptt_lock"
+                tool_tip=""
                 scale_image="true"
                 control_name="PushToTalkToggle">
             </bottomtray_button>
diff --git a/indra/newview/skins/firestormsidetabs/xui/en/panel_bottomtray.xml b/indra/newview/skins/firestormsidetabs/xui/en/panel_bottomtray.xml
index 95193f7de9..b68915fc5e 100644
--- a/indra/newview/skins/firestormsidetabs/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/firestormsidetabs/xui/en/panel_bottomtray.xml
@@ -173,6 +173,7 @@
                 image_unselected="ptt_lock_off.tga"
                 label=""
                 name="ptt_lock"
+                tool_tip=""
                 scale_image="true"
                 control_name="PushToTalkToggle">
             </bottomtray_button>
diff --git a/indra/newview/skins/metaharper/xui/en/panel_bottomtray.xml b/indra/newview/skins/metaharper/xui/en/panel_bottomtray.xml
index b89a82a3a2..07d18d0e41 100644
--- a/indra/newview/skins/metaharper/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/metaharper/xui/en/panel_bottomtray.xml
@@ -194,6 +194,7 @@
                 image_unselected="ptt_lock_off.tga"
                 label=""
                 name="ptt_lock"
+                tool_tip=""
                 scale_image="true"
                 control_name="PushToTalkToggle">
             </bottomtray_button>
diff --git a/indra/newview/skins/metaharper_sidetabs/xui/en/panel_bottomtray.xml b/indra/newview/skins/metaharper_sidetabs/xui/en/panel_bottomtray.xml
index 583f2df9c8..cf7ac5b974 100644
--- a/indra/newview/skins/metaharper_sidetabs/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/metaharper_sidetabs/xui/en/panel_bottomtray.xml
@@ -194,6 +194,7 @@
                 image_unselected="ptt_lock_off.tga"
                 label=""
                 name="ptt_lock"
+                tool_tip=""
                 scale_image="true"
                 control_name="PushToTalkToggle">
             </bottomtray_button>
diff --git a/indra/newview/skins/starlight/xui/en/panel_bottomtray.xml b/indra/newview/skins/starlight/xui/en/panel_bottomtray.xml
index f6bac397e4..700b8be7a6 100644
--- a/indra/newview/skins/starlight/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/starlight/xui/en/panel_bottomtray.xml
@@ -165,6 +165,7 @@
                 image_unselected="ptt_lock_off.tga"
                 label=""
                 name="ptt_lock"
+                tool_tip=""
                 scale_image="true"
                 control_name="PushToTalkToggle">
             </bottomtray_button>