diff --git a/indra/llui/llbutton.cpp b/indra/llui/llbutton.cpp
index 8a34e221b1a7213a30ca1db264139734177491da..8ac55b2eb42b572c38e897e4850db5e6753852c6 100644
--- a/indra/llui/llbutton.cpp
+++ b/indra/llui/llbutton.cpp
@@ -174,9 +174,10 @@ LLButton::LLButton(const LLButton::Params& p)
 {
 	// If optional parameter "p.button_flash_count" is not provided, LLFlashTimer will be
 	// used instead it a "default" value from gSavedSettings.getS32("FlashCount")).
-	// Likewise, missing "p.button_flash_rate" is replaced by gSavedSettings.getF32("FlashPeriod");
-	S32 flash_count = p.button_flash_count || 0;
-	F32 flash_rate = p.button_flash_rate || 0.0; //
+	// Likewise, missing "p.button_flash_rate" is replaced by gSavedSettings.getF32("FlashPeriod").
+	// Note: flashing should be allowed in settings.xml (boolean key "EnableButtonFlashing").
+	S32 flash_count = p.button_flash_count.isProvided()? p.button_flash_count : 0;
+	F32 flash_rate = p.button_flash_rate.isProvided()? p.button_flash_rate : 0.0;
 	mFlashingTimer = new LLFlashTimer ((LLFlashTimer::callback_t)NULL, flash_count, flash_rate);
 
 	static LLUICachedControl<S32> llbutton_orig_h_pad ("UIButtonOrigHPad", 0);
diff --git a/indra/newview/skins/default/xui/en/widgets/toolbar.xml b/indra/newview/skins/default/xui/en/widgets/toolbar.xml
index 0aa478ace9fc66945f817d827bad357f255d1f0b..55ae158c00984a82cd87c154806ff62cb1f6070b 100644
--- a/indra/newview/skins/default/xui/en/widgets/toolbar.xml
+++ b/indra/newview/skins/default/xui/en/widgets/toolbar.xml
@@ -30,8 +30,8 @@
                         image_overlay_alignment="left"
                         use_ellipses="true"
                         auto_resize="true"
-                        button_flash_count="99999"
-                        button_flash_rate="1.0"
+                        button_flash_count="3"
+                        button_flash_rate="0.25"
                         flash_color="EmphasisColor"/>
   <button_icon pad_left="10"
                pad_right="10"