diff --git a/src/guiengine/skin.cpp b/src/guiengine/skin.cpp
index 9a674c75b1..e17caa6f9a 100644
--- a/src/guiengine/skin.cpp
+++ b/src/guiengine/skin.cpp
@@ -1400,6 +1400,7 @@ void Skin::drawRibbonChild(const core::recti &rect, Widget* widget,
     else
     {
         bool use_glow = true;
+        bool use_square = true;
 
         if (widget->m_event_handler != NULL &&
             widget->m_event_handler->m_properties[PROP_SQUARE] == "true")
@@ -1409,6 +1410,11 @@ void Skin::drawRibbonChild(const core::recti &rect, Widget* widget,
             widget->m_event_handler->m_event_handler
                     ->m_properties[PROP_SQUARE] == "true")
             use_glow = false;
+        if (widget->m_properties[PROP_FOCUS_ICON].size() > 0)
+        {
+            use_glow = false;
+            use_square = false;
+        }
 
         /* in combo ribbons, always show selection */
         RibbonWidget* parentRibbonWidget = NULL;
@@ -1601,7 +1607,7 @@ void Skin::drawRibbonChild(const core::recti &rect, Widget* widget,
                     /*alpha*/true);
             }
             // if we're not using glow, draw square focus instead
-            else
+            else if (use_square)
             {
                 drawBoxFromStretchableTexture(parentRibbonWidget, rect,
                     SkinConfig::m_render_params["squareFocusHalo1::neutral"]);