diff --git a/help/archive.page b/help/C/archive.page
similarity index 100%
rename from help/archive.page
rename to help/C/archive.page
diff --git a/help/bugs.page b/help/C/bugs.page
similarity index 100%
rename from help/bugs.page
rename to help/C/bugs.page
diff --git a/help/conversation.page b/help/C/conversation.page
similarity index 100%
rename from help/conversation.page
rename to help/C/conversation.page
diff --git a/help/editor.page b/help/C/editor.page
similarity index 100%
rename from help/editor.page
rename to help/C/editor.page
diff --git a/help/figures/Mail.png b/help/C/figures/Mail.png
similarity index 100%
rename from help/figures/Mail.png
rename to help/C/figures/Mail.png
diff --git a/help/index.page b/help/C/index.page
similarity index 100%
rename from help/index.page
rename to help/C/index.page
diff --git a/help/limits.page b/help/C/limits.page
similarity index 100%
rename from help/limits.page
rename to help/C/limits.page
diff --git a/help/send.page b/help/C/send.page
similarity index 100%
rename from help/send.page
rename to help/C/send.page
diff --git a/help/shortcuts.page b/help/C/shortcuts.page
similarity index 100%
rename from help/shortcuts.page
rename to help/C/shortcuts.page
diff --git a/help/spell.page b/help/C/spell.page
similarity index 100%
rename from help/spell.page
rename to help/C/spell.page
diff --git a/help/star.page b/help/C/star.page
similarity index 100%
rename from help/star.page
rename to help/C/star.page
diff --git a/help/CMakeLists.txt b/help/CMakeLists.txt
index 6a93044d..0492d180 100644
--- a/help/CMakeLists.txt
+++ b/help/CMakeLists.txt
@@ -1,20 +1,18 @@
 set(HELP_DEST share/gnome/help/geary/C)
 
 set(HELP_FILES
-    archive.page
-    bugs.page
-    conversation.page
-    editor.page
-    index.page
-    limits.page
-    send.page
-    shortcuts.page
-    spell.page
-    star.page
-    figures/Mail.png
-   
-    
+    C/archive.page
+    C/bugs.page
+    C/conversation.page
+    C/editor.page
+    C/index.page
+    C/limits.page
+    C/send.page
+    C/shortcuts.page
+    C/spell.page
+    C/star.page
 )
 
 install(FILES ${HELP_FILES} DESTINATION ${HELP_DEST})
+install(FILES C/figures/Mail.png DESTINATION ${HELP_DEST}/figures)
 
diff --git a/icons/CMakeLists.txt b/icons/CMakeLists.txt
index 3b2bb6a8..876ea8e1 100644
--- a/icons/CMakeLists.txt
+++ b/icons/CMakeLists.txt
@@ -7,9 +7,11 @@ set(ICON_FILES
     geary.png
     mail-inbox.png
     mail-sent.png
+    menu-down.svg
     multiple-tags.png
     non-starred-grey.png
     one-tag.png
+    remove-formatting.png
     starred.png
 )
 
diff --git a/src/client/geary-controller.vala b/src/client/geary-controller.vala
index cbd34e8d..4d4fad33 100644
--- a/src/client/geary-controller.vala
+++ b/src/client/geary-controller.vala
@@ -680,7 +680,7 @@ public class GearyController {
                 File exec_dir = GearyApplication.instance.get_exec_dir();
                 string[] argv = new string[3];
                 argv[0] = "gnome-help";
-                argv[1] = GearyApplication.SOURCE_ROOT_DIR + "/help";
+                argv[1] = GearyApplication.SOURCE_ROOT_DIR + "/help/C/";
                 argv[2] = null;
                 if (!Process.spawn_async(exec_dir.get_path(), argv, null,
                     SpawnFlags.SEARCH_PATH | SpawnFlags.STDERR_TO_DEV_NULL, null, out pid)) {