diff --git a/indra/llui/llbutton.cpp b/indra/llui/llbutton.cpp
index 2d3007cd5fdf1a1f788800a4b50056cfc91271e6..74b8885e1ff4dad35cabe8dbfcc2677e3657954d 100644
--- a/indra/llui/llbutton.cpp
+++ b/indra/llui/llbutton.cpp
@@ -823,7 +823,7 @@ void LLButton::draw()
 		{
 			overlay_color = mImageOverlayDisabledColor.get();
 		}
-		else if (!getToggleState())
+		else if (getToggleState())
 		{
 			overlay_color = mImageOverlaySelectedColor.get();
 		}
diff --git a/indra/llui/lltoolbar.cpp b/indra/llui/lltoolbar.cpp
index 8faa9b398848a1cbc0bf98cb4978674b5323b2d1..629c7d9bc740a0120457cb6123ec9a5c76b926a0 100644
--- a/indra/llui/lltoolbar.cpp
+++ b/indra/llui/lltoolbar.cpp
@@ -1014,9 +1014,8 @@ void LLToolBarButton::setEnabled(BOOL enabled)
 		mUnselectedLabelColor = mOriginalLabelColor;
 		mSelectedLabelColor = mOriginalLabelColorSelected;
 		mImageOverlayColor = mOriginalImageOverlayColor;
-		mOriginalImageOverlaySelectedColor = mOriginalImageOverlaySelectedColor;
+		mImageOverlaySelectedColor = mOriginalImageOverlaySelectedColor;
 	}
-
 	else
 	{
 		mImageSelected = mImageDisabledSelected;