diff --git a/indra/newview/skins/firestormsidetabs/xui/en/panel_bottomtray.xml b/indra/newview/skins/firestormsidetabs/xui/en/panel_bottomtray.xml
index 34c93de7eb..a8cfe8120b 100644
--- a/indra/newview/skins/firestormsidetabs/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/firestormsidetabs/xui/en/panel_bottomtray.xml
@@ -560,6 +560,54 @@
             </bottomtray_button>
         </layout_panel>
 
+<!-- ## Zi: AO button -->
+        <layout_panel
+         auto_resize="false"
+         follows="left|right"
+         height="28"
+         layout="topleft"
+         min_height="28"
+         min_width="56"
+         mouse_opaque="false"
+         name="ao_btn_panel"
+         user_resize="false"
+         width="56">
+            <bottomtray_button
+             name="ao_toggle_btn"
+             tool_tip="Enables/Disables Animation Overrider"
+             follows="left|right"
+             height="23"
+             image_pressed="PushButton_Press"
+             image_pressed_selected="PushButton_Selected_Press"
+             image_selected="PushButton_Selected_Press"
+             is_toggle="true"
+             image_overlay="ao_toggle_18"
+             layout="topleft"
+             left="0"
+             top="5"
+             use_ellipses="true"
+             width="36">
+            </bottomtray_button>
+       <bottomtray_button
+        name="ao_btn"
+        tool_tip="Shows/hides Animation Overrider"
+        left_pad="0"
+        height="23"
+        width="16"
+        image_disabled="ComboButton_UpOff"
+        image_unselected="ComboButton_UpOff"
+        image_selected="ComboButton_Up_On_Selected"
+        image_pressed="ComboButton_UpSelected"
+        image_pressed_selected="ComboButton_Up_On_Selected"
+        is_toggle="true"
+        tab_stop="true">
+        <init_callback
+         function="Button.SetDockableFloaterToggle"
+         parameter="animation_overrider" />
+      </bottomtray_button>
+        </layout_panel>
+<!-- ## Zi: AO button -->
+
     <icon
      auto_resize="false"
      color="Transparent"
diff --git a/indra/newview/skins/metaharpersidetabs/xui/en/panel_bottomtray.xml b/indra/newview/skins/metaharpersidetabs/xui/en/panel_bottomtray.xml
index 80f14e5282..0c906df326 100644
--- a/indra/newview/skins/metaharpersidetabs/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/metaharpersidetabs/xui/en/panel_bottomtray.xml
@@ -344,6 +344,55 @@ Disabled for now.
          parameter="mini_map" />
       </bottomtray_button>
     </layout_panel>
+
+<!-- ## Zi: AO button -->
+        <layout_panel
+         auto_resize="false"
+         follows="left|right"
+         height="28"
+         layout="topleft"
+         min_height="28"
+         min_width="56"
+         mouse_opaque="false"
+         name="ao_btn_panel"
+         user_resize="false"
+         width="56">
+            <bottomtray_button
+             name="ao_toggle_btn"
+             tool_tip="Enables/Disables Animation Overrider"
+             follows="left|right"
+             height="23"
+             image_pressed="PushButton_Press"
+             image_pressed_selected="PushButton_Selected_Press"
+             image_selected="PushButton_Selected_Press"
+             is_toggle="true"
+             image_overlay="ao_toggle_18"
+             layout="topleft"
+             left="0"
+             top="5"
+             use_ellipses="true"
+             width="36">
+            </bottomtray_button>
+       <bottomtray_button
+        name="ao_btn"
+        tool_tip="Shows/hides Animation Overrider"
+        left_pad="0"
+        height="23"
+        width="16"
+        image_disabled="ComboButton_UpOff"
+        image_unselected="ComboButton_UpOff"
+        image_selected="ComboButton_Up_On_Selected"
+        image_pressed="ComboButton_UpSelected"
+        image_pressed_selected="ComboButton_Up_On_Selected"
+        is_toggle="true"
+        tab_stop="true">
+        <init_callback
+         function="Button.SetDockableFloaterToggle"
+         parameter="animation_overrider" />
+      </bottomtray_button>
+        </layout_panel>
+<!-- ## Zi: AO button -->
+
     <icon
      auto_resize="false"
      color="Transparent"
diff --git a/indra/newview/skins/starlight/xui/en/panel_bottomtray.xml b/indra/newview/skins/starlight/xui/en/panel_bottomtray.xml
index eae7da838b..1cf474db2b 100644
--- a/indra/newview/skins/starlight/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/starlight/xui/en/panel_bottomtray.xml
@@ -353,6 +353,55 @@ Disabled for now.
                  parameter="inventory" />
             </button>
         </layout_panel>
+
+<!-- ## Zi: AO button -->
+        <layout_panel
+         auto_resize="false"
+         follows="left|right"
+         height="28"
+         layout="topleft"
+         min_height="28"
+         min_width="56"
+         mouse_opaque="false"
+         name="ao_btn_panel"
+         user_resize="false"
+         width="56">
+            <bottomtray_button
+             name="ao_toggle_btn"
+             tool_tip="Enables/Disables Animation Overrider"
+             follows="left|right"
+             height="23"
+             image_pressed="PushButton_Press"
+             image_pressed_selected="PushButton_Selected_Press"
+             image_selected="PushButton_Selected_Press"
+             is_toggle="true"
+             image_overlay="ao_toggle_18"
+             layout="topleft"
+             left="0"
+             top="5"
+             use_ellipses="true"
+             width="36">
+            </bottomtray_button>
+       <bottomtray_button
+        name="ao_btn"
+        tool_tip="Shows/hides Animation Overrider"
+        left_pad="0"
+        height="23"
+        width="16"
+        image_disabled="ComboButton_UpOff"
+        image_unselected="ComboButton_UpOff"
+        image_selected="ComboButton_Up_On_Selected"
+        image_pressed="ComboButton_UpSelected"
+        image_pressed_selected="ComboButton_Up_On_Selected"
+        is_toggle="true"
+        tab_stop="true">
+        <init_callback
+         function="Button.SetDockableFloaterToggle"
+         parameter="animation_overrider" />
+        </bottomtray_button>
+        </layout_panel>
+<!-- ## Zi: AO button -->
+
         <icon
          auto_resize="false"
          color="Transparent"