diff --git a/indra/newview/app_settings/commands.xml b/indra/newview/app_settings/commands.xml
index a44b895f7b..2e447744e3 100644
--- a/indra/newview/app_settings/commands.xml
+++ b/indra/newview/app_settings/commands.xml
@@ -237,4 +237,28 @@
            is_running_function="Floater.IsOpen"
            is_running_parameters="voice_controls"
            />
+
+<!-- Firestorm command buttons -->
+  <command name="quickprefs"
+           available_in_toybox="true"
+           icon="phoenix_18"
+           label_ref="Command_Quickprefs_Label"
+           tooltip_ref="Command_Quickprefs_Tooltip"
+           execute_function="Floater.ToggleOrBringToFront"
+           execute_parameters="quickprefs"
+           is_running_function="Floater.IsOpen"
+           is_running_parameters="quickprefs"
+           />
+
+  <command name="animationoverride"
+           available_in_toybox="true"
+           icon="ao_toggle_18"
+           label_ref="Command_AO_Label"
+           tooltip_ref="Command_AO_Tooltip"
+           execute_function="Floater.ToggleOrBringToFront"
+           execute_parameters="animation_overrider"
+           is_running_function="Floater.IsOpen"
+           is_running_parameters="animation_overrider"
+           />
+
 </commands>
diff --git a/indra/newview/skins/default/xui/de/strings.xml b/indra/newview/skins/default/xui/de/strings.xml
index d861907837..059275a8fc 100644
--- a/indra/newview/skins/default/xui/de/strings.xml
+++ b/indra/newview/skins/default/xui/de/strings.xml
@@ -4938,6 +4938,12 @@ Setzen Sie den Editorpfad in Anführungszeichen
 	<string name="Command_Voice_Label">
 		Voice-Einstellungen
 	</string>
+	<string name="Command_Quickprefs_Label">
+		Schnelleinstellungen
+	</string>
+	<string name="Command_AO_Label">
+		Animation Overrider
+	</string>
 	<string name="Command_AboutLand_Tooltip">
 		Informationen zu dem von Ihnen besuchten Land
 	</string>
@@ -5010,6 +5016,12 @@ Setzen Sie den Editorpfad in Anführungszeichen
 	<string name="Command_Voice_Tooltip">
 		Lautstärkeregler für Anrufe und Leute in Ihrer Nähe in SL
 	</string>
+	<string name="Command_Quickprefs_Tooltip">
+		Schnelleinstellungen zum Ändern oft benötigter Einstellungen
+	</string>
+	<string name="Command_AO_Tooltip">
+		Animation Overrider
+	</string>
 	<string name="Toolbar_Bottom_Tooltip">
 		gegenwärtig in der unteren Symbolleiste
 	</string>
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 3588d419a5..66a8b04de1 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3744,6 +3744,9 @@ Try enclosing path to the editor with double quotes.
   <string name="Command_Speak_Label">Speak</string>
   <string name="Command_View_Label">Camera controls</string>
   <string name="Command_Voice_Label">Voice settings</string>
+<!-- Firestorm commands -->
+  <string name="Command_Quickprefs_Label">Quick prefs</string>
+  <string name="Command_AO_Label">Animation Overrider</string>
 
   <string name="Command_AboutLand_Tooltip">Information about the land you're visiting</string>
   <string name="Command_Appearance_Tooltip">Change your avatar</string>
@@ -3769,6 +3772,9 @@ Try enclosing path to the editor with double quotes.
   <string name="Command_Speak_Tooltip">Speak with people nearby using your microphone</string>
   <string name="Command_View_Tooltip">Changing camera angle</string>
   <string name="Command_Voice_Tooltip">Volume controls for calls and people near you in world</string>
+<!-- Firestorm commands -->
+  <string name="Command_Quickprefs_Tooltip">Quick preferences for changing often used settings</string>
+  <string name="Command_AO_Tooltip">Animation Overrider</string>
 
   <string name="Toolbar_Bottom_Tooltip">currently in your bottom toolbar</string>
   <string name="Toolbar_Left_Tooltip"  >currently in your left toolbar</string>