diff --git a/indra/llui/lltabcontainer.cpp b/indra/llui/lltabcontainer.cpp
index 07e4cc22e032183ef37ada806e86ac79912f5a6d..46d2f92ad09a4fa63156241e82743511b3718ab2 100644
--- a/indra/llui/lltabcontainer.cpp
+++ b/indra/llui/lltabcontainer.cpp
@@ -172,6 +172,10 @@ class LLCustomButtonIconCtrl : public LLButton
 		}
 	}
 
+	LLIconCtrl* getIconCtrl() const
+	{
+		return mIcon;
+	}
 
 private:
 	LLIconCtrl* mIcon;
@@ -1629,6 +1633,7 @@ void LLTabContainer::setTabImage(LLPanel* child, LLIconCtrl* icon)
 		if(button)
 		{
 			button->setIcon(icon);
+			reshapeTuple(tuple);
 		}
 	}
 }
@@ -1639,12 +1644,22 @@ void LLTabContainer::reshapeTuple(LLTabTuple* tuple)
 
 	if (!mIsVertical)
 	{
+		S32 image_overlay_width = 0;
+
+		if(mCustomIconCtrlUsed)
+		{
+			LLCustomButtonIconCtrl* button = dynamic_cast<LLCustomButtonIconCtrl*>(tuple->mButton);
+			LLIconCtrl* icon_ctrl = button->getIconCtrl();
+			image_overlay_width = icon_ctrl ? icon_ctrl->getRect().getWidth() : 0;
+		}
+		else
+		{
+			image_overlay_width = tuple->mButton->getImageOverlay().notNull() ?
+					tuple->mButton->getImageOverlay()->getImage()->getWidth(0) : 0;
+		}
 		// remove current width from total tab strip width
 		mTotalTabWidth -= tuple->mButton->getRect().getWidth();
 
-		S32 image_overlay_width = tuple->mButton->getImageOverlay().notNull() ?
-		tuple->mButton->getImageOverlay()->getImage()->getWidth(0) : 0;
-
 		tuple->mPadding = image_overlay_width;
 
 		tuple->mButton->reshape(llclamp(mFont->getWidth(tuple->mButton->getLabelSelected()) + tab_padding + tuple->mPadding, mMinTabWidth, mMaxTabWidth),