diff --git a/indra/newview/skins/default/xui/en/widgets/toolbar.xml b/indra/newview/skins/default/xui/en/widgets/toolbar.xml
index 6c73e80098..c758db7444 100755
--- a/indra/newview/skins/default/xui/en/widgets/toolbar.xml
+++ b/indra/newview/skins/default/xui/en/widgets/toolbar.xml
@@ -30,9 +30,9 @@
                         image_overlay_alignment="left"
                         use_ellipses="true"
                         auto_resize="true"
-                        button_flash_count="4"
-                        button_flash_rate="0.5"
-                        flash_color="BeaconColor"/>
+                        button_flash_count="99999"
+                        button_flash_rate="1.0"
+                        flash_color="EmphasisColor"/>
   <button_icon pad_left="10"
                pad_right="10"
                image_bottom_pad="10"
@@ -51,9 +51,9 @@
                chrome="true"
                use_ellipses="true"
                auto_resize="true"
-               button_flash_count="4"
-               button_flash_rate="0.5"
-               flash_color="BeaconColor"/>
+               button_flash_count="99999"
+               button_flash_rate="1.0"
+               flash_color="EmphasisColor"/>
   <!-- <FS:Zi> Added text only button -->
   <button label_color_selected="White"
           halign="center"
diff --git a/indra/newview/skins/latency/xui/en/widgets/toolbar.xml b/indra/newview/skins/latency/xui/en/widgets/toolbar.xml
index 11bfb006f1..921f5aa50f 100644
--- a/indra/newview/skins/latency/xui/en/widgets/toolbar.xml
+++ b/indra/newview/skins/latency/xui/en/widgets/toolbar.xml
@@ -31,8 +31,8 @@
                         image_overlay_alignment="left"
                         use_ellipses="true"
                         auto_resize="true"
-                        button_flash_count="4"
-                        button_flash_rate="0.5"
+                        button_flash_count="99999"
+                        button_flash_rate="1.0"
                         flash_color="EmphasisColor"/>
   <button_icon pad_left="10"
                pad_right="10"
@@ -52,8 +52,8 @@
                chrome="true"
                use_ellipses="true"
                auto_resize="true"
-               button_flash_count="4"
-               button_flash_rate="0.5"
+               button_flash_count="99999"
+               button_flash_rate="1.0"
                flash_color="EmphasisColor"/>
   <!-- <FS:Zi> Added text only button -->
   <button label_color_selected="White"
diff --git a/indra/newview/skins/starlight/xui/en/widgets/toolbar.xml b/indra/newview/skins/starlight/xui/en/widgets/toolbar.xml
index 89fdbc14f3..ca38e96374 100644
--- a/indra/newview/skins/starlight/xui/en/widgets/toolbar.xml
+++ b/indra/newview/skins/starlight/xui/en/widgets/toolbar.xml
@@ -30,9 +30,9 @@
                         image_overlay_alignment="left"
                         use_ellipses="true"
                         auto_resize="true"
-                        button_flash_count="4"
-                        button_flash_rate="0.5"
-                        flash_color="BeaconColor"/>
+                        button_flash_count="99999"
+                        button_flash_rate="1.0"
+                        flash_color="EmphasisColor"/>
   <button_icon pad_left="10"
                pad_right="10"
                image_bottom_pad="10"
@@ -51,9 +51,9 @@
                chrome="true"
                use_ellipses="true"
                auto_resize="true"
-               button_flash_count="4"
-               button_flash_rate="0.5"
-               flash_color="BeaconColor"/>
+               button_flash_count="99999"
+               button_flash_rate="1.0"
+               flash_color="EmphasisColor"/>
   <!-- <FS:Zi> Added text only button -->
   <button label_color_selected="White"
           halign="center"
diff --git a/indra/newview/skins/starlightcui/xui/en/widgets/toolbar.xml b/indra/newview/skins/starlightcui/xui/en/widgets/toolbar.xml
index 8a6afedf49..00d755cc1a 100644
--- a/indra/newview/skins/starlightcui/xui/en/widgets/toolbar.xml
+++ b/indra/newview/skins/starlightcui/xui/en/widgets/toolbar.xml
@@ -30,9 +30,9 @@
                         image_overlay_alignment="left"
                         use_ellipses="true"
                         auto_resize="true"
-                        button_flash_count="4"
-                        button_flash_rate="0.5"
-                        flash_color="SL-EmphasisColor"/>
+                        button_flash_count="9999"
+                        button_flash_rate="1.0"
+                        flash_color="EmphasisColor"/>
   <button_icon pad_left="10"
                pad_right="10"
                image_bottom_pad="10"
@@ -51,9 +51,9 @@
                chrome="true"
                use_ellipses="true"
                auto_resize="true"
-               button_flash_count="4"
-               button_flash_rate="0.5"
-               flash_color="SL-EmphasisColor"/>
+               button_flash_count="9999"
+               button_flash_rate="1.0"
+               flash_color="EmphasisColor"/>
   <!-- <FS:Zi> Added text only button -->
   <button label_color_selected="White"
           halign="center"