diff --git a/app/advancedconfigpage.ui b/app/advancedconfigpage.ui
index 096cef08..e6eb2515 100644
--- a/app/advancedconfigpage.ui
+++ b/app/advancedconfigpage.ui
@@ -1,218 +1,218 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>AdvancedConfigPage</class>
  <widget class="QWidget" name="AdvancedConfigPage">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>482</width>
     <height>300</height>
    </rect>
   </property>
   <layout class="QGridLayout" name="gridLayout">
    <item row="0" column="0">
     <widget class="QLabel" name="label_2">
      <property name="text">
       <string>Cache:</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
      </property>
     </widget>
    </item>
    <item row="0" column="1">
     <layout class="QHBoxLayout" name="horizontalLayout_2">
      <item>
       <widget class="QCheckBox" name="kcfg_DeleteThumbnailCacheOnExit">
        <property name="text">
-        <string>Delete thumbnail cache folder on exit</string>
+        <string>Low resource usage mode</string>
        </property>
       </widget>
      </item>
      <item>
       <spacer name="horizontalSpacer">
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
        <property name="sizeHint" stdset="0">
         <size>
          <width>40</width>
          <height>20</height>
         </size>
        </property>
       </spacer>
      </item>
     </layout>
    </item>
    <item row="1" column="1">
     <widget class="QLabel" name="cacheHelpLabel">
      <property name="text">
-         <string>Enable this option if you do not have a lot of disk space.&lt;br/&gt;&lt;br/&gt;&lt;em&gt;Be careful:&lt;/em&gt; this will delete the folder named &lt;filename&gt;.thumbnails&lt;/filename&gt; in your home folder, deleting all thumbnails previously generated by Gwenview and other applications.</string>
+         <string>Enable this option if you do not have a lot of disk space. This will avoid storing thumbnails on disk and will prefer embedded thumbnails of lower quality that are faster to load, if available.&lt;br/&gt;&lt;br/&gt;&lt;em&gt;Be careful:&lt;/em&gt; this will delete the folder named &lt;filename&gt;.thumbnails&lt;/filename&gt; in your home folder, deleting all thumbnails previously generated by Gwenview and other applications.</string>
      </property>
      <property name="wordWrap">
       <bool>true</bool>
      </property>
     </widget>
    </item>
    <item row="2" column="0">
     <spacer name="verticalSpacer_1">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeType">
       <enum>QSizePolicy::Fixed</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>20</height>
       </size>
      </property>
     </spacer>
    </item>
    <item row="3" column="0">
     <widget class="QLabel" name="label_3">
      <property name="text">
       <string>History:</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
      </property>
     </widget>
    </item>
    <item row="3" column="1">
     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
       <widget class="QCheckBox" name="kcfg_HistoryEnabled">
        <property name="text">
         <string>Remember folders and URLs</string>
        </property>
       </widget>
      </item>
      <item>
       <spacer name="horizontalSpacer_2">
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
        <property name="sizeHint" stdset="0">
         <size>
          <width>40</width>
          <height>20</height>
         </size>
        </property>
       </spacer>
      </item>
     </layout>
    </item>
    <item row="4" column="0" colspan="2">
     <spacer name="verticalSpacer_2">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeType">
       <enum>QSizePolicy::Fixed</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>20</height>
       </size>
      </property>
     </spacer>
    </item>
    <item row="5" column="0">
     <widget class="QLabel" name="colorRenderingLabel">
      <property name="text">
       <string>Rendering intent:</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
      </property>
      <property name="buddy">
       <cstring>relativeRenderingIntentRadioButton</cstring>
      </property>
     </widget>
    </item>
     <item row="5" column="1">
     <layout class="QHBoxLayout" name="horizontalLayout_4">
      <item>
       <widget class="QRadioButton" name="perceptualRenderingIntentRadioButton">
        <property name="text">
         <string comment="@option:Perceptual rendering intent">Perceptual</string>
        </property>
        <property name="checked">
         <bool>true</bool>
        </property>
       </widget>
      </item>
     </layout>
   </item>
   <item row="6" column="1">
    <widget class="QLabel" name="perceptualHelpLabel">
     <property name="text">
         <string>Scale all colors equally to fit them within the active color profile's color gamut</string>
     </property>
     <property name="wordWrap">
      <bool>true</bool>
     </property>
    </widget>
   </item>
   <item row="7" column="0" colspan="2">
    <spacer name="verticalSpacer_3">
     <property name="orientation">
      <enum>Qt::Vertical</enum>
     </property>
     <property name="sizeType">
      <enum>QSizePolicy::Fixed</enum>
     </property>
     <property name="sizeHint" stdset="0">
      <size>
       <width>20</width>
       <height>10</height>
      </size>
     </property>
    </spacer>
   </item>
   <item row="8" column="1">
    <layout class="QHBoxLayout" name="horizontalLayout_3">
     <item>
      <widget class="QRadioButton" name="relativeRenderingIntentRadioButton">
       <property name="text">
        <string comment="@option:Relative Colorimetric rendering intent">Relative Colorimetric</string>
       </property>
       <property name="checked">
        <bool>true</bool>
       </property>
      </widget>
     </item>
    </layout>
   </item>
   <item row="9" column="1">
    <widget class="QLabel" name="relativeHelpLabel">
     <property name="text">
         <string>Squash colors that don't fit within the active color profile's color gamut, leaving other colors untouched</string>
     </property>
     <property name="wordWrap">
      <bool>true</bool>
     </property>
    </widget>
   </item>
   <item row="10" column="1">
     <spacer name="verticalSpacer_7">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>20</height>
       </size>
      </property>
     </spacer>
    </item>
   </layout>
  </widget>
  <resources/>
  <connections/>
 </ui>
