diff --git a/doc/kwindecoration/button.png b/doc/kwindecoration/button.png
index a4b78f0d6..e744ea478 100644
Binary files a/doc/kwindecoration/button.png and b/doc/kwindecoration/button.png differ
diff --git a/doc/kwindecoration/configure.png b/doc/kwindecoration/configure.png
index 4b13fb6e2..d68764b4a 100644
Binary files a/doc/kwindecoration/configure.png and b/doc/kwindecoration/configure.png differ
diff --git a/doc/kwindecoration/decoration.png b/doc/kwindecoration/decoration.png
index a6b8bd134..80530cc2e 100644
Binary files a/doc/kwindecoration/decoration.png and b/doc/kwindecoration/decoration.png differ
diff --git a/doc/kwindecoration/index.docbook b/doc/kwindecoration/index.docbook
index 5dd97576f..0f2992be2 100644
--- a/doc/kwindecoration/index.docbook
+++ b/doc/kwindecoration/index.docbook
@@ -1,141 +1,142 @@
 <?xml version="1.0" ?>
 <!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN"
 "dtd/kdedbx45.dtd" [
 <!ENTITY % addindex "IGNORE">
 <!ENTITY % English "INCLUDE" > <!-- change language only here -->
 ]>
 
 <article id="kwindecoration" lang="&language;">
 <articleinfo>
 <authorgroup>
 <author>&Rik.Hemsley; &Rik.Hemsley.mail;</author>
 <author>&Anne-Marie.Mahfouf; &Anne-Marie.Mahfouf.mail;</author>
 <!-- TRANS:ROLES_OF_TRANSLATORS -->
 </authorgroup>
 
-<date>2016-04-14</date>
-<releaseinfo>Plasma 5.6</releaseinfo>
+<date>2018-03-18</date>
+<releaseinfo>Plasma 5.12</releaseinfo>
 
 <keywordset>
 <keyword>KDE</keyword>
 <keyword>Systemsettings</keyword>
 <keyword>kwin</keyword>
 <keyword>window</keyword>
 <keyword>border</keyword>
 <keyword>theme</keyword>
 <keyword>style</keyword>
 </keywordset>
 </articleinfo>
 <sect1 id="window-deco">
 <title>Window Decoration</title>
 
 <para>This module allows you to select a style for the buttons and borders around
 windows.</para>
 
 <sect2>
 <title>Window Decorations</title>
 
 <para>
 <screenshot>
 <screeninfo>Window Decoration Configuration Module</screeninfo>
   <mediaobject>
     <imageobject>
       <imagedata fileref="main.png" format="PNG"/>
     </imageobject>
     <textobject>
       <phrase>Window Decoration Configuration Module</phrase>
     </textobject>
   </mediaobject>
 </screenshot>
 </para>
 
 <para>Choose a window decoration style from the preview list, using the 
 search field at the top of the screen or download a new style using the 
 <guibutton>Get New Decorations</guibutton> button.</para>
 
 <para>The default window decoration is called <quote>Breeze</quote>.</para>
 
 <para>Each style has a different look, but also a different
 <quote>feel</quote>. Some have (sometimes invisible)
 <quote>resize</quote> borders all around the edge, which make resizing
 easier but moving more difficult. Some have no borders on certain
 edges.</para>
 
 <para>You are encouraged to experiment with the different styles until
 you find one which best suits your pattern of work.</para>
 
-<para>In the preview pane at the right of each style you find a <inlinemediaobject><imageobject>
+<para>In the preview of each style you find a <inlinemediaobject><imageobject>
 <imagedata fileref="configure.png" format="PNG"/></imageobject></inlinemediaobject> 
 configure button to open configuration dialogs for the decoration.</para>
 
 <para>The options in this configuration dialog are applied to all windows. 
-Some window decorations (&eg; <quote>Breeze</quote> or <quote>Oxygen</quote>)
+Some window decorations (&eg; <quote>Breeze</quote>)
 provide a <guilabel>Window-Specific Overrides</guilabel> tab.
 On this tab you can change the border size and the visibility 
 of the window titlebar for particular windows.</para>
 
 <para>Different options for particular windows you find in the &systemsettings;
 module <ulink url="help:/kcontrol/windowspecific">Window Rules</ulink>.
 </para>
 
 <tip>
 <para>For accessibility purposes, some window decorations support
 extra wide borders.  If this is available, you can also choose a
 border size here.  These large borders are easier to see for low
 vision users, and easier to grab for people with limited mobility or
 difficulty using a mouse.</para>
 </tip>
 
 </sect2>
 
 <sect2>
 <title>Decorations</title>
 
 <para>In this dialog you can change the decoration of the window. 
 
 The available options depend on the selected style.
 </para>
 <para>
 <screenshot>
 <screeninfo>Breeze Decoration Options</screeninfo>
   <mediaobject>
     <imageobject>
       <imagedata fileref="decoration.png" format="PNG"/>
     </imageobject>
     <textobject>
       <phrase>Breeze Decoration Options</phrase>
     </textobject>
   </mediaobject>
 </screenshot>
 </para>
 </sect2>
 
 <sect2>
 <title>Buttons</title>
 
 <para>This tab allows you to customize the button location on the titlebar. 
-You can drag buttons into the titlebar, remove them or drag around the
+You can drag buttons &eg; the <guilabel>Application menu</guilabel> into the 
+titlebar, remove them or drag around the
 buttons until you have the order that makes you comfortable.
 </para>
 
 <screenshot>
 <screeninfo>Button Options</screeninfo>
   <mediaobject>
     <imageobject>
       <imagedata fileref="button.png" format="PNG"/>
     </imageobject>
     <textobject>
       <phrase>Button Options</phrase>
     </textobject>
   </mediaobject>
 </screenshot>
 
 <para>Enable <guilabel>Close windows by double clicking the menu button</guilabel>
 to have an additional option to the Close button or if you have removed the Close button from the titlebar.
 </para>
 
 </sect2>
 
 </sect1>
 
 </article>
diff --git a/doc/kwindecoration/main.png b/doc/kwindecoration/main.png
index 319d6ed18..55f6fb1d7 100644
Binary files a/doc/kwindecoration/main.png and b/doc/kwindecoration/main.png differ