diff --git a/clients/oxygen/oxygenbutton.cpp b/clients/oxygen/oxygenbutton.cpp
index ed23c67a6d..02faf03105 100644
--- a/clients/oxygen/oxygenbutton.cpp
+++ b/clients/oxygen/oxygenbutton.cpp
@@ -191,12 +191,14 @@ namespace Oxygen
     else palette.setCurrentColorGroup(QPalette::Inactive);
     QColor color = palette.window().color();
 
-    // translate buttons up if window maximized
     if(
       client_.compositingActive() &&
       !( client_.isMaximized() || type_ == ButtonItemClose || type_ == ButtonItemMenu ) )
     { painter.translate( 0, -1 ); }
 
+    // translate buttons down if window maximized
+    if( client_.isMaximized() ) painter.translate( 0, 1 );
+
     // base button color
     QColor bt = ((type_ == ButtonItemClose && forceInactive_ ) ? client_.backgroundPalette( this, palette ):palette).window().color();
 
diff --git a/clients/oxygen/oxygenclient.cpp b/clients/oxygen/oxygenclient.cpp
index 166e1e96cf..b84c26cddb 100644
--- a/clients/oxygen/oxygenclient.cpp
+++ b/clients/oxygen/oxygenclient.cpp
@@ -851,6 +851,9 @@ namespace Oxygen
     Qt::Alignment alignment( configuration().titleAlignment() | Qt::AlignVCenter );
     QString local( QFontMetrics( painter->font() ).elidedText( caption, Qt::ElideRight, rect.width() ) );
 
+    // translate title down in case of maximized window
+    if( isMaximized() ) painter->translate( 0, 2 );
+
     if( contrast.isValid() )
     {
       painter->setPen( contrast );
@@ -862,6 +865,9 @@ namespace Oxygen
     painter->setPen( color );
     painter->drawText( rect, alignment, local );
 
+    // translate back
+    if( isMaximized() ) painter->translate( 0, -2 );
+
   }
 
   //_______________________________________________________________________