4 files changed, 20 insertions, 22 deletions

diff --git a/src/gui/widgets/avatarlistbox.cpp b/src/gui/widgets/avatarlistbox.cpp
index d93787d18..b497bc8a4 100644
--- a/src/gui/widgets/avatarlistbox.cpp
+++ b/src/gui/widgets/avatarlistbox.cpp
@@ -121,7 +121,6 @@ void AvatarListBox::draw(Graphics *graphics)
     const std::string &name = localPlayer->getName();
 
     // Draw the list elements
-    graphics->setColorAll(mForegroundColor, mForegroundColor2);
     ImageCollection vertexes;
     const bool useCaching = isBatchDrawRenders(openGLMode);
 
@@ -161,8 +160,6 @@ void AvatarListBox::draw(Graphics *graphics)
         graphics->drawTileCollection(&vertexes);
     }
 
-    graphics->setColorAll(mForegroundColor, mForegroundColor2);
-
     for (int i = 0, y = 0;
          i < model->getNumberOfElements();
          ++i, y += fontHeight)
diff --git a/src/gui/widgets/button.cpp b/src/gui/widgets/button.cpp
index dab8dc2d9..13c93ed1a 100644
--- a/src/gui/widgets/button.cpp
+++ b/src/gui/widgets/button.cpp
@@ -510,21 +510,6 @@ void Button::draw(Graphics *graphics)
     const int padding = skin->getPadding();
     const int spacing = mSpacing[mode];
 
-    switch (mode)
-    {
-        case BUTTON_DISABLED:
-            graphics->setColorAll(mDisabledColor, mDisabledColor2);
-            break;
-        case BUTTON_PRESSED:
-            graphics->setColorAll(mPressedColor, mPressedColor2);
-            break;
-        case BUTTON_HIGHLIGHTED:
-            graphics->setColorAll(mHighlightedColor, mHighlightedColor2);
-            break;
-        default:
-            graphics->setColorAll(mEnabledColor, mEnabledColor2);
-            break;
-    }
     if (recalc)
         mTextChanged = true;
 
@@ -636,8 +621,25 @@ void Button::draw(Graphics *graphics)
         mTextChunk.textFont = font;
         mTextChunk.deleteImage();
         mTextChunk.text = mCaption;
-        mTextChunk.color = graphics->getColor();
-        mTextChunk.color2 = graphics->getColor2();
+        switch (mode)
+        {
+            case BUTTON_DISABLED:
+                mTextChunk.color = mDisabledColor;
+                mTextChunk.color2 = mDisabledColor2;
+                break;
+            case BUTTON_PRESSED:
+                mTextChunk.color = mPressedColor;
+                mTextChunk.color2 = mPressedColor2;
+                break;
+            case BUTTON_HIGHLIGHTED:
+                mTextChunk.color = mHighlightedColor;
+                mTextChunk.color2 = mHighlightedColor2;
+                break;
+            default:
+                mTextChunk.color = mEnabledColor;
+                mTextChunk.color2 = mEnabledColor2;
+                break;
+        }
         font->generate(mTextChunk);
         mTextChanged = false;
     }
diff --git a/src/gui/widgets/label.cpp b/src/gui/widgets/label.cpp
index a5cabc365..2addac309 100644
--- a/src/gui/widgets/label.cpp
+++ b/src/gui/widgets/label.cpp
@@ -169,7 +169,6 @@ void Label::draw(Graphics* graphics)
             break;
     }
 
-    graphics->setColorAll(mForegroundColor, mForegroundColor2);
     if (mTextChanged)
     {
         mTextChunk.textFont = font;
diff --git a/src/gui/widgets/spellshortcutcontainer.cpp b/src/gui/widgets/spellshortcutcontainer.cpp
index ca2059ad5..672858412 100644
--- a/src/gui/widgets/spellshortcutcontainer.cpp
+++ b/src/gui/widgets/spellshortcutcontainer.cpp
@@ -77,7 +77,7 @@ void SpellShortcutContainer::draw(Graphics *graphics)
     Font *const font = getFont();
 
     const int selectedId = spellShortcut->getSelectedItem();
-    graphics->setColorAll(mForegroundColor, mForegroundColor2);
+    graphics->setColor(mForegroundColor);
     drawBackground(graphics);
 
     // +++ in future need reorder images and string drawing.