diff --git a/src/board/UBBoardController.cpp b/src/board/UBBoardController.cpp
index 7a14e8d4..c0be0da8 100644
--- a/src/board/UBBoardController.cpp
+++ b/src/board/UBBoardController.cpp
@@ -1543,28 +1543,12 @@ void UBBoardController::changeBackground(bool isDark, bool isCrossed)
 
         mActiveScene->setBackground(isDark, isCrossed);
 
-        foreach (QGraphicsItem *item, mActiveScene->items()) {
-            if (item->type() == UBGraphicsStrokesGroup::Type) {
-                UBGraphicsStrokesGroup *curGroup = static_cast<UBGraphicsStrokesGroup*>(item);
-                QColor compareColor =  curGroup->color(currentIsDark ? UBGraphicsStrokesGroup::colorOnDarkBackground
-                                                                     : UBGraphicsStrokesGroup::colorOnLightBackground);
-
-                if (curGroup->color() == compareColor) {
-                    QColor newColor = curGroup->color(!currentIsDark ? UBGraphicsStrokesGroup::colorOnDarkBackground
-                                                                     : UBGraphicsStrokesGroup::colorOnLightBackground);
-                    curGroup->setColor(newColor);
-                }
-
-            }
-        }
-
         updateBackgroundState();
 
         emit backgroundChanged();
     }
 }
 
-
 void UBBoardController::boardViewResized(QResizeEvent* event)
 {
     Q_UNUSED(event);
diff --git a/src/domain/UBGraphicsScene.cpp b/src/domain/UBGraphicsScene.cpp
index b4cbfc4e..9a89e96b 100644
--- a/src/domain/UBGraphicsScene.cpp
+++ b/src/domain/UBGraphicsScene.cpp
@@ -891,25 +891,18 @@ void UBGraphicsScene::recolorAllItems()
         view->setViewportUpdateMode(QGraphicsView::NoViewportUpdate);
     }
 
-    for(int i = 0; i < mFastAccessItems.size(); i++)
-    {
-        UBGraphicsPolygonItem *polygonItem = qgraphicsitem_cast<UBGraphicsPolygonItem*> (mFastAccessItems.at(i));
-
-        if (polygonItem)
-        {
-            QColor color;
-
-            if (mDarkBackground)
-            {
-                color = polygonItem->colorOnDarkBackground();
-            }
-            else
-            {
-                color = polygonItem->colorOnLightBackground();
+    bool currentIslight = isLightBackground();
+    foreach (QGraphicsItem *item, items()) {
+        if (item->type() == UBGraphicsStrokesGroup::Type) {
+            UBGraphicsStrokesGroup *curGroup = static_cast<UBGraphicsStrokesGroup*>(item);
+            QColor compareColor =  curGroup->color(currentIslight ? UBGraphicsStrokesGroup::colorOnDarkBackground
+                                                                  : UBGraphicsStrokesGroup::colorOnLightBackground);
+
+            if (curGroup->color() == compareColor) {
+                QColor newColor = curGroup->color(!currentIslight ? UBGraphicsStrokesGroup::colorOnDarkBackground
+                                                                  : UBGraphicsStrokesGroup::colorOnLightBackground);
+                curGroup->setColor(newColor);
             }
-
-            polygonItem->setColor(color);
-            continue;
         }
     }