diff --git a/doc/index.docbook b/doc/index.docbook
index ca7cde00..dc6d3bd3 100644
--- a/doc/index.docbook
+++ b/doc/index.docbook
@@ -1,907 +1,907 @@
 <?xml version="1.0"?>
 <!DOCTYPE book 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 -->
 ]>
 
 <book id="gwenview" lang="&language;">
 <title>Gwenview User Manual</title>
 
 <bookinfo>
 <authorgroup>
 <author>
 <firstname>Aurélien</firstname>
 <surname>Gâteau</surname>
 <affiliation><address><email>agateau@kde.org</email></address></affiliation>
 </author>
 <author>
 <firstname>Christopher</firstname><surname>Martin</surname>
 <affiliation><address><email>chrsmrtn@debian.org</email></address></affiliation>
 </author>
 <author>
 <firstname>Henry</firstname>
 <surname>de Valence</surname>
 <affiliation><address><email>hdevalence@gmail.com</email></address></affiliation>
 </author>
 <!-- TRANS:ROLES_OF_TRANSLATORS -->
 </authorgroup>
 <copyright>
 <year>2005</year>
 <holder>Aurélien Gâteau</holder>
 </copyright>
 <copyright>
 <year>2008</year>
 <holder>Henry de Valence</holder>
 </copyright>
 <legalnotice>&FDLNotice;</legalnotice>
 
 <date>2018-10-14</date>
 <releaseinfo>Applications 18.12</releaseinfo>
 <abstract>
 <para>&gwenview; is an image and video viewer.</para>
 </abstract>
 <keywordset>
 <keyword>KDE</keyword>
 <keyword>image</keyword>
 <keyword>viewer</keyword>
 <keyword>artist</keyword>
 <keyword>photo</keyword>
 <keyword>picture</keyword>
 </keywordset>
 </bookinfo>
 <!--FIXME Read devels blog on http://agateau.com/
 -->
 <chapter id="introduction">
 <title>Introduction</title>
 
 <sect1 id="what-is-gwenview">
 <title>What is &gwenview;</title>
 
 <para>
 &gwenview; is a fast and easy to use image and video viewer.
 </para>
 
  <para>
 &gwenview; features two main modes: Browse and View. Both modes can be used
 in a normal application window and Full Screen. Browse Mode
 lets you navigate through your computer showing thumbnails of your images, View
 Mode lets you view images one at a time, and Full Screen lets you make quick
 slideshows.  There is also a start screen that displays a list of recently opened
 folders and &URL;s as well as your places and tags.
 </para>
 
 <para>Image loading is handled by the &Qt; library, so &gwenview; supports all
 image formats your &Qt; installation supports. &gwenview; correctly displays images
 with an alpha channel (transparency) as well as animations.</para>
 
 <para>&gwenview; supports the displaying and editing of EXIF comments in JPEG
 images. Lossless JPEG transforms such as rotations and mirroring are also supported.</para>
 
 <para>&gwenview; can read embedded color profiles from PNG and JPEG files.
 It can use the image color profile together with the display color profile
 to output correct colors on the screen.</para>
 </sect1>
 
 </chapter>
 
 <chapter id="interface">
 <title>The Interface</title>
 
 <sect1 id='start_page'><title>Start Page</title>
 <para>The start page lists recently opened folders and &URL;s on the left side,
 and your places and tags on the right side.</para>
 
 <screenshot>
   <screeninfo>Start Page Screenshot</screeninfo>
   <mediaobject>
     <imageobject>
       <imagedata fileref="start-page.png" format="PNG" />
     </imageobject>
   </mediaobject>
 </screenshot>
 </sect1>
 
 <sect1 id='image_operations'><title>Image Operations</title>
 <para>&gwenview; has a few features which are available in both Browse, View, and
 Full Screen view. &gwenview; has the capability to do basic alteration of your
 images.</para>
 <itemizedlist>
 <listitem><para>Rotate: A rotate operation will rotate the image either to the left
 or to the right, depending on whether you do
   <menuchoice>
     <shortcut>
 <keycombo action="simul">&Ctrl;<keycap>R</keycap></keycombo>
     </shortcut>
     <guimenu>Edit</guimenu>
     <guimenuitem>Rotate Right</guimenuitem>
   </menuchoice>
 or
   <menuchoice>
     <shortcut>
 <keycombo action="simul">&Ctrl;<keycap>L</keycap></keycombo>
     </shortcut>
     <guimenu>Edit</guimenu>
     <guimenuitem>Rotate Left</guimenuitem>
   </menuchoice> </para></listitem>
 
 <listitem><para>
  <menuchoice>
   <guimenu>Edit</guimenu>
   <guimenuitem>Mirror</guimenuitem>
  </menuchoice>:
  This operation will reflect the image along the vertical
 axis, as if you were seeing it in a mirror.</para></listitem>
 
 <listitem><para>
  <menuchoice>
   <guimenu>Edit</guimenu>
   <guimenuitem>Flip</guimenuitem>
  </menuchoice>:
 This operation will reflect the image upside-down (a
 reflection along the horizontal axis)</para></listitem>
 
 <listitem><para>
  <menuchoice>
   <shortcut>
     <keycombo action="simul">&Shift;<keycap>R</keycap></keycombo>
   </shortcut>
   <guimenu>Edit</guimenu>
   <guimenuitem>Resize</guimenuitem>
  </menuchoice>:
 This operation will allow you to shrink or expand the image. Note that if you
 increase the size of an image, it may appear
 blurry and/or pixelated.</para></listitem>
  <!-- Crop + Red Eye Reduction are discussed in View mode sect-->
 </itemizedlist>
 
 <para>These actions are also available on the <guilabel>Operations</guilabel> tab of the sidebar.</para>
 
 <para>If you have edited one or more images a bar with additional actions is displayed at the top of the image.
 You can undo or redo your changes, go to the previous or next modified image and there are three options to save
 the changed images.
 </para>
 
 <screenshot>
   <screeninfo>Actions bar for modified images</screeninfo>
   <mediaobject>
     <imageobject>
       <imagedata fileref="modified-bar.png" format="PNG" />
     </imageobject>
   </mediaobject>
 </screenshot>
 
 <!--FIXME all actions also available context menus, where to add that info -->
 
 <tip><para>If you have installed the KIPI Plugins, a <guimenu>Plugins</guimenu>
 menu will be available that will allow you to perform many additional operations
 on your images.</para></tip>
 </sect1>
 
 <sect1 id='browse_mode'><title>Browse Mode</title>
 
 <para>When in Browse Mode, you can easily navigate through your files and folders.
   The preview window shows thumbnails of the images in the current folder, as
   well as subfolders. </para>
 
 <screenshot>
   <screeninfo>Browse Mode Screenshot</screeninfo>
   <mediaobject>
     <imageobject>
       <imagedata fileref="browse_mode.png" format="PNG" />
     </imageobject>
   </mediaobject>
 </screenshot>
 
 <para>
 Moving the mouse over an image shows buttons to select or rotate the image as well as
 a button to enter Fullscreen Mode.
 Modified images are indicated by an icon down right, click it to save the changed image.
 Clicking on an image takes you into View
 Mode.  You may select multiple images and switch to View Mode to view them side-by-side.</para>
 
 <para>The slider at the bottom right allows you to change the size of the images.
 You can also filter the images by filename, date, tag or rating using the box on the
 lower left. The toolbar appears in both Browse mode as well as View
 mode and contains the most commonly used actions. </para>
 <itemizedlist>
 <listitem><para><guiicon>Start Page</guiicon>: Open the start page.</para></listitem>
 <listitem><para><guiicon>Browse</guiicon>: Switches to Browse Mode.</para></listitem>
 <listitem><para><guiicon>View</guiicon>: Switches to View Mode.</para></listitem>
 <listitem><para><guiicon>Full Screen</guiicon>: Switches to Full Screen Mode.</para></listitem>
 <listitem><para><guiicon>Previous</guiicon>: Clicking this icon will go
 to the previous image in the folder.</para></listitem>
 
 <listitem><para><guiicon>Next</guiicon>: Clicking this button will go to
 the next image in the folder.</para></listitem>
 
 <listitem><para><guiicon>Rotate Left/Right</guiicon>: Same as discussed in
 Image Operations</para></listitem>
 
 <listitem><para><guiicon>Share</guiicon>: Clicking this button opens an export menu to share your images through social
 media and image collection web services. This functionality depends on the list of installed
 KIPI plugins.</para></listitem>
 </itemizedlist>
 
 </sect1>
 
 <sect1 id='view_mode'><title>View Mode</title>
 <para>View Mode displays full-size images.  The same
 <link linkend="sidebar">sidebar</link> available in Browse Mode is displayed on
 the left. At the bottom, there is the Thumbnail Bar, which allows you to scroll
 through the images in the current folder. The Thumbnail Bar can be minimized by
 clicking on the <guibutton>Thumbnail Bar</guibutton> button. Clicking again will
 restore it. To change the size of the thumbnails move the splitter with the &LMB;.</para>
 
 <para>View Mode supports viewing multiple images side-by-side.  You may select
 multiple images in Browse Mode before switching to View Mode, or you may click the
 <guibutton>+</guibutton> button that appears when hovering over images in the
 Thumbnail Bar to add a pane displaying that image.  A <guibutton>-</guibutton> will
 then appear that will permit you to remove its pane.</para>
 
 <para>When multiple images are displayed, a small toolbar appears below each image
 that permits you to delete the image or remove its pane.  You may perform zoom operations
 independently for each image, or synchronize them.  Toggle this by checking the
 <guilabel>Synchronize</guilabel> to the left of the zoom slider or by pressing
 <keycombo action="simul">&Ctrl;<keycap>Y</keycap></keycombo>.  You can switch images
 by clicking on their pane, or using your keyboard.  To switch to the image on the
 right, press <keycombo action="simul">&Tab;</keycombo>.  To switch to the image
 on the left, press <keycombo action="simul">&Shift;&Tab;</keycombo>.</para>
 
 <screenshot>
   <screeninfo>View Mode Screenshot</screeninfo>
   <mediaobject>
     <imageobject>
       <imagedata fileref="view_mode.png" format="PNG" />
     </imageobject>
   </mediaobject>
 </screenshot>
 
 <para>The slider at the bottom right controls the zoom of the image. The
 <guibutton>Fit</guibutton>, <guibutton>Fill</guibutton> and <guibutton>100%</guibutton>
 buttons are next to the zoom slider and are three preset zoom levels. The
 <guibutton>Fit</guibutton> button zooms the current image to fit the size
 of the window, the <guibutton>Fill</guibutton> button zooms the image to fill the window 
 by fitting width or height and the <guibutton>100%</guibutton> button zooms the image to
 the actual pixel size. The shortcut <keycap>F</keycap> toggles between <guibutton>Fit</guibutton> mode and <guibutton>100%</guibutton>, pressing <keycombo action="simul">&Shift;<keycap>F</keycap></keycombo> will toggle <guibutton>Fill</guibutton> respectively.</para>
 
 <para>When an image is in zoom-to-fit mode, you can go to the previous and next
 image with the arrow keys. When you zoom in, arrow keys are used to scroll the image.
 This is very similar to the behavior provided by phones or digital cameras.</para>
 
 <para>When an image is zoomed in, a bird-eye view appears and lets you scroll
 the image using the mouse and the arrow keys. The bird-eye view automatically hides
 itself after a short delay, showing back only while zooming or scrolling.</para>
 
 <para>You can define what happens when going to image B after having zoomed in on an area of image A using the options in the <guilabel>Zoom mode</guilabel> group on the <guimenuitem>Image View</guimenuitem> page of the &gwenview; configuration window which can be reached using the <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure &gwenview;...</guimenuitem></menuchoice>.</para>
 
 <itemizedlist>
     <listitem><para>If set to <guilabel>Autofit each image</guilabel>, image B is zoomed out to fit the screen.</para></listitem>
     <listitem><para>If set to <guilabel>Keep same zoom and position</guilabel>, all images share the same zoom and position: image B is set to the same zoom parameters as image A (and if these are changed, image A will then be displayed with the updated zoom and position).</para></listitem>
     <listitem><para>If set to <guilabel>Per image zoom and position</guilabel>, all images remember their own zoom and position: image B is initially set to the same zoom parameters as image A, but will then remember its own zoom and position (if these are changed, image A will <emphasis>not</emphasis> be displayed with the updated zoom and position).</para></listitem>
 </itemizedlist>
 
 <tip><para>You can start directly in View mode by starting &gwenview; from a
 context menu like <guimenuitem>Open With</guimenuitem> in another program or by
 launching it from the command line with an image as an argument.</para> </tip>
 
 <para>The following additional image operations are available only in View Mode:</para>
 
 <itemizedlist>
 <listitem><para>
  <menuchoice>
    <shortcut>
         <keycombo action="simul">&Shift;<keycap>C</keycap></keycombo>
    </shortcut>
   <guimenu>Edit</guimenu>
   <guimenuitem>Crop</guimenuitem>
  </menuchoice>:
  This operation lets you discard parts of the image you don't want.
 </para>
 <para>
     You can access the advanced cropping parameters by ticking <guilabel>Advanced settings</guilabel> check box on the bottom popup pane. Use the corresponding fields to tune up the cropping operation.
 </para>
 <para>
     It is also possible to adjust the cropped area by dragging the gray square handles on the borders of the image. You can move the cropped area by clicking and holding the &LMB; and drag it with the mouse pointer.
 </para>
 <para>
     Press the <guibutton>Crop</guibutton> button to see the results when you are ready. Use the upper popup pane to save the results or undo/redo the operation.
 </para></listitem>
 
 <listitem><para>
  <menuchoice>
   <guimenu>Edit</guimenu>
   <guimenuitem>Red Eye Reduction</guimenuitem>
  </menuchoice>:
  This operation reduces the "red eye" effect commonly found in photographs taken
  with a flash camera.
 </para></listitem>
 </itemizedlist>
 
 </sect1>
 
 <sect1 id='fullscreen_mode'>
 <title>Full Screen Modes</title>
 
 <para>Access Full Screen by pressing the <guiicon>Full Screen</guiicon>
 button on the toolbar, or by
   <menuchoice>
     <shortcut>
 <keycombo action="simul">&Ctrl;&Shift;<keycap>F</keycap></keycombo>
     </shortcut>
     <guimenu>View</guimenu>
     <guimenuitem>Full Screen Mode</guimenuitem>
   </menuchoice>.
 </para>
 <para>To leave this mode press the &Esc; key.</para>
 
 <sect2>
 <title>Browse Mode Full Screen</title>
 
 <para>In Browse Mode you can switch to fullscreen also by clicking on the button that
 appears when you move the mouse over the thumbnails.
 </para>
 <screenshot>
   <screeninfo>Full Screen View Mode Screenshot</screeninfo>
   <mediaobject>
     <imageobject>
       <imagedata fileref="fullscreen-browse.png" format="PNG" />
     </imageobject>
   </mediaobject>
 </screenshot>
 <para>Going fullscreen while browsing gives you a more immersive experience while
 you go through your pictures. It is quite nice on your regular computer, but makes
 even more sense when you connect your laptop to the big TV in the living room to show
 pictures to your guests.
 </para>
 </sect2>
 
 <sect2>
 <title>View Mode Full Screen</title>
 <para>The full screen View Mode shows a slideshow of your images. Access Full Screen
 Mode by clicking on the button that appears when you move the mouse over the
 thumbnails in Browse Mode, by pressing the <guiicon>Full Screen</guiicon>
 button on the taskbar.
 
 <screenshot>
   <screeninfo>Full Screen Browse Mode Screenshot</screeninfo>
   <mediaobject>
     <imageobject>
       <imagedata fileref="fullscreen-view.png" format="PNG" />
     </imageobject>
   </mediaobject>
 </screenshot>
 </para>
 
 <para>The top bar will hide itself automatically; to show it simply move the
 mouse to the top of the screen. If the mouse cursor is over the top bar, it
 will not autohide. Most of the buttons on the bar are the same as the ones on
 the toolbar in Browse or View Modes, except for the <guiicon>Exit Full
 Screen Mode</guiicon> button which returns you to the &gwenview; window, the
 <guiicon>Pause/Resume Slideshow</guiicon> button, and the
 <guiicon>Configure Full Screen Mode</guiicon> button which shows a
 small settings dialog that allows you to easily and quickly configure the
 slideshow. The slideshow controls there are: </para>
 
 <itemizedlist>
     <listitem><para>The <guilabel>Interval</guilabel> slider controls how long
     &gwenview; will show an image before it move to the next one.</para></listitem>
     <listitem><para>If the <guilabel>Loop</guilabel> check box is checked, when the
     end of the slideshow is reached, it will continue from the beginning instead
     of stopping. </para></listitem>
     <listitem><para>If the <guilabel>Random</guilabel> check box is checked,
     instead of progressing through the folder alphabetically, images will be
     shown in random order.</para></listitem>
     <listitem><para><guibutton>Select Image Information to Display</guibutton> allows
     you to define what metadata is displayed under the buttons on the toolbar.
     </para></listitem>
     <listitem><para>If the <guilabel>Show thumbnails</guilabel> check box is checked,
     thumbnails for all images in the current folder will be displayed to the right of
     the toolbar.</para></listitem>
     <listitem><para>The <guilabel>Height</guilabel> slider changes the size of the
     thumbnails displayed.</para></listitem>
 </itemizedlist>
 
 <para>If enabled, an area that shows you the other images in the current folder will
 be shown on the top bar. Clicking on one will display it.</para>
 </sect2>
 </sect1>
 
 <sect1 id="sidebar">
 <title>Sidebar</title>
 
  <para>The sidebar on the left is available in the Browse and View <!--FIXME not in Full Screen-->modes, but does
 not appear by default in Browse Mode.  Its appearance can be toggled using
 <menuchoice>
 <shortcut>
     <keycap>F4</keycap>
 </shortcut>
 <guimenu>View</guimenu>
 <guimenuitem>Sidebar</guimenuitem>
 </menuchoice>
 or using the <guiicon>▮←</guiicon> / <guiicon>▮→</guiicon> button at the left side
 of the statusbar. When clicked it collapses or expands the sidebar.
 The sidebar contains several tabs:</para>
 
 <variablelist>
 
 <varlistentry>
 <term><guilabel>Folders</guilabel></term>
 <listitem><para>Displays a list of all folders on your system permitting you to
 switch between them.  In Browse Mode thumbnails from the folder will be displayed,
 while in View Mode the first image in the folder will appear, from which you can
 browse through the folder using the <guibutton>Previous</guibutton> and
 <guibutton>Next</guibutton> buttons or shortcuts. Clicking on a folder multiple
 times toggles between View Mode and Browse Mode.</para></listitem>
 </varlistentry>
 
 <varlistentry>
 <term><guilabel>Information</guilabel></term>
 <listitem><para>Displays <guilabel>Meta Information</guilabel> like the filename
 and size.  The <guilabel>More...</guilabel> link permits you to view all available
 metadata and select which data appear in the sidebar.</para></listitem>
 </varlistentry>
 
 <varlistentry>
 <term><guilabel>Operations</guilabel></term>
 <listitem><para>This permits you to perform the
 <link linkend="image_operations">previously described global image operations</link>
 as well as those specific to View Mode.  It also permits common file operations like
 copying, renaming, deleting, and creating new folders.</para></listitem>
 </varlistentry>
 
 </variablelist>
 </sect1>
 
 </chapter>
 <chapter id="importer">
 <title>&gwenview; Importer</title>
 
 <sect1>
 <title>Introduction</title>
 <para>The &gwenview; Importer allows you to import images from a digital camera or
 removable media.  To launch it, select <guilabel>Download Photos with &gwenview;</guilabel>
 in the &kde; Device Notifier after connecting a supported device.</para>
 
 <para>When you plug in a device the &gwenview; importer recursively lists all images and videos.
 </para>
 <para>This is not always what you expect, &eg; plugging a smartphone you do not want to list all medias
 of the device; but only the pictures you took, which are usually in a special subfolder.
 </para>
 
 <screenshot>
   <screeninfo>Root Folder Picking</screeninfo>
   <mediaobject>
     <imageobject>
       <imagedata fileref="importer-picking-root-folder.png" format="PNG" />
     </imageobject>
   </mediaobject>
 </screenshot>
 <para>It is possible to select the root folder to list, and &gwenview; Importer will remember the
 last root folder for each device. This way, next time you plug a device in, only the relevant
 pictures and videos should be listed.
 </para>
 
 <sect2>
 <title>Importing Images</title>
 
 <screenshot>
   <screeninfo>&gwenview; Importer Screenshot</screeninfo>
   <mediaobject>
     <imageobject>
       <imagedata fileref="importer.png" format="PNG" />
     </imageobject>
   </mediaobject>
 </screenshot>
 
 <para>If you wish, you may select the images you want to import under
 <guilabel>Select the documents to import</guilabel> by pressing the <guiicon>+</guiicon>
 button that appears when hovering over an image.  You may also select the folder
 that images are imported to in the text box at the bottom of the window. When you are done, click the
 <guibutton>Import Selected</guibutton> button to import only the images you have
 selected, or click <guibutton>Import All</guibutton> to import all images found
 on the device.</para>
 </sect2>
 
 <sect2>
 <title>Automatic Renaming</title>
 <para>&gwenview; Importer can rename your files according to a specified pattern.
 To configure this, select the <guibutton>Settings</guibutton> in the lower left
 corner.  You may turn this feature on or off using the check box at the top.  The
 <guilabel>Rename Format</guilabel> supports several special parameters, which will
 be replaced by metadata such as the date the image was created or its filename.
 They are listed below the text box.  You may either click on the parameter name to
 enter it into the text box or type one manually.</para>
 </sect2>
 </sect1>
 
 </chapter>
 <chapter id="tips">
 <title>Tips</title>
 <sect1 id='mouse'><title>Using the mouse</title>
 
 <sect2 id='mouse_panning'><title>Panning with the mouse</title>
 <itemizedlist>
   <listitem><para>Holding down the left mouse button on an image allows you to
       scroll the image.</para></listitem>
   <listitem><para>The mouse wheel will scroll the image up and
       down.</para></listitem>
 </itemizedlist>
 </sect2>
 
 
 <sect2 id='mouse_zooming'><title>Zooming with the mouse</title>
 <itemizedlist>
   <listitem><para>Clicking the middle mouse button will toggle the <guibutton>Fit</guibutton> zoom button. Hold down the &Shift; key and middle-click to toggle the <guibutton>Fill</guibutton> zoom button.</para></listitem>
   <listitem><para>Hold down the &Ctrl; key, then either use the mouse wheel to
       zoom in and out or left click to zoom in and right click to zoom
       out.</para></listitem>
 
   <listitem><para>The mouse wheel, used while holding down the &Alt; key, will
       scroll the image horizontally.</para></listitem>
 </itemizedlist>
 </sect2>
 
 
 <sect2 id='mouse_browsing'><title>Browsing with the mouse</title>
 <itemizedlist>
   <listitem><para>When in Browse mode, clicking an image switches into View mode and
   shows that image.</para></listitem>
   <listitem><para>When in Browse mode, scrolling the mouse wheel will scroll up
   or down the thumbnail view area.</para></listitem>
   <listitem><para>If the <guilabel>Mouse wheel behavior</guilabel> option in
   <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure
   &gwenview;</guimenuitem></menuchoice>
   is set to Browse, scrolling the mouse wheel while in View Mode will
   move you through the images in the folder.</para></listitem>
 </itemizedlist>
 </sect2>
 </sect1>
 
 <sect1 id="keybindings"> <title>Key bindings</title>
 
 <para>&gwenview; comes with a range of keyboard shortcuts, all of which can be
 viewed and remapped by selecting
 <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure
 Shortcuts...</guimenuitem></menuchoice>. Note that in the Files and Folders
 windows, all the normal &plasma; shortcuts are functional, unless otherwise
 remapped.</para>
 
 <para>A few of the most useful default bindings are:</para>
 
 <itemizedlist>
 <listitem><para><keycap>Space</keycap>: Displays the next image
 in the directory.</para></listitem>
 
 <listitem><para>&Backspace;:
 Displays the previous image in the directory.</para></listitem>
 
 <listitem><para><keycombo
 action="simul">&Alt;<keycap>Up</keycap></keycombo>:
 Moves to the parent folder of the current folder.</para></listitem>
 
 <listitem><para><keycombo
 action="simul">&Ctrl;&Shift;<keycap>F</keycap></keycombo>:
 Switches into Full Screen Mode.</para></listitem>
 
 <listitem><para>&Esc;: Switches back to Browse Mode.
 </para></listitem>
 
 <listitem><para><keycombo
 action="simul">&Ctrl;<keycap>M</keycap></keycombo>:
 Show or hide the menubar.</para></listitem>
 
 <listitem><para><keycombo
 action="simul">&Ctrl;<keycap>B</keycap></keycombo>:
 Show or hide the Thumbnail bar.</para></listitem>
 
 <listitem><para><keycap>F4</keycap>:
 Show or hide the Sidebar.</para></listitem>
 
 <listitem><para><keycap>F6</keycap>:
 Make the Location bar editable so that you can directly type in a file path.
 You can return to the standard Location Bar by pressing the arrow at the
 right.</para></listitem>
 
 <listitem><para><keycombo
 action="simul">&Ctrl;<keycap>R</keycap></keycombo>:
 Rotate the current image to the right.</para></listitem>
 
 <listitem><para><keycombo
 action="simul">&Ctrl;<keycap>L</keycap></keycombo>:
 Rotate the current image to the left.</para></listitem>
 
 <listitem><para><keycombo action="simul">&Shift;<keycap>R</keycap></keycombo>:
 Resize the current image.</para></listitem>
 
 <listitem><para><keycombo action="simul">&Shift;<keycap>C</keycap></keycombo>:
 Crop the current image.</para></listitem>
 
 <listitem><para><keycombo action="simul">&Ctrl;<keycap>Y</keycap></keycombo>:
 When multiple images are displayed in View Mode, this synchronizes their views.
 </para></listitem>
 <!--FIXME not in kf5
 <listitem><para><keycombo action="simul">&Tab;</keycombo>:
 When multiple images are displayed in View Mode, this switched to the image to
 the right of the currently selected image.</para></listitem>
 
 <listitem><para><keycombo action="simul">&Shift;&Tab;</keycombo>:
 When multiple images are displayed in View Mode, this switched to the image to
 the left of the currently selected image.</para></listitem>
 -->
 <listitem><para><keycombo
 action="simul">&Ctrl;<keycap>S</keycap></keycombo>:
 Save any changes made to the image.</para></listitem>
 
 <listitem><para><keycap>Del</keycap>:
 Move the current image to the trash.</para></listitem>
 
 <listitem><para><keycombo
 action="simul">&Shift;<keycap>Del</keycap></keycombo>:
 Permanently delete the image from the disk. Note that this operation is
 irreversible and cannot be undone.</para></listitem>
 
 <listitem><para><keycombo
 action="simul">&Ctrl;<keycap>P</keycap></keycombo>:
 Print the current image.</para></listitem>
 
 <listitem><para><keycombo
 action="simul">&Ctrl;<keycap>O</keycap></keycombo>:
 Open an image using the standard file selection dialog.</para></listitem>
 
 <listitem><para><keycap>F</keycap>:
 Pressing this shortcut toggles zoom-to-fit on and off.</para></listitem>
 
 <listitem><para><keycap>P</keycap>:
 Viewing a video this shortcut toggles playback on and off.</para></listitem>
 
 <listitem><para><keycombo
 action="simul">&Ctrl;<keycap>T</keycap></keycombo>:
 Edit tags.</para></listitem>
 
 <listitem><para><keycap>F2</keycap>:
 Rename an image inline.</para></listitem>
 
 <listitem><para><keycap>Del</keycap>:
 Move an image to the trash.</para></listitem>
 
 <listitem><para><keycombo
 action="simul">&Shift;<keycap>Del</keycap></keycombo>:
 Delete an image.</para></listitem>
 
 <listitem><para><keycombo
 action="simul">&Ctrl;<keycap>F7</keycap></keycombo>:
 Copy an image.</para></listitem>
 
 <listitem><para><keycombo
 action="simul">&Ctrl;<keycap>F8</keycap></keycombo>:
 Move an image.</para></listitem>
 
 <listitem><para><keycombo
 action="simul">&Ctrl;<keycap>F9</keycap></keycombo>:
 Link an image.</para></listitem>
 
 </itemizedlist>
 
 </sect1>
 </chapter>
 
 <chapter id="configure">
     <title>Configuring &gwenview;</title>
     <sect1 id="configindex">
         <title>Configuration overview</title>
         <para>
             You can configure &gwenview; by choosing <menuchoice><guimenu>Settings</guimenu>
                 <guimenuitem>Configure &gwenview;...</guimenuitem></menuchoice>.
             The configuration dialog is split into three sections. This chapter describes the available
             options in detail.
         </para>
         <itemizedlist>
             <listitem>
                 <para><link linkend="configgeneral">General</link></para>
             </listitem>
             <listitem>
                 <para><link linkend="configview">Image View</link></para>
             </listitem>
             <listitem>
                 <para><link linkend="configadvanced">Advanced</link></para>
             </listitem>
         </itemizedlist>
     </sect1>
     <sect1 id="configgeneral">
         <title>General</title>
         <variablelist>
             <varlistentry>
                 <term><guilabel>Videos</guilabel></term>
                 <listitem>
                     <para>Check the <guilabel>Show videos</guilabel> checkbox to allow &gwenview; to show videos among the images.</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term><guilabel>Background color</guilabel></term>
                 <listitem>
                     <para>Move the slider to change the color of the gray background in Browse and View mode from black (the leftmost position) to white (the rightmost position).</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term><guilabel>Thumbnail actions</guilabel></term>
                 <listitem>
                     <para>Whether the thumbnail action buttons should be shown as overlays above image thumbnails.</para>
                     <itemizedlist>
                         <listitem>
                             <para><guilabel>All buttons</guilabel> &mdash; Show all buttons</para>
                         </listitem>
                         <listitem>
                             <para><guilabel>Show selection button only</guilabel> &mdash; Show select/unselect button only</para>
                         </listitem>
                         <listitem>
                             <para><guilabel>None</guilabel> &mdash; Do not show any thumbnail button</para>
                         </listitem>
                     </itemizedlist>
                 </listitem>
             </varlistentry>
         </variablelist>
     </sect1>
         <sect1 id="configview">
         <title>Image View</title>
         <variablelist>
             <varlistentry>
                 <term><guilabel>Show transparency with</guilabel></term>
                 <listitem>
                     <para>Choose how the background of transparent raster or <abbrev>SVG</abbrev> images is rendered.</para>
                     <itemizedlist>
                         <listitem>
                             <para><guilabel>Surrounding background</guilabel> &mdash; Use background color from the <link linkend="configgeneral">General page</link>.</para>
                         </listitem>
                         <listitem>
                             <para><guilabel>Checkerboard background</guilabel> &mdash; Use the traditional checkerboard background.</para>
                         </listitem>
                         <listitem>
                             <para><guilabel>Solid color background</guilabel> &mdash; Use a color that can be chosen using the <ulink url="help:/fundamentals/colors.html">color selector</ulink>.</para>
                         </listitem>
                     </itemizedlist>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term><guilabel>Mouse wheel behavior</guilabel></term>
                 <listitem>
                     <para>Select how scrolling over an image in View mode behaves.</para>
                     <itemizedlist>
                         <listitem>
                             <para><guilabel>Scroll</guilabel> &mdash; When zoomed in, pan the image vertically. Otherwise, nothing will happen.</para>
                         </listitem>
                         <listitem>
                             <para><guilabel>Browse</guilabel> &mdash; Switch to the next or the previous image.</para>
                         </listitem>
                         <listitem>
                             <para><guilabel>Zoom</guilabel> &mdash; Use mouse wheel to zoom in/out the current image.</para>
                         </listitem>
                     </itemizedlist>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term><guilabel>Zoom mode</guilabel></term>
                 <listitem>
                     <para>Allows choosing how zooming in View mode works.</para>
                     <itemizedlist>
                         <listitem>
                             <para><guilabel>Autofit each image</guilabel> &mdash; Automatically resize images to the view pane.</para>
                         </listitem>
                         <listitem>
                             <para><guilabel>Keep same zoom and position</guilabel> &mdash; Use the same zoom level for all images.</para>
                         </listitem>
                         <listitem>
                             <para><guilabel>Per image zoom and position</guilabel> &mdash; Use individual zoom levels for each image.</para>
                         </listitem>
                         <listitem>
                             <para><guilabel>Enlarge smaller images</guilabel> &mdash; check this item to make &gwenview; enlarge smaller images in View mode.</para>
                         </listitem>
                     </itemizedlist>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term><guilabel>Animations</guilabel></term>
                 <listitem>
                     <para>Allows choosing how fading between images is done in View mode.</para>
                     <itemizedlist>
                         <listitem>
                             <para><guilabel>OpenGL</guilabel> &mdash; Use hardware accelerated animations.</para>
                         </listitem>
                         <listitem>
                             <para><guilabel>Software</guilabel> &mdash; Do not use hardware accelerated animations. Select this option if <guilabel>OpenGL</guilabel> does not work satisfactory, but you still want to fade between images.</para>
                         </listitem>
                         <listitem>
                             <para><guilabel>None</guilabel> &mdash; Do not use animations when switching between images.</para>
                         </listitem>
                     </itemizedlist>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term><guilabel>Thumbnail Bar</guilabel></term>
                 <listitem>
                     <para>Allows configuring the thumbnail bar.</para>
                     <itemizedlist>
                         <listitem>
                             <para><guilabel>Orientation</guilabel></para>
                             <itemizedlist>
                                 <listitem>
                                     <para><guilabel>Horizontal</guilabel> &mdash; Show a horizontal thumbnail strip below the image.</para>
                                 </listitem>
                                 <listitem>
                                     <para><guilabel>Vertical</guilabel> &mdash; Show a vertical thumbnail strip to the right of the image.</para>
                                 </listitem>
                             </itemizedlist>
                         </listitem>
                         <listitem>
                             <para><guilabel>Row count</guilabel> &mdash; Use the spin box to change the number of rows on the thumbnail bar</para>
                         </listitem>
                     </itemizedlist>
                 </listitem>
             </varlistentry>
         </variablelist>
     </sect1>
         <sect1 id="configadvanced">
         <title>Advanced</title>
         <variablelist>
             <varlistentry>
                 <term><guilabel>Cache</guilabel></term>
                 <listitem>
