diff --git a/Documentation/images/DC_import_f20.jpg b/Documentation/images/DC_import_f20.jpg
index b3b994afd..fe25e1dc2 100644
Binary files a/Documentation/images/DC_import_f20.jpg and b/Documentation/images/DC_import_f20.jpg differ
diff --git a/Documentation/images/Export_f20.jpg b/Documentation/images/Export_f20.jpg
new file mode 100644
index 000000000..81553184f
Binary files /dev/null and b/Documentation/images/Export_f20.jpg differ
diff --git a/Documentation/images/ImportFromDC1.jpg b/Documentation/images/ImportFromDC1.jpg
deleted file mode 100644
index 6b58c7627..000000000
Binary files a/Documentation/images/ImportFromDC1.jpg and /dev/null differ
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index 9df19a204..938273d2f 100644
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -63,7 +63,6 @@ Divers
 toc::[]
 
 [[S_UserSurvey]]
-
 Using this manual
 -----------------
 When opened from within _Subsurface_, this manual does not have external controls. However,
@@ -2344,7 +2343,7 @@ the Export dialog. This dialog always gives two options: save ALL dives, or save
 the dives selected in *Dive List* panel of _Subsurface_. Click the appropriate
 radio button (see images below).
 
-image::images/Export.jpg["Figure: Export dialog",align="center"]
+image::images/Export_f20.jpg["Figure: Export dialog",align="center"]
 
 A dive log or part of it can be saved in three formats:
 
@@ -3002,7 +3001,8 @@ dealing with the appropriate operations.
   well as licensing information.
 - _Check for updates_ - Find out whether a newer version of Subsurface is available
   on the http://subsurface-divelog.org/[_Subsurface_ web site].
-- _User Manual_ - Open a window showing this user manual.
+- <<S_UserSurvey,_User survey_>>  - Help to make _Subsurface_ even better by taking part in our user survey.
+- _User manual_ - Open a window showing this user manual.
 
 
 
diff --git a/qt-ui/mainwindow.ui b/qt-ui/mainwindow.ui
index a416b43b1..8ffb8bbd8 100644
--- a/qt-ui/mainwindow.ui
+++ b/qt-ui/mainwindow.ui
@@ -259,8 +259,8 @@ p, li { white-space: pre-wrap; }
     </property>
     <addaction name="actionAboutSubsurface"/>
     <addaction name="action_Check_for_Updates"/>
-    <addaction name="actionUserManual"/>
     <addaction name="actionUserSurvey"/>
+    <addaction name="actionUserManual"/>
    </widget>
    <widget class="QMenu" name="menuImport">
     <property name="title">