diff --git a/doc/src/images/affine-demo.png b/doc/src/images/affine-demo.png
index 534d6956ae..fcb698aa5a 100644
Binary files a/doc/src/images/affine-demo.png and b/doc/src/images/affine-demo.png differ
diff --git a/doc/src/images/basicdrawing-example.png b/doc/src/images/basicdrawing-example.png
index 043acbe8d9..7a46160406 100644
Binary files a/doc/src/images/basicdrawing-example.png and b/doc/src/images/basicdrawing-example.png differ
diff --git a/doc/src/images/basicsortfiltermodel-example.png b/doc/src/images/basicsortfiltermodel-example.png
index 7f3bfdf360..5ff1adc27b 100644
Binary files a/doc/src/images/basicsortfiltermodel-example.png and b/doc/src/images/basicsortfiltermodel-example.png differ
diff --git a/doc/src/images/calendarwidgetexample.png b/doc/src/images/calendarwidgetexample.png
index 407d9ed46c..3b9e3452e0 100644
Binary files a/doc/src/images/calendarwidgetexample.png and b/doc/src/images/calendarwidgetexample.png differ
diff --git a/doc/src/images/chip-demo.png b/doc/src/images/chip-demo.png
index 8889424023..a543a8e856 100644
Binary files a/doc/src/images/chip-demo.png and b/doc/src/images/chip-demo.png differ
diff --git a/doc/src/images/combowidgetmapper-example.png b/doc/src/images/combowidgetmapper-example.png
index 910d6ed6db..922f0e3b42 100644
Binary files a/doc/src/images/combowidgetmapper-example.png and b/doc/src/images/combowidgetmapper-example.png differ
diff --git a/doc/src/images/composition-demo.png b/doc/src/images/composition-demo.png
index 942bc58c29..1a08a60dcd 100644
Binary files a/doc/src/images/composition-demo.png and b/doc/src/images/composition-demo.png differ
diff --git a/doc/src/images/deform-demo.png b/doc/src/images/deform-demo.png
index 2f037f08a4..0c08994f14 100644
Binary files a/doc/src/images/deform-demo.png and b/doc/src/images/deform-demo.png differ
diff --git a/doc/src/images/diagramscene.png b/doc/src/images/diagramscene.png
index c84fc811e4..426c42b3a7 100644
Binary files a/doc/src/images/diagramscene.png and b/doc/src/images/diagramscene.png differ
diff --git a/doc/src/images/dragdroprobot-example.png b/doc/src/images/dragdroprobot-example.png
index 53aae777b7..b8eff6ff88 100644
Binary files a/doc/src/images/dragdroprobot-example.png and b/doc/src/images/dragdroprobot-example.png differ
diff --git a/doc/src/images/draggableicons-example.png b/doc/src/images/draggableicons-example.png
index 003ce13d03..5b6254d8c0 100644
Binary files a/doc/src/images/draggableicons-example.png and b/doc/src/images/draggableicons-example.png differ
diff --git a/doc/src/images/fetchmore-example.png b/doc/src/images/fetchmore-example.png
index 7af30119c4..e3b47b8a85 100644
Binary files a/doc/src/images/fetchmore-example.png and b/doc/src/images/fetchmore-example.png differ
diff --git a/doc/src/images/flowlayout-example.png b/doc/src/images/flowlayout-example.png
index 61abe1f15e..979ec9e216 100644
Binary files a/doc/src/images/flowlayout-example.png and b/doc/src/images/flowlayout-example.png differ
diff --git a/doc/src/images/frozencolumn-example.png b/doc/src/images/frozencolumn-example.png
index 66b5c103f8..e8f5b59c99 100644
Binary files a/doc/src/images/frozencolumn-example.png and b/doc/src/images/frozencolumn-example.png differ
diff --git a/doc/src/images/gallery-example.png b/doc/src/images/gallery-example.png
new file mode 100644
index 0000000000..a8f0eeea69
Binary files /dev/null and b/doc/src/images/gallery-example.png differ
diff --git a/doc/src/images/gradients-demo.png b/doc/src/images/gradients-demo.png
index 4c0959561d..321b047dae 100644
Binary files a/doc/src/images/gradients-demo.png and b/doc/src/images/gradients-demo.png differ
diff --git a/doc/src/images/imagecomposition-example.png b/doc/src/images/imagecomposition-example.png
index 697c980d5a..65cc8f9bea 100644
Binary files a/doc/src/images/imagecomposition-example.png and b/doc/src/images/imagecomposition-example.png differ
diff --git a/doc/src/images/licensewizard-example.png b/doc/src/images/licensewizard-example.png
index 97b3aaae4b..d11999adcb 100644
Binary files a/doc/src/images/licensewizard-example.png and b/doc/src/images/licensewizard-example.png differ
diff --git a/doc/src/images/menus-example.png b/doc/src/images/menus-example.png
index 81e6e0d270..dac580c1b6 100644
Binary files a/doc/src/images/menus-example.png and b/doc/src/images/menus-example.png differ
diff --git a/doc/src/images/orderform-example-detailsdialog.png b/doc/src/images/orderform-example-detailsdialog.png
index 88263692db..df83632fee 100644
Binary files a/doc/src/images/orderform-example-detailsdialog.png and b/doc/src/images/orderform-example-detailsdialog.png differ
diff --git a/doc/src/images/orderform-example.png b/doc/src/images/orderform-example.png
index c8545ad23a..a7efb885ca 100644
Binary files a/doc/src/images/orderform-example.png and b/doc/src/images/orderform-example.png differ
diff --git a/doc/src/images/painterpaths-example.png b/doc/src/images/painterpaths-example.png
index 7e1220d1d5..2b91117fb9 100644
Binary files a/doc/src/images/painterpaths-example.png and b/doc/src/images/painterpaths-example.png differ
diff --git a/doc/src/images/pathstroke-demo.png b/doc/src/images/pathstroke-demo.png
index 2df765ff32..ebe07c66b2 100644
Binary files a/doc/src/images/pathstroke-demo.png and b/doc/src/images/pathstroke-demo.png differ
diff --git a/doc/src/images/simpletreemodel-example.png b/doc/src/images/simpletreemodel-example.png
index 9655d107de..711f02062b 100644
Binary files a/doc/src/images/simpletreemodel-example.png and b/doc/src/images/simpletreemodel-example.png differ
diff --git a/doc/src/images/spreadsheet-demo.png b/doc/src/images/spreadsheet-demo.png
index ae7dde24b0..693a741621 100644
Binary files a/doc/src/images/spreadsheet-demo.png and b/doc/src/images/spreadsheet-demo.png differ
diff --git a/doc/src/images/standarddialogs-example.png b/doc/src/images/standarddialogs-example.png
index f584ebb27d..6598710f74 100644
Binary files a/doc/src/images/standarddialogs-example.png and b/doc/src/images/standarddialogs-example.png differ
diff --git a/doc/src/images/syntaxhighlighter-example.png b/doc/src/images/syntaxhighlighter-example.png
index d0e7f1249e..b5f09bfa40 100644
Binary files a/doc/src/images/syntaxhighlighter-example.png and b/doc/src/images/syntaxhighlighter-example.png differ
diff --git a/doc/src/images/tabdialog-example.png b/doc/src/images/tabdialog-example.png
index 219a85f86a..3a1f862b25 100644
Binary files a/doc/src/images/tabdialog-example.png and b/doc/src/images/tabdialog-example.png differ
diff --git a/doc/src/images/tabletexample.png b/doc/src/images/tabletexample.png
index a9b098d8d1..ee14a2531a 100644
Binary files a/doc/src/images/tabletexample.png and b/doc/src/images/tabletexample.png differ
diff --git a/doc/src/images/transformations-example.png b/doc/src/images/transformations-example.png
index 0fa185b0b8..549ca66b48 100644
Binary files a/doc/src/images/transformations-example.png and b/doc/src/images/transformations-example.png differ
diff --git a/doc/src/images/trivialwizard-example-conclusion.png b/doc/src/images/trivialwizard-example-conclusion.png
index c625ae4c75..eab87fa91f 100644
Binary files a/doc/src/images/trivialwizard-example-conclusion.png and b/doc/src/images/trivialwizard-example-conclusion.png differ
diff --git a/doc/src/images/trivialwizard-example-flow.png b/doc/src/images/trivialwizard-example-flow.png
index 79b6fce079..a48afc2147 100644
Binary files a/doc/src/images/trivialwizard-example-flow.png and b/doc/src/images/trivialwizard-example-flow.png differ
diff --git a/doc/src/images/trivialwizard-example-introduction.png b/doc/src/images/trivialwizard-example-introduction.png
index 0bbceeda7f..02291df794 100644
Binary files a/doc/src/images/trivialwizard-example-introduction.png and b/doc/src/images/trivialwizard-example-introduction.png differ
diff --git a/doc/src/images/trivialwizard-example-registration.png b/doc/src/images/trivialwizard-example-registration.png
index 30b985e215..bac3987a36 100644
Binary files a/doc/src/images/trivialwizard-example-registration.png and b/doc/src/images/trivialwizard-example-registration.png differ
diff --git a/doc/src/images/widgetmapper-combo-mapping.png b/doc/src/images/widgetmapper-combo-mapping.png
index f87cfaf346..02e55f6acc 100644
Binary files a/doc/src/images/widgetmapper-combo-mapping.png and b/doc/src/images/widgetmapper-combo-mapping.png differ
diff --git a/doc/src/images/windowflags-example.png b/doc/src/images/windowflags-example.png
index 89730bcc7e..f9c16ddba6 100644
Binary files a/doc/src/images/windowflags-example.png and b/doc/src/images/windowflags-example.png differ
diff --git a/doc/src/images/windowflags_controllerwindow.png b/doc/src/images/windowflags_controllerwindow.png
index d8ce239b03..57283144c6 100644
Binary files a/doc/src/images/windowflags_controllerwindow.png and b/doc/src/images/windowflags_controllerwindow.png differ
diff --git a/doc/src/images/windowflags_previewwindow.png b/doc/src/images/windowflags_previewwindow.png
index cafcd37e02..61314320bb 100644
Binary files a/doc/src/images/windowflags_previewwindow.png and b/doc/src/images/windowflags_previewwindow.png differ
diff --git a/examples/widgets/doc/images/addressbook-adddialog.png b/examples/widgets/doc/images/addressbook-adddialog.png
index e2bab80c53..7715d21fb7 100644
Binary files a/examples/widgets/doc/images/addressbook-adddialog.png and b/examples/widgets/doc/images/addressbook-adddialog.png differ
diff --git a/examples/widgets/doc/images/addressbook-editdialog.png b/examples/widgets/doc/images/addressbook-editdialog.png
index 7434aa44ef..6795865150 100644
Binary files a/examples/widgets/doc/images/addressbook-editdialog.png and b/examples/widgets/doc/images/addressbook-editdialog.png differ
diff --git a/examples/widgets/doc/images/addressbook-example.png b/examples/widgets/doc/images/addressbook-example.png
index eebe97a718..b76f96fd8d 100644
Binary files a/examples/widgets/doc/images/addressbook-example.png and b/examples/widgets/doc/images/addressbook-example.png differ
diff --git a/examples/widgets/doc/images/addressbook-filemenu.png b/examples/widgets/doc/images/addressbook-filemenu.png
index ebd14b62c4..452a8a188d 100644
Binary files a/examples/widgets/doc/images/addressbook-filemenu.png and b/examples/widgets/doc/images/addressbook-filemenu.png differ
diff --git a/examples/widgets/doc/images/addressbook-newaddresstab.png b/examples/widgets/doc/images/addressbook-newaddresstab.png
index 6b60ee08e9..075b2d428f 100644
Binary files a/examples/widgets/doc/images/addressbook-newaddresstab.png and b/examples/widgets/doc/images/addressbook-newaddresstab.png differ
diff --git a/examples/widgets/doc/images/addressbook-toolsmenu.png b/examples/widgets/doc/images/addressbook-toolsmenu.png
index 092e9a2153..a42f87fe51 100644
Binary files a/examples/widgets/doc/images/addressbook-toolsmenu.png and b/examples/widgets/doc/images/addressbook-toolsmenu.png differ
diff --git a/examples/widgets/doc/images/basiclayouts-example.png b/examples/widgets/doc/images/basiclayouts-example.png
index d19afdb069..7315aed7c5 100644
Binary files a/examples/widgets/doc/images/basiclayouts-example.png and b/examples/widgets/doc/images/basiclayouts-example.png differ
diff --git a/examples/widgets/doc/images/collidingmice-example.png b/examples/widgets/doc/images/collidingmice-example.png
index 41561de394..ac63557836 100644
Binary files a/examples/widgets/doc/images/collidingmice-example.png and b/examples/widgets/doc/images/collidingmice-example.png differ
diff --git a/examples/widgets/doc/images/completer-example-country.png b/examples/widgets/doc/images/completer-example-country.png
index fa7c8a9938..34a891c620 100644
Binary files a/examples/widgets/doc/images/completer-example-country.png and b/examples/widgets/doc/images/completer-example-country.png differ
diff --git a/examples/widgets/doc/images/completer-example-word.png b/examples/widgets/doc/images/completer-example-word.png
index aa3fb9c333..428421a19f 100644
Binary files a/examples/widgets/doc/images/completer-example-word.png and b/examples/widgets/doc/images/completer-example-word.png differ
diff --git a/examples/widgets/doc/images/completer-example.png b/examples/widgets/doc/images/completer-example.png
index dcaa253bd8..8d0534df25 100644
Binary files a/examples/widgets/doc/images/completer-example.png and b/examples/widgets/doc/images/completer-example.png differ
diff --git a/examples/widgets/doc/images/dropsite-example.png b/examples/widgets/doc/images/dropsite-example.png
index c555dd3609..6df535afad 100644
Binary files a/examples/widgets/doc/images/dropsite-example.png and b/examples/widgets/doc/images/dropsite-example.png differ
diff --git a/examples/widgets/doc/images/icons_monkey.png b/examples/widgets/doc/images/icons_monkey.png
deleted file mode 100644
index 141a87cabc..0000000000
Binary files a/examples/widgets/doc/images/icons_monkey.png and /dev/null differ
diff --git a/examples/widgets/doc/images/icons_monkey_mess.png b/examples/widgets/doc/images/icons_monkey_mess.png
deleted file mode 100644
index c23eed60ff..0000000000
Binary files a/examples/widgets/doc/images/icons_monkey_mess.png and /dev/null differ
diff --git a/examples/widgets/doc/images/icons_qt_extended_16x16.png b/examples/widgets/doc/images/icons_qt_extended_16x16.png
deleted file mode 100644
index 8bae9499e4..0000000000
Binary files a/examples/widgets/doc/images/icons_qt_extended_16x16.png and /dev/null differ
diff --git a/examples/widgets/doc/images/icons_qt_extended_17x17.png b/examples/widgets/doc/images/icons_qt_extended_17x17.png
deleted file mode 100644
index 7ef4222f93..0000000000
Binary files a/examples/widgets/doc/images/icons_qt_extended_17x17.png and /dev/null differ
diff --git a/examples/widgets/doc/images/icons_qt_extended_32x32.png b/examples/widgets/doc/images/icons_qt_extended_32x32.png
deleted file mode 100644
index 7b0c54bac3..0000000000
Binary files a/examples/widgets/doc/images/icons_qt_extended_32x32.png and /dev/null differ
diff --git a/examples/widgets/doc/images/icons_qt_extended_33x33.png b/examples/widgets/doc/images/icons_qt_extended_33x33.png
deleted file mode 100644
index 1a38f6e44b..0000000000
Binary files a/examples/widgets/doc/images/icons_qt_extended_33x33.png and /dev/null differ
diff --git a/examples/widgets/doc/images/icons_qt_extended_48x48.png b/examples/widgets/doc/images/icons_qt_extended_48x48.png
deleted file mode 100644
index 85dcb5f26c..0000000000
Binary files a/examples/widgets/doc/images/icons_qt_extended_48x48.png and /dev/null differ
diff --git a/examples/widgets/doc/images/icons_qt_extended_64x64.png b/examples/widgets/doc/images/icons_qt_extended_64x64.png
deleted file mode 100644
index d0bfd97f10..0000000000
Binary files a/examples/widgets/doc/images/icons_qt_extended_64x64.png and /dev/null differ
diff --git a/examples/widgets/doc/images/icons_qt_extended_8x8.png b/examples/widgets/doc/images/icons_qt_extended_8x8.png
deleted file mode 100644
index dcbb5811c6..0000000000
Binary files a/examples/widgets/doc/images/icons_qt_extended_8x8.png and /dev/null differ
diff --git a/examples/widgets/doc/images/regularexpression-example.png b/examples/widgets/doc/images/regularexpression-example.png
index ac314a7748..19bf5fa7ee 100644
Binary files a/examples/widgets/doc/images/regularexpression-example.png and b/examples/widgets/doc/images/regularexpression-example.png differ
diff --git a/examples/widgets/doc/images/treemodelcompleter-example.png b/examples/widgets/doc/images/treemodelcompleter-example.png
index 000405fe39..29982dd0e3 100644
Binary files a/examples/widgets/doc/images/treemodelcompleter-example.png and b/examples/widgets/doc/images/treemodelcompleter-example.png differ
diff --git a/examples/widgets/doc/images/undoframeworkexample.png b/examples/widgets/doc/images/undoframeworkexample.png
index 7e0a1df260..251b89b15d 100644
Binary files a/examples/widgets/doc/images/undoframeworkexample.png and b/examples/widgets/doc/images/undoframeworkexample.png differ
diff --git a/examples/widgets/doc/dropsite.qdoc b/examples/widgets/doc/src/dropsite.qdoc
similarity index 100%
rename from examples/widgets/doc/dropsite.qdoc
rename to examples/widgets/doc/src/dropsite.qdoc
diff --git a/examples/widgets/doc/src/gallery.qdoc b/examples/widgets/doc/src/gallery.qdoc
index 36b76d8f63..890121b169 100644
--- a/examples/widgets/doc/src/gallery.qdoc
+++ b/examples/widgets/doc/src/gallery.qdoc
@@ -9,6 +9,8 @@
     \ingroup examples-widgets
     \brief The Widgets Gallery example shows widgets relevant for designing UIs.
 