-                    <para>Enable the <guilabel>Delete thumbnail cache folder on exit</guilabel> option if you do not have a lot of disk space.</para>
+                    <para>Enable the <guilabel>Low resource usage mode</guilabel> option if you do not have a lot of disk space. This will avoid storing thumbnails on disk and will prefer embedded thumbnails of lower quality that are faster to load, if available.</para>
                     <para>Be careful: This will delete the folder named <filename>.thumbnails</filename> in your home folder, deleting all thumbnails previously generated by &gwenview; and other applications.</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term><guilabel>History</guilabel></term>
                 <listitem>
                     <para>Check the <guilabel>Remember folders and URLs</guilabel> to make &gwenview; remember visited folders and &URL;s and show them on the <guilabel>Recent Folders</guilabel> pane.</para>
                 </listitem>
             </varlistentry>
             <varlistentry>
                 <term><guilabel>Rendering intent</guilabel></term>
                 <listitem>
                     <para>Allows choosing the <ulink url="https://en.wikipedia.org/wiki/Color_management#Rendering_intent">rendering intent</ulink> for showing images.</para>
                     <itemizedlist>
                         <listitem>
                             <para><guilabel>Perceptual</guilabel> &mdash; scale all colors equally to fit them within the active color profile's color gamut</para>
                         </listitem>
                         <listitem>
                             <para><guilabel>Relative Colorimetric</guilabel> &mdash; squash colors that don't fit within the active color profile's color gamut, leaving other colors untouched</para>
                         </listitem>
                     </itemizedlist>
                 </listitem>
             </varlistentry>
         </variablelist>
     </sect1>
     <sect1 id="hidden-configuration">
     <title>Hidden Configuration Options</title>
     <para>
         Some notes on hidden &gwenview; options can be found on
         <ulink url="http://userbase.kde.org/Special:myLanguage/Gwenview/Hidden_Configuration_Options">this page</ulink>.
     </para>
     <important>
         <para>
             The options described on the above-mentioned page may help you
             tune &gwenview; for specific needs, but please keep in mind
             there is no warranty they will continue working from one
             version to another.
         </para>
     </important>
     </sect1>
 </chapter>
 
 <chapter id="credits">
 <title>Credits and Copyright</title>
 
 <para>&gwenview; is currently maintained by Aurélien Gâteau</para>
 
 <para>This document was written by Christopher Martin</para>
 
 <para>This document was updated for &kde; 4 by Henry de Valence</para>
 
 <!-- TRANS:CREDIT_FOR_TRANSLATORS -->
 
 &underFDL;
 &underGPL;
 </chapter>
 
 </book>
