diff --git a/clients/oxygen/oxygen.cpp b/clients/oxygen/oxygen.cpp
index 8098b4fc98..66dd2644fd 100644
--- a/clients/oxygen/oxygen.cpp
+++ b/clients/oxygen/oxygen.cpp
@@ -132,6 +132,7 @@ bool OxygenFactory::supports( Ability ability ) const
         case AbilityButtonMinimize:
         case AbilityButtonMaximize:
         case AbilityButtonClose:
+        case AbilityButtonOnAllDesktops:
         case AbilityButtonAboveOthers:
         case AbilityButtonBelowOthers:
         case AbilityButtonSpacer:
diff --git a/clients/oxygen/oxygenbutton.cpp b/clients/oxygen/oxygenbutton.cpp
index a3c8f8109c..9db5100f7d 100644
--- a/clients/oxygen/oxygenbutton.cpp
+++ b/clients/oxygen/oxygenbutton.cpp
@@ -225,6 +225,11 @@ void OxygenButton::drawIcon(QPainter *p, QPalette &pal, ButtonType &type)
     switch(type)
     {
         case ButtonSticky:
+            if(isChecked()) {
+                QPen newPen = p->pen();
+                newPen.setColor(KColorScheme(pal.currentColorGroup()).decoration(KColorScheme::HoverColor).color());
+                p->setPen(newPen);
+            }
             p->drawPoint(QPointF(10.5,10.5));
             break;
         case ButtonHelp:
diff --git a/clients/oxygen/oxygenclient.cpp b/clients/oxygen/oxygenclient.cpp
index f5ce1b9647..7b0bfcfbb6 100644
--- a/clients/oxygen/oxygenclient.cpp
+++ b/clients/oxygen/oxygenclient.cpp
@@ -192,15 +192,14 @@ KCommonDecorationButton *OxygenClient::createButton(::ButtonType type)
             return new OxygenButton(*this, i18n("Close"), ButtonClose);
 
         case AboveButton:
-            return new OxygenButton(*this, i18n("Keep above others"), ButtonAbove);
+            return new OxygenButton(*this, i18n("Keep Above Others"), ButtonAbove);
 
         case BelowButton:
-            return new OxygenButton(*this, i18n("Keep below others"), ButtonBelow);
+            return new OxygenButton(*this, i18n("Keep Below Others"), ButtonBelow);
 
-/*
         case OnAllDesktopsButton:
-            return new OxygenButton(*this, i18n("All Desktops"), ButtonSticky);
-*/
+            return new OxygenButton(*this, i18n("On All Desktops"), ButtonSticky);
+
         default:
             return 0;
     }