+    \image gallery-example.png "Screenshot of the example"
+
     This example demonstrates widgets typically used in dialogs and forms.
     It also allows for changing the style.
 */
diff --git a/examples/widgets/doc/src/licensewizard.qdoc b/examples/widgets/doc/src/licensewizard.qdoc
index 66c822e421..8965ef5624 100644
--- a/examples/widgets/doc/src/licensewizard.qdoc
+++ b/examples/widgets/doc/src/licensewizard.qdoc
@@ -19,7 +19,7 @@
 
     Some wizards are more complex in that they allow different
     traversal paths based on the information provided by the user.
-    The License Wizard example illustrates this. It provides five
+    The License Wizard example illustrates this. It provides several
     wizard pages; depending on which options are selected, the user
     can reach different pages.
 
diff --git a/examples/widgets/graphicsview/dragdroprobot/images/head.png b/examples/widgets/graphicsview/dragdroprobot/images/head.png
index 1e520e09b8..e462e64a44 100644
Binary files a/examples/widgets/graphicsview/dragdroprobot/images/head.png and b/examples/widgets/graphicsview/dragdroprobot/images/head.png differ
diff --git a/src/widgets/dialogs/qwizard.cpp b/src/widgets/dialogs/qwizard.cpp
index 8dc9958e49..35ada12bd8 100644
--- a/src/widgets/dialogs/qwizard.cpp
+++ b/src/widgets/dialogs/qwizard.cpp
@@ -1972,7 +1972,7 @@ void QWizardAntiFlickerWidget::paintEvent(QPaintEvent *)
     Some wizards are more complex in that they allow different
     traversal paths based on the information provided by the user.
     The \l{dialogs/licensewizard}{License Wizard} example illustrates this.
