diff --git a/doc/gramps-manual/C/gramps-manual/ep-address.png b/doc/gramps-manual/C/gramps-manual/ep-address.png
new file mode 100644
index 000000000..4b31b8f6f
Binary files /dev/null and b/doc/gramps-manual/C/gramps-manual/ep-address.png differ
diff --git a/doc/gramps-manual/C/gramps-manual/ep-altname.png b/doc/gramps-manual/C/gramps-manual/ep-altname.png
new file mode 100644
index 000000000..2aaa1a528
Binary files /dev/null and b/doc/gramps-manual/C/gramps-manual/ep-altname.png differ
diff --git a/doc/gramps-manual/C/gramps-manual/ep_attributes.png b/doc/gramps-manual/C/gramps-manual/ep-attributes.png
similarity index 70%
rename from doc/gramps-manual/C/gramps-manual/ep_attributes.png
rename to doc/gramps-manual/C/gramps-manual/ep-attributes.png
index 4e1c1566e..73a15083d 100644
Binary files a/doc/gramps-manual/C/gramps-manual/ep_attributes.png and b/doc/gramps-manual/C/gramps-manual/ep-attributes.png differ
diff --git a/doc/gramps-manual/C/gramps-manual/ep-event.png b/doc/gramps-manual/C/gramps-manual/ep-event.png
new file mode 100644
index 000000000..6d43d6c04
Binary files /dev/null and b/doc/gramps-manual/C/gramps-manual/ep-event.png differ
diff --git a/doc/gramps-manual/C/gramps-manual/ep-gallery.png b/doc/gramps-manual/C/gramps-manual/ep-gallery.png
new file mode 100644
index 000000000..0a0810a9b
Binary files /dev/null and b/doc/gramps-manual/C/gramps-manual/ep-gallery.png differ
diff --git a/doc/gramps-manual/C/gramps-manual/ep-general.png b/doc/gramps-manual/C/gramps-manual/ep-general.png
new file mode 100644
index 000000000..212b067fa
Binary files /dev/null and b/doc/gramps-manual/C/gramps-manual/ep-general.png differ
diff --git a/doc/gramps-manual/C/gramps-manual/ep_internet.png b/doc/gramps-manual/C/gramps-manual/ep-internet.png
similarity index 63%
rename from doc/gramps-manual/C/gramps-manual/ep_internet.png
rename to doc/gramps-manual/C/gramps-manual/ep-internet.png
index fc1a5f68b..072f88645 100644
Binary files a/doc/gramps-manual/C/gramps-manual/ep_internet.png and b/doc/gramps-manual/C/gramps-manual/ep-internet.png differ
diff --git a/doc/gramps-manual/C/gramps-manual/ep_lds.png b/doc/gramps-manual/C/gramps-manual/ep-lds.png
similarity index 100%
rename from doc/gramps-manual/C/gramps-manual/ep_lds.png
rename to doc/gramps-manual/C/gramps-manual/ep-lds.png
diff --git a/doc/gramps-manual/C/gramps-manual/ep-notes.png b/doc/gramps-manual/C/gramps-manual/ep-notes.png
new file mode 100644
index 000000000..739d5ae5b
Binary files /dev/null and b/doc/gramps-manual/C/gramps-manual/ep-notes.png differ
diff --git a/doc/gramps-manual/C/gramps-manual/ep_address.png b/doc/gramps-manual/C/gramps-manual/ep_address.png
deleted file mode 100644
index a3714ceff..000000000
Binary files a/doc/gramps-manual/C/gramps-manual/ep_address.png and /dev/null differ
diff --git a/doc/gramps-manual/C/gramps-manual/ep_altname.png b/doc/gramps-manual/C/gramps-manual/ep_altname.png
deleted file mode 100644
index 7161a66df..000000000
Binary files a/doc/gramps-manual/C/gramps-manual/ep_altname.png and /dev/null differ
diff --git a/doc/gramps-manual/C/gramps-manual/ep_event.png b/doc/gramps-manual/C/gramps-manual/ep_event.png
deleted file mode 100644
index d250f8116..000000000
Binary files a/doc/gramps-manual/C/gramps-manual/ep_event.png and /dev/null differ
diff --git a/doc/gramps-manual/C/gramps-manual/ep_gallery.png b/doc/gramps-manual/C/gramps-manual/ep_gallery.png
deleted file mode 100644
index a2b3b682d..000000000
Binary files a/doc/gramps-manual/C/gramps-manual/ep_gallery.png and /dev/null differ
diff --git a/doc/gramps-manual/C/gramps-manual/ep_general.png b/doc/gramps-manual/C/gramps-manual/ep_general.png
deleted file mode 100644
index 5d18dd386..000000000
Binary files a/doc/gramps-manual/C/gramps-manual/ep_general.png and /dev/null differ
diff --git a/doc/gramps-manual/C/gramps-manual/ep_notes.png b/doc/gramps-manual/C/gramps-manual/ep_notes.png
deleted file mode 100644
index 5acf2eb65..000000000
Binary files a/doc/gramps-manual/C/gramps-manual/ep_notes.png and /dev/null differ
diff --git a/doc/gramps-manual/C/gramps-manual/prefs_bars.png b/doc/gramps-manual/C/gramps-manual/prefs-bars.png
similarity index 100%
rename from doc/gramps-manual/C/gramps-manual/prefs_bars.png
rename to doc/gramps-manual/C/gramps-manual/prefs-bars.png
diff --git a/doc/gramps-manual/C/gramps-manual/prefs_colors.png b/doc/gramps-manual/C/gramps-manual/prefs-colors.png
similarity index 100%
rename from doc/gramps-manual/C/gramps-manual/prefs_colors.png
rename to doc/gramps-manual/C/gramps-manual/prefs-colors.png
diff --git a/doc/gramps-manual/C/gramps-manual/prefs_dates.png b/doc/gramps-manual/C/gramps-manual/prefs-dates.png
similarity index 100%
rename from doc/gramps-manual/C/gramps-manual/prefs_dates.png
rename to doc/gramps-manual/C/gramps-manual/prefs-dates.png
diff --git a/doc/gramps-manual/C/gramps-manual/prefs_disp.png b/doc/gramps-manual/C/gramps-manual/prefs-disp.png
similarity index 100%
rename from doc/gramps-manual/C/gramps-manual/prefs_disp.png
rename to doc/gramps-manual/C/gramps-manual/prefs-disp.png
diff --git a/doc/gramps-manual/C/gramps-manual/prefs_find.png b/doc/gramps-manual/C/gramps-manual/prefs-find.png
similarity index 100%
rename from doc/gramps-manual/C/gramps-manual/prefs_find.png
rename to doc/gramps-manual/C/gramps-manual/prefs-find.png
diff --git a/doc/gramps-manual/C/gramps-manual/prefs-gen.png b/doc/gramps-manual/C/gramps-manual/prefs-gen.png
new file mode 100644
index 000000000..6bfce4793
Binary files /dev/null and b/doc/gramps-manual/C/gramps-manual/prefs-gen.png differ
diff --git a/doc/gramps-manual/C/gramps-manual/prefs_guess.png b/doc/gramps-manual/C/gramps-manual/prefs-guess.png
similarity index 100%
rename from doc/gramps-manual/C/gramps-manual/prefs_guess.png
rename to doc/gramps-manual/C/gramps-manual/prefs-guess.png
diff --git a/doc/gramps-manual/C/gramps-manual/prefs_ids.png b/doc/gramps-manual/C/gramps-manual/prefs-ids.png
similarity index 100%
rename from doc/gramps-manual/C/gramps-manual/prefs_ids.png
rename to doc/gramps-manual/C/gramps-manual/prefs-ids.png
diff --git a/doc/gramps-manual/C/gramps-manual/prefs_main.png b/doc/gramps-manual/C/gramps-manual/prefs-main.png
similarity index 100%
rename from doc/gramps-manual/C/gramps-manual/prefs_main.png
rename to doc/gramps-manual/C/gramps-manual/prefs-main.png
diff --git a/doc/gramps-manual/C/gramps-manual/prefs_media.png b/doc/gramps-manual/C/gramps-manual/prefs-media.png
similarity index 100%
rename from doc/gramps-manual/C/gramps-manual/prefs_media.png
rename to doc/gramps-manual/C/gramps-manual/prefs-media.png
diff --git a/doc/gramps-manual/C/gramps-manual/prefs-report.png b/doc/gramps-manual/C/gramps-manual/prefs-report.png
new file mode 100644
index 000000000..613214d76
Binary files /dev/null and b/doc/gramps-manual/C/gramps-manual/prefs-report.png differ
diff --git a/doc/gramps-manual/C/gramps-manual/prefs-research.png b/doc/gramps-manual/C/gramps-manual/prefs-research.png
new file mode 100644
index 000000000..c7b80e812
Binary files /dev/null and b/doc/gramps-manual/C/gramps-manual/prefs-research.png differ
diff --git a/doc/gramps-manual/C/gramps-manual/prefs-revision.png b/doc/gramps-manual/C/gramps-manual/prefs-revision.png
new file mode 100644
index 000000000..f52b63faa
Binary files /dev/null and b/doc/gramps-manual/C/gramps-manual/prefs-revision.png differ
diff --git a/doc/gramps-manual/C/gramps-manual/prefs_gen.png b/doc/gramps-manual/C/gramps-manual/prefs_gen.png
deleted file mode 100644
index 8c4343eeb..000000000
Binary files a/doc/gramps-manual/C/gramps-manual/prefs_gen.png and /dev/null differ
diff --git a/doc/gramps-manual/C/gramps-manual/prefs_report.png b/doc/gramps-manual/C/gramps-manual/prefs_report.png
deleted file mode 100644
index 10feae6a9..000000000
Binary files a/doc/gramps-manual/C/gramps-manual/prefs_report.png and /dev/null differ
diff --git a/doc/gramps-manual/C/gramps-manual/prefs_research.png b/doc/gramps-manual/C/gramps-manual/prefs_research.png
deleted file mode 100644
index a54e9ce1c..000000000
Binary files a/doc/gramps-manual/C/gramps-manual/prefs_research.png and /dev/null differ
diff --git a/doc/gramps-manual/C/gramps-manual/prefs_revision.png b/doc/gramps-manual/C/gramps-manual/prefs_revision.png
deleted file mode 100644
index 53bf38295..000000000
Binary files a/doc/gramps-manual/C/gramps-manual/prefs_revision.png and /dev/null differ