diff --git a/lib/thumbnailprovider/thumbnailgenerator.cpp b/lib/thumbnailprovider/thumbnailgenerator.cpp
index 26402cf2..de2061d1 100644
--- a/lib/thumbnailprovider/thumbnailgenerator.cpp
+++ b/lib/thumbnailprovider/thumbnailgenerator.cpp
@@ -1,304 +1,308 @@
 // vim: set tabstop=4 shiftwidth=4 expandtab:
 /*
 Gwenview: an image viewer
 Copyright 2012 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
 as published by the Free Software Foundation; either version 2
 of the License, or (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA.
 
 */
 // Self
 #include "thumbnailgenerator.h"
 
 // Local
 #include "jpegcontent.h"
 #include "gwenviewconfig.h"
 #include "exiv2imageloader.h"
 
 // KDE
 #include <QDebug>
 #ifdef KDCRAW_FOUND
 #include <kdcraw/kdcraw.h>
 #endif
 
 // Qt
 #include <QImageReader>
 #include <QTransform>
 #include <QBuffer>
 
 namespace Gwenview
 {
 
 #undef ENABLE_LOG
 #undef LOG
 //#define ENABLE_LOG
 #ifdef ENABLE_LOG
 #define LOG(x) //qDebug() << x
 #else
 #define LOG(x) ;
 #endif
 
 //------------------------------------------------------------------------
 //
 // ThumbnailContext
 //
 //------------------------------------------------------------------------
 bool ThumbnailContext::load(const QString &pixPath, int pixelSize)
 {
     mImage = QImage();
     mNeedCaching = true;
     QImage originalImage;
     QSize originalSize;
 
     QByteArray formatHint = pixPath.section(QLatin1Char('.'), -1).toLocal8Bit().toLower();
     QImageReader reader(pixPath);
 
     JpegContent content;
     QByteArray format;
     QByteArray data;
     QBuffer buffer;
     int previewRatio = 1;
 
 #ifdef KDCRAW_FOUND
     // raw images deserve special treatment
     if (KDcrawIface::KDcraw::rawFilesList().contains(QString::fromLatin1(formatHint))) {
         // use KDCraw to extract the preview
         bool ret = KDcrawIface::KDcraw::loadEmbeddedPreview(data, pixPath);
 
         // We need QImage. Loading JpegContent from QImage - exif lost
         // Loading QImage from JpegContent - unimplemented, would go with loadFromData
         if (!ret) {
             // if the embedded preview loading failed, load half preview instead. That's slower...
             if (!KDcrawIface::KDcraw::loadHalfPreview(data, pixPath)) {
                 qWarning() << "unable to get preview for " << pixPath.toUtf8().constData();
                 return false;
             }
             previewRatio = 2;
         }
 
         // And we need JpegContent too because of EXIF (orientation!).
         if (!content.loadFromData(data)) {
             qWarning() << "unable to load preview for " << pixPath.toUtf8().constData();
             return false;
         }
 
         buffer.setBuffer(&data);
         buffer.open(QIODevice::ReadOnly);
         reader.setDevice(&buffer);
         reader.setFormat(formatHint);
     } else {
 #else
     {
 #endif
         if (!reader.canRead()) {
             reader.setDecideFormatFromContent(true);
             // Set filename again, otherwise QImageReader won't restart from scratch
             reader.setFileName(pixPath);
         }
 
         if (reader.format() == "jpeg" && GwenviewConfig::applyExifOrientation()) {
             content.load(pixPath);
         }
     }
 
     // If there's jpeg content (from jpg or raw files), try to load an embedded thumbnail, if available.
     if (!content.rawData().isEmpty()) {
         QImage thumbnail = content.thumbnail();
 
-        if (qMax(thumbnail.width(), thumbnail.height()) >= pixelSize) {
+        // If the user does not care about the generated thumbnails (by deleting them on exit), use ANY
+        // embedded thumnail, even if it's too small.
+        if (!thumbnail.isNull() &&
+            (GwenviewConfig::deleteThumbnailCacheOnExit() || qMax(thumbnail.width(), thumbnail.height()) >= pixelSize)
+        ) {
             mImage = std::move(thumbnail);
             mOriginalWidth = content.size().width();
             mOriginalHeight = content.size().height();
             return true;
         }
     }
 
     // Generate thumbnail from full image
     originalSize = reader.size();
     if (originalSize.isValid() && reader.supportsOption(QImageIOHandler::ScaledSize)
         && qMax(originalSize.width(), originalSize.height()) >= pixelSize)
     {
         QSizeF scaledSize = originalSize;
         scaledSize.scale(pixelSize, pixelSize, Qt::KeepAspectRatio);
         if (!scaledSize.isEmpty()) {
             reader.setScaledSize(scaledSize.toSize());
         }
     }
 
     // Rotate if necessary
     if (GwenviewConfig::applyExifOrientation()) {
         reader.setAutoTransform(true);
     }
 
     // format() is empty after QImageReader::read() is called
     format = reader.format();
     if (!reader.read(&originalImage)) {
         return false;
     }
 
     if (!originalSize.isValid()) {
         originalSize = originalImage.size();
     }
     mOriginalWidth = originalSize.width() * previewRatio;
     mOriginalHeight = originalSize.height() * previewRatio;
 
     if (qMax(mOriginalWidth, mOriginalHeight) <= pixelSize) {
         mImage = originalImage;
         mNeedCaching = format != "png";
     } else {
         mImage = originalImage.scaled(pixelSize, pixelSize, Qt::KeepAspectRatio);
     }
 
     if (reader.autoTransform() && (reader.transformation() & QImageIOHandler::TransformationRotate90)) {
         qSwap(mOriginalWidth, mOriginalHeight);
     }
 
     return true;
 }
 
 //------------------------------------------------------------------------
 //
 // ThumbnailGenerator
 //
 //------------------------------------------------------------------------
 ThumbnailGenerator::ThumbnailGenerator()
 : mCancel(false)
 {}
 
 void ThumbnailGenerator::load(
     const QString& originalUri, time_t originalTime, KIO::filesize_t originalFileSize, const QString& originalMimeType,
     const QString& pixPath,
     const QString& thumbnailPath,
     ThumbnailGroup::Enum group)
 {
     QMutexLocker lock(&mMutex);
     Q_ASSERT(mPixPath.isNull());
 
     mOriginalUri = originalUri;
     mOriginalTime = originalTime;
     mOriginalFileSize = originalFileSize;
     mOriginalMimeType = originalMimeType;
     mPixPath = pixPath;
     mThumbnailPath = thumbnailPath;
     mThumbnailGroup = group;
     if (!isRunning()) start();
     mCond.wakeOne();
 }
 
 QString ThumbnailGenerator::originalUri() const
 {
     return mOriginalUri;
 }
 
 time_t ThumbnailGenerator::originalTime() const
 {
     return mOriginalTime;
 }
 
 KIO::filesize_t ThumbnailGenerator::originalFileSize() const
 {
     return mOriginalFileSize;
 }
 
 QString ThumbnailGenerator::originalMimeType() const
 {
     return mOriginalMimeType;
 }
 
 bool ThumbnailGenerator::testCancel()
 {
     QMutexLocker lock(&mMutex);
     return mCancel;
 }
 
 void ThumbnailGenerator::cancel()
 {
     QMutexLocker lock(&mMutex);
     mCancel = true;
     mCond.wakeOne();
 }
 
 void ThumbnailGenerator::run()
 {
     LOG("");
     while (!testCancel()) {
         QString pixPath;
         int pixelSize;
         {
             QMutexLocker lock(&mMutex);
             // empty mPixPath means nothing to do
             LOG("Waiting for mPixPath");
             if (mPixPath.isNull()) {
                 LOG("mPixPath.isNull");
                 mCond.wait(&mMutex);
             }
         }
         if (testCancel()) {
             return;
         }
         {
             QMutexLocker lock(&mMutex);
             pixPath = mPixPath;
             pixelSize = ThumbnailGroup::pixelSize(mThumbnailGroup);
         }
 
         Q_ASSERT(!pixPath.isNull());
         LOG("Loading" << pixPath);
         ThumbnailContext context;
         bool ok = context.load(pixPath, pixelSize);
 
         {
             QMutexLocker lock(&mMutex);
             if (ok) {
                 mImage = context.mImage;
                 mOriginalWidth = context.mOriginalWidth;
                 mOriginalHeight = context.mOriginalHeight;
                 if (context.mNeedCaching && mThumbnailGroup <= ThumbnailGroup::Large) {
                     cacheThumbnail();
                 }
             } else {
                 // avoid emitting the thumb from the previous successful run
                 mImage = QImage();
                 qWarning() << "Could not generate thumbnail for file" << mOriginalUri;
             }
             mPixPath.clear(); // done, ready for next
         }
         if (testCancel()) {
             return;
         }
         {
             QSize size(mOriginalWidth, mOriginalHeight);
             LOG("emitting done signal, size=" << size);
             QMutexLocker lock(&mMutex);
             emit done(mImage, size);
             LOG("Done");
         }
     }
     LOG("Ending thread");
 }
 
 void ThumbnailGenerator::cacheThumbnail()
 {
     mImage.setText(QStringLiteral("Thumb::URI")          , mOriginalUri);
     mImage.setText(QStringLiteral("Thumb::MTime")        , QString::number(mOriginalTime));
     mImage.setText(QStringLiteral("Thumb::Size")         , QString::number(mOriginalFileSize));
     mImage.setText(QStringLiteral("Thumb::Mimetype")     , mOriginalMimeType);
     mImage.setText(QStringLiteral("Thumb::Image::Width") , QString::number(mOriginalWidth));
     mImage.setText(QStringLiteral("Thumb::Image::Height"), QString::number(mOriginalHeight));
     mImage.setText(QStringLiteral("Software")            , QStringLiteral("Gwenview"));
 
     emit thumbnailReadyToBeCached(mThumbnailPath, mImage);
 }
 
 } // namespace
diff --git a/tests/auto/thumbnailprovidertest.cpp b/tests/auto/thumbnailprovidertest.cpp
index 958165eb..cb895c54 100644
--- a/tests/auto/thumbnailprovidertest.cpp
+++ b/tests/auto/thumbnailprovidertest.cpp
@@ -1,278 +1,284 @@
 /*
 Gwenview: an image viewer
 Copyright 2007 Aurélien Gâteau <agateau@kde.org>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
 as published by the Free Software Foundation; either version 2
 of the License, or (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 */
 #include "thumbnailprovidertest.h"
 
 // Qt
 #include <QDir>
 #include <QFile>
 #include <QImage>
 #include <QPainter>
 
 // KDE
 #include <qtest.h>
 #include <QDebug>
 #include <KIO/CopyJob>
 #include <KIO/DeleteJob>
 
 // Local
 #include "../lib/thumbnailprovider/thumbnailprovider.h"
 #include "testutils.h"
+#include "gwenviewconfig.h"
 
 // libc
 #include <errno.h>
 #include <string.h>
 
 using namespace Gwenview;
 
 QTEST_MAIN(ThumbnailProviderTest)
 
 SandBox::SandBox()
 : mPath(QDir::currentPath() + "/sandbox")
 {}
 
 void SandBox::initDir()
 {
     KIO::Job* job;
     QDir dir(mPath);
     if (dir.exists()) {
         QUrl sandBoxUrl("file://" + mPath);
         job = KIO::del(sandBoxUrl);
         QVERIFY2(job->exec(), "Couldn't delete sandbox");
     }
     dir.mkpath(".");
 }
 
 void SandBox::fill()
 {
     initDir();
     createTestImage("red.png", 300, 200, Qt::red);
     createTestImage("blue.png", 200, 300, Qt::blue);
     createTestImage("small.png", 50, 50, Qt::green);
 
     copyTestImage("orient6.jpg", 128, 256);
     copyTestImage("orient6-small.jpg", 32, 64);
 }
 
 void SandBox::copyTestImage(const QString& testFileName, int width, int height)
 {
     QUrl testPath = urlForTestFile(testFileName);
     QUrl testDest = QUrl("file://" + mPath + '/' + testFileName);
     KIO::Job* job = KIO::copy(testPath, testDest);
     QVERIFY2(job->exec(), "Couldn't copy test image");
     mSizeHash.insert(testFileName, QSize(width, height));
 }
 
 static QImage createColoredImage(int width, int height, const QColor& color)
 {
     QImage image(width, height, QImage::Format_RGB32);
     QPainter painter(&image);
     painter.fillRect(image.rect(), color);
     return image;
 }
 
 void SandBox::createTestImage(const QString& name, int width, int height, const QColor& color)
 {
     QImage image = createColoredImage(width, height, color);
     image.save(mPath + '/' + name, "png");
     mSizeHash.insert(name, QSize(width, height));
 }
 
 void ThumbnailProviderTest::initTestCase()
 {
     qRegisterMetaType<KFileItem>("KFileItem");
 }
 
 void ThumbnailProviderTest::init()
 {
     ThumbnailProvider::setThumbnailBaseDir(mSandBox.mPath + "/thumbnails/");
     mSandBox.fill();
 }
 
 static void syncRun(ThumbnailProvider *provider)
 {
     QEventLoop loop;
     QObject::connect(provider, SIGNAL(finished()), &loop, SLOT(quit()));
     loop.exec();
 }
 
 void ThumbnailProviderTest::testLoadLocal()
 {
     QDir dir(mSandBox.mPath);
 
     // Create a list of items which will be thumbnailed
     KFileItemList list;
     Q_FOREACH(const QFileInfo & info, dir.entryInfoList(QDir::Files)) {
         QUrl url("file://" + info.absoluteFilePath());
         KFileItem item(url);
         list << item;
     }
 
     // Generate the thumbnails
     ThumbnailProvider provider;
     provider.setThumbnailGroup(ThumbnailGroup::Normal);
     provider.appendItems(list);
     QSignalSpy spy(&provider, SIGNAL(thumbnailLoaded(KFileItem,QPixmap,QSize,qulonglong)));
     syncRun(&provider);
     while (!ThumbnailProvider::isThumbnailWriterEmpty()) {
         QTest::qWait(100);
     }
 
     // Check we generated the correct number of thumbnails
     QDir thumbnailDir = ThumbnailProvider::thumbnailBaseDir(ThumbnailGroup::Normal);
     // There should be one file less because small.png is a png and is too
     // small to have a thumbnail
     QStringList entryList = thumbnailDir.entryList(QStringList("*.png"));
     QCOMPARE(entryList.count(), mSandBox.mSizeHash.size() - 1);
 
     // Check thumbnail keys
     QHash<KFileItem, QHash<QString, QString> > thumbnailHash;
     Q_FOREACH(const QString& name, entryList) {
         QImage thumb;
         QVERIFY(thumb.load(thumbnailDir.filePath(name)));
 
         QUrl url(thumb.text("Thumb::URI"));
         KFileItem item = list.findByUrl(url);
         QVERIFY(!item.isNull());
 
         QSize originalSize = mSandBox.mSizeHash.value(item.url().fileName());
         uint mtime = item.time(KFileItem::ModificationTime).toTime_t();
 
         if (mtime == uint(-1)) {
             // This happens from time to time on build.kde.org, but I haven't
             // been able to reproduce it locally, so let's try to gather more
             // information.
             qWarning() << "mtime == -1 for url" << url << ". This should not happen!";
             qWarning() << "errno:" << errno << "message:" << strerror(errno);
             qWarning() << "QFile::exists(" << url.toLocalFile() << "):" << QFile::exists(url.toLocalFile());
             qWarning() << "Recalculating mtime" << item.time(KFileItem::ModificationTime).toTime_t();
             QFAIL("Invalid time for test KFileItem");
         }
 
         QCOMPARE(thumb.text("Thumb::Image::Width"), QString::number(originalSize.width()));
         QCOMPARE(thumb.text("Thumb::Image::Height"), QString::number(originalSize.height()));
         QCOMPARE(thumb.text("Thumb::Mimetype"), item.mimetype());
         QCOMPARE(thumb.text("Thumb::Size"), QString::number(item.size()));
         QCOMPARE(thumb.text("Thumb::MTime"), QString::number(mtime));
     }
 
     // Check what was in the thumbnailLoaded() signals
     QCOMPARE(spy.count(), mSandBox.mSizeHash.size());
     QSignalSpy::ConstIterator it = spy.constBegin(),
                               end = spy.constEnd();
     for (; it != end; ++it) {
         const QVariantList args = *it;
         const KFileItem item = qvariant_cast<KFileItem>(args.at(0));
         const QSize size = args.at(2).toSize();
         const QSize expectedSize = mSandBox.mSizeHash.value(item.url().fileName());
         QCOMPARE(size, expectedSize);
     }
 }
 
 void ThumbnailProviderTest::testUseEmbeddedOrNot()
 {
     QImage expectedThumbnail;
     QPixmap thumbnailPix;
     SandBox sandBox;
     sandBox.initDir();
     // This image is red (0xfe0000) and 256x128 but contains a white 128x64 thumbnail
     sandBox.copyTestImage("embedded-thumbnail.jpg", 256, 128);
 
     KFileItemList list;
     QUrl url("file://" + QDir(sandBox.mPath).absoluteFilePath("embedded-thumbnail.jpg"));
     list << KFileItem(url);
 
     // Loading a normal thumbnail should bring the white one
     {
         ThumbnailProvider provider;
         provider.setThumbnailGroup(ThumbnailGroup::Normal);
         provider.appendItems(list);
         QSignalSpy spy(&provider, SIGNAL(thumbnailLoaded(KFileItem,QPixmap,QSize,qulonglong)));
         syncRun(&provider);
 
         QCOMPARE(spy.count(), 1);
         expectedThumbnail = createColoredImage(128, 64, Qt::white);
         thumbnailPix = qvariant_cast<QPixmap>(spy.at(0).at(1));
         QVERIFY(TestUtils::imageCompare(expectedThumbnail, thumbnailPix.toImage()));
     }
 
-    // Loading a large thumbnail should bring the red one
+    // Loading a large thumbnail should bring the red one, unless thumbnails are deleted on exit,
+    // which should bring the white one
     {
         ThumbnailProvider provider;
         provider.setThumbnailGroup(ThumbnailGroup::Large);
         provider.appendItems(list);
         QSignalSpy spy(&provider, SIGNAL(thumbnailLoaded(KFileItem,QPixmap,QSize,qulonglong)));
         syncRun(&provider);
 
         QCOMPARE(spy.count(), 1);
-        expectedThumbnail = createColoredImage(256, 128, QColor(254, 0, 0));
+        if (GwenviewConfig::deleteThumbnailCacheOnExit()) {
+            expectedThumbnail = createColoredImage(128, 64, Qt::white);
+        } else {
+            expectedThumbnail = createColoredImage(256, 128, QColor(254, 0, 0));
+        }
         thumbnailPix = qvariant_cast<QPixmap>(spy.at(0).at(1));
         QVERIFY(TestUtils::imageCompare(expectedThumbnail, thumbnailPix.toImage()));
     }
 }
 
 void ThumbnailProviderTest::testLoadRemote()
 {
     QUrl url = setUpRemoteTestDir("test.png");
     if (!url.isValid()) {
         QSKIP("Not running this test: failed to setup remote test dir.");
     }
     url = url.adjusted(QUrl::StripTrailingSlash);
     url.setPath(url.path() + '/' + "test.png");
 
     KFileItemList list;
     KFileItem item(url);
     list << item;
 
     ThumbnailProvider provider;
     provider.setThumbnailGroup(ThumbnailGroup::Normal);
     provider.appendItems(list);
     syncRun(&provider);
     while (!ThumbnailProvider::isThumbnailWriterEmpty()) {
         QTest::qWait(100);
     }
 
     QDir thumbnailDir = ThumbnailProvider::thumbnailBaseDir(ThumbnailGroup::Normal);
     QStringList entryList = thumbnailDir.entryList(QStringList("*.png"));
     QCOMPARE(entryList.count(), 1);
 }
 
 void ThumbnailProviderTest::testRemoveItemsWhileGenerating()
 {
     QDir dir(mSandBox.mPath);
 
     // Create a list of items which will be thumbnailed
     KFileItemList list;
     Q_FOREACH(const QFileInfo & info, dir.entryInfoList(QDir::Files)) {
         QUrl url("file://" + info.absoluteFilePath());
         KFileItem item(url);
         list << item;
     }
 
     // Start generating thumbnails for items
     ThumbnailProvider provider;
     provider.setThumbnailGroup(ThumbnailGroup::Normal);
     provider.appendItems(list);
     QEventLoop loop;
     connect(&provider, SIGNAL(finished()), &loop, SLOT(quit()));
 
     // Remove items, it should not crash
     provider.removeItems(list);
     loop.exec();
 }