-    It provides five wizard pages; depending on which options are
+    It provides several wizard pages; depending on which options are
     selected, the user can reach different pages.
 
     \image licensewizard-flow.png
diff --git a/src/widgets/doc/images/customcompleter-example.png b/src/widgets/doc/images/customcompleter-example.png
index a525208118..15f034118b 100644
Binary files a/src/widgets/doc/images/customcompleter-example.png and b/src/widgets/doc/images/customcompleter-example.png differ
diff --git a/src/widgets/doc/images/licensewizard-flow.png b/src/widgets/doc/images/licensewizard-flow.png
index 76df63a98f..a5dd73b3d0 100644
Binary files a/src/widgets/doc/images/licensewizard-flow.png and b/src/widgets/doc/images/licensewizard-flow.png differ
diff --git a/src/widgets/doc/images/widgets-tutorial-childwidget.png b/src/widgets/doc/images/widgets-tutorial-childwidget.png
index 0d42d701fc..0fb2ccd596 100644
Binary files a/src/widgets/doc/images/widgets-tutorial-childwidget.png and b/src/widgets/doc/images/widgets-tutorial-childwidget.png differ
diff --git a/src/widgets/doc/images/widgets-tutorial-nestedlayouts.png b/src/widgets/doc/images/widgets-tutorial-nestedlayouts.png
index 1e2a9f4a1d..373ec68548 100644
Binary files a/src/widgets/doc/images/widgets-tutorial-nestedlayouts.png and b/src/widgets/doc/images/widgets-tutorial-nestedlayouts.png differ
diff --git a/src/widgets/doc/images/widgets-tutorial-toplevel.png b/src/widgets/doc/images/widgets-tutorial-toplevel.png
index bf7879f5aa..44fec8b862 100644
Binary files a/src/widgets/doc/images/widgets-tutorial-toplevel.png and b/src/widgets/doc/images/widgets-tutorial-toplevel.png differ
diff --git a/src/widgets/doc/images/widgets-tutorial-windowlayout.png b/src/widgets/doc/images/widgets-tutorial-windowlayout.png
index fce52cdcd9..07f2e0b5b3 100644
Binary files a/src/widgets/doc/images/widgets-tutorial-windowlayout.png and b/src/widgets/doc/images/widgets-tutorial-windowlayout.png differ