diff --git a/resources/images/add_book.svg b/imgsrc/add_book.svg
similarity index 100%
rename from resources/images/add_book.svg
rename to imgsrc/add_book.svg
diff --git a/resources/images/arrow-down.svg b/imgsrc/arrow-down.svg
similarity index 100%
rename from resources/images/arrow-down.svg
rename to imgsrc/arrow-down.svg
diff --git a/resources/images/arrow-up.svg b/imgsrc/arrow-up.svg
similarity index 100%
rename from resources/images/arrow-up.svg
rename to imgsrc/arrow-up.svg
diff --git a/resources/images/auto_author_sort.svg b/imgsrc/auto_author_sort.svg
similarity index 100%
rename from resources/images/auto_author_sort.svg
rename to imgsrc/auto_author_sort.svg
diff --git a/resources/images/back.svg b/imgsrc/back.svg
similarity index 100%
rename from resources/images/back.svg
rename to imgsrc/back.svg
diff --git a/resources/images/blank.svg b/imgsrc/blank.svg
similarity index 100%
rename from resources/images/blank.svg
rename to imgsrc/blank.svg
diff --git a/resources/images/book.svg b/imgsrc/book.svg
similarity index 100%
rename from resources/images/book.svg
rename to imgsrc/book.svg
diff --git a/resources/images/bookmarks.svg b/imgsrc/bookmarks.svg
similarity index 100%
rename from resources/images/bookmarks.svg
rename to imgsrc/bookmarks.svg
diff --git a/resources/images/books_in_series.svg b/imgsrc/books_in_series.svg
similarity index 100%
rename from resources/images/books_in_series.svg
rename to imgsrc/books_in_series.svg
diff --git a/resources/images/catalog.svg b/imgsrc/catalog.svg
similarity index 100%
rename from resources/images/catalog.svg
rename to imgsrc/catalog.svg
diff --git a/resources/images/chapters.svg b/imgsrc/chapters.svg
similarity index 100%
rename from resources/images/chapters.svg
rename to imgsrc/chapters.svg
diff --git a/resources/images/clear_left.svg b/imgsrc/clear_left.svg
similarity index 100%
rename from resources/images/clear_left.svg
rename to imgsrc/clear_left.svg
diff --git a/resources/images/column.svg b/imgsrc/column.svg
similarity index 100%
rename from resources/images/column.svg
rename to imgsrc/column.svg
diff --git a/resources/images/config.svg b/imgsrc/config.svg
similarity index 100%
rename from resources/images/config.svg
rename to imgsrc/config.svg
diff --git a/resources/images/connect_share.svg b/imgsrc/connect_share.svg
similarity index 100%
rename from resources/images/connect_share.svg
rename to imgsrc/connect_share.svg
diff --git a/resources/images/convert.svg b/imgsrc/convert.svg
similarity index 100%
rename from resources/images/convert.svg
rename to imgsrc/convert.svg
diff --git a/resources/images/cover_flow.svg b/imgsrc/cover_flow.svg
similarity index 100%
rename from resources/images/cover_flow.svg
rename to imgsrc/cover_flow.svg
diff --git a/resources/images/debug.svg b/imgsrc/debug.svg
similarity index 100%
rename from resources/images/debug.svg
rename to imgsrc/debug.svg
diff --git a/resources/images/default_cover.svg b/imgsrc/default_cover.svg
similarity index 100%
rename from resources/images/default_cover.svg
rename to imgsrc/default_cover.svg
diff --git a/resources/images/devices/folder.svg b/imgsrc/devices/folder.svg
similarity index 100%
rename from resources/images/devices/folder.svg
rename to imgsrc/devices/folder.svg
diff --git a/resources/images/dialog_error.svg b/imgsrc/dialog_error.svg
similarity index 100%
rename from resources/images/dialog_error.svg
rename to imgsrc/dialog_error.svg
diff --git a/resources/images/dialog_information.svg b/imgsrc/dialog_information.svg
similarity index 100%
rename from resources/images/dialog_information.svg
rename to imgsrc/dialog_information.svg
diff --git a/resources/images/dialog_question.svg b/imgsrc/dialog_question.svg
similarity index 100%
rename from resources/images/dialog_question.svg
rename to imgsrc/dialog_question.svg
diff --git a/resources/images/dialog_warning.svg b/imgsrc/dialog_warning.svg
similarity index 100%
rename from resources/images/dialog_warning.svg
rename to imgsrc/dialog_warning.svg
diff --git a/resources/images/dictionary.svg b/imgsrc/dictionary.svg
similarity index 100%
rename from resources/images/dictionary.svg
rename to imgsrc/dictionary.svg
diff --git a/resources/images/document_open.svg b/imgsrc/document_open.svg
similarity index 100%
rename from resources/images/document_open.svg
rename to imgsrc/document_open.svg
diff --git a/resources/images/donate.svg b/imgsrc/donate.svg
similarity index 100%
rename from resources/images/donate.svg
rename to imgsrc/donate.svg
diff --git a/resources/images/drawer.svg b/imgsrc/drawer.svg
similarity index 100%
rename from resources/images/drawer.svg
rename to imgsrc/drawer.svg
diff --git a/resources/images/edit_copy.svg b/imgsrc/edit_copy.svg
similarity index 100%
rename from resources/images/edit_copy.svg
rename to imgsrc/edit_copy.svg
diff --git a/resources/images/edit_input.svg b/imgsrc/edit_input.svg
similarity index 100%
rename from resources/images/edit_input.svg
rename to imgsrc/edit_input.svg
diff --git a/resources/images/eject.svg b/imgsrc/eject.svg
similarity index 100%
rename from resources/images/eject.svg
rename to imgsrc/eject.svg
diff --git a/resources/images/exec.svg b/imgsrc/exec.svg
similarity index 100%
rename from resources/images/exec.svg
rename to imgsrc/exec.svg
diff --git a/resources/images/font_size_larger.svg b/imgsrc/font_size_larger.svg
similarity index 100%
rename from resources/images/font_size_larger.svg
rename to imgsrc/font_size_larger.svg
diff --git a/resources/images/font_size_smaller.svg b/imgsrc/font_size_smaller.svg
similarity index 100%
rename from resources/images/font_size_smaller.svg
rename to imgsrc/font_size_smaller.svg
diff --git a/resources/images/forward.svg b/imgsrc/forward.svg
similarity index 100%
rename from resources/images/forward.svg
rename to imgsrc/forward.svg
diff --git a/resources/images/help.svg b/imgsrc/help.svg
similarity index 100%
rename from resources/images/help.svg
rename to imgsrc/help.svg
diff --git a/resources/images/jobs.svg b/imgsrc/jobs.svg
similarity index 100%
rename from resources/images/jobs.svg
rename to imgsrc/jobs.svg
diff --git a/resources/images/list_remove.svg b/imgsrc/list_remove.svg
similarity index 100%
rename from resources/images/list_remove.svg
rename to imgsrc/list_remove.svg
diff --git a/resources/images/lookfeel.svg b/imgsrc/lookfeel.svg
similarity index 100%
rename from resources/images/lookfeel.svg
rename to imgsrc/lookfeel.svg
diff --git a/resources/images/mail.svg b/imgsrc/mail.svg
similarity index 100%
rename from resources/images/mail.svg
rename to imgsrc/mail.svg
diff --git a/resources/images/merge_books.svg b/imgsrc/merge_books.svg
similarity index 100%
rename from resources/images/merge_books.svg
rename to imgsrc/merge_books.svg
diff --git a/resources/images/metadata.svg b/imgsrc/metadata.svg
similarity index 100%
rename from resources/images/metadata.svg
rename to imgsrc/metadata.svg
diff --git a/resources/images/mimetypes/bmp.svg b/imgsrc/mimetypes/bmp.svg
similarity index 100%
rename from resources/images/mimetypes/bmp.svg
rename to imgsrc/mimetypes/bmp.svg
diff --git a/resources/images/mimetypes/computer.svg b/imgsrc/mimetypes/computer.svg
similarity index 100%
rename from resources/images/mimetypes/computer.svg
rename to imgsrc/mimetypes/computer.svg
diff --git a/resources/images/mimetypes/dir.svg b/imgsrc/mimetypes/dir.svg
similarity index 100%
rename from resources/images/mimetypes/dir.svg
rename to imgsrc/mimetypes/dir.svg
diff --git a/resources/images/mimetypes/epub.svg b/imgsrc/mimetypes/epub.svg
similarity index 100%
rename from resources/images/mimetypes/epub.svg
rename to imgsrc/mimetypes/epub.svg
diff --git a/resources/images/mimetypes/fb2.svg b/imgsrc/mimetypes/fb2.svg
similarity index 100%
rename from resources/images/mimetypes/fb2.svg
rename to imgsrc/mimetypes/fb2.svg
diff --git a/resources/images/mimetypes/gif.svg b/imgsrc/mimetypes/gif.svg
similarity index 100%
rename from resources/images/mimetypes/gif.svg
rename to imgsrc/mimetypes/gif.svg
diff --git a/resources/images/mimetypes/html.svg b/imgsrc/mimetypes/html.svg
similarity index 100%
rename from resources/images/mimetypes/html.svg
rename to imgsrc/mimetypes/html.svg
diff --git a/resources/images/mimetypes/jpeg.svg b/imgsrc/mimetypes/jpeg.svg
similarity index 100%
rename from resources/images/mimetypes/jpeg.svg
rename to imgsrc/mimetypes/jpeg.svg
diff --git a/resources/images/mimetypes/lit.svg b/imgsrc/mimetypes/lit.svg
similarity index 100%
rename from resources/images/mimetypes/lit.svg
rename to imgsrc/mimetypes/lit.svg
diff --git a/resources/images/mimetypes/lrf.svg b/imgsrc/mimetypes/lrf.svg
similarity index 100%
rename from resources/images/mimetypes/lrf.svg
rename to imgsrc/mimetypes/lrf.svg
diff --git a/resources/images/mimetypes/lrx.svg b/imgsrc/mimetypes/lrx.svg
similarity index 100%
rename from resources/images/mimetypes/lrx.svg
rename to imgsrc/mimetypes/lrx.svg
diff --git a/resources/images/mimetypes/mobi.svg b/imgsrc/mimetypes/mobi.svg
similarity index 100%
rename from resources/images/mimetypes/mobi.svg
rename to imgsrc/mimetypes/mobi.svg
diff --git a/resources/images/mimetypes/odt.svg b/imgsrc/mimetypes/odt.svg
similarity index 100%
rename from resources/images/mimetypes/odt.svg
rename to imgsrc/mimetypes/odt.svg
diff --git a/resources/images/mimetypes/pdf.svg b/imgsrc/mimetypes/pdf.svg
similarity index 100%
rename from resources/images/mimetypes/pdf.svg
rename to imgsrc/mimetypes/pdf.svg
diff --git a/resources/images/mimetypes/png.svg b/imgsrc/mimetypes/png.svg
similarity index 100%
rename from resources/images/mimetypes/png.svg
rename to imgsrc/mimetypes/png.svg
diff --git a/resources/images/mimetypes/rar.svg b/imgsrc/mimetypes/rar.svg
similarity index 100%
rename from resources/images/mimetypes/rar.svg
rename to imgsrc/mimetypes/rar.svg
diff --git a/resources/images/mimetypes/rtf.svg b/imgsrc/mimetypes/rtf.svg
similarity index 100%
rename from resources/images/mimetypes/rtf.svg
rename to imgsrc/mimetypes/rtf.svg
diff --git a/resources/images/mimetypes/svg.svg b/imgsrc/mimetypes/svg.svg
similarity index 100%
rename from resources/images/mimetypes/svg.svg
rename to imgsrc/mimetypes/svg.svg
diff --git a/resources/images/mimetypes/txt.svg b/imgsrc/mimetypes/txt.svg
similarity index 100%
rename from resources/images/mimetypes/txt.svg
rename to imgsrc/mimetypes/txt.svg
diff --git a/resources/images/mimetypes/unknown.svg b/imgsrc/mimetypes/unknown.svg
similarity index 100%
rename from resources/images/mimetypes/unknown.svg
rename to imgsrc/mimetypes/unknown.svg
diff --git a/resources/images/mimetypes/zero.svg b/imgsrc/mimetypes/zero.svg
similarity index 100%
rename from resources/images/mimetypes/zero.svg
rename to imgsrc/mimetypes/zero.svg
diff --git a/resources/images/mimetypes/zip.svg b/imgsrc/mimetypes/zip.svg
similarity index 100%
rename from resources/images/mimetypes/zip.svg
rename to imgsrc/mimetypes/zip.svg
diff --git a/resources/images/minus.svg b/imgsrc/minus.svg
similarity index 100%
rename from resources/images/minus.svg
rename to imgsrc/minus.svg
diff --git a/resources/images/network-server.svg b/imgsrc/network-server.svg
similarity index 100%
rename from resources/images/network-server.svg
rename to imgsrc/network-server.svg
diff --git a/resources/images/news.svg b/imgsrc/news.svg
similarity index 100%
rename from resources/images/news.svg
rename to imgsrc/news.svg
diff --git a/resources/images/next.svg b/imgsrc/next.svg
similarity index 100%
rename from resources/images/next.svg
rename to imgsrc/next.svg
diff --git a/resources/images/ok.svg b/imgsrc/ok.svg
similarity index 100%
rename from resources/images/ok.svg
rename to imgsrc/ok.svg
diff --git a/resources/images/page.svg b/imgsrc/page.svg
similarity index 100%
rename from resources/images/page.svg
rename to imgsrc/page.svg
diff --git a/resources/images/plugins.svg b/imgsrc/plugins.svg
similarity index 100%
rename from resources/images/plugins.svg
rename to imgsrc/plugins.svg
diff --git a/resources/images/plus.svg b/imgsrc/plus.svg
similarity index 100%
rename from resources/images/plus.svg
rename to imgsrc/plus.svg
diff --git a/resources/images/previous.svg b/imgsrc/previous.svg
similarity index 100%
rename from resources/images/previous.svg
rename to imgsrc/previous.svg
diff --git a/resources/images/print-preview.svg b/imgsrc/print-preview.svg
similarity index 100%
rename from resources/images/print-preview.svg
rename to imgsrc/print-preview.svg
diff --git a/resources/images/print.svg b/imgsrc/print.svg
similarity index 100%
rename from resources/images/print.svg
rename to imgsrc/print.svg
diff --git a/resources/images/reader.svg b/imgsrc/reader.svg
similarity index 100%
rename from resources/images/reader.svg
rename to imgsrc/reader.svg
diff --git a/resources/images/save.svg b/imgsrc/save.svg
similarity index 100%
rename from resources/images/save.svg
rename to imgsrc/save.svg
diff --git a/resources/images/scheduler.svg b/imgsrc/scheduler.svg
similarity index 100%
rename from resources/images/scheduler.svg
rename to imgsrc/scheduler.svg
diff --git a/resources/images/sd.svg b/imgsrc/sd.svg
similarity index 100%
rename from resources/images/sd.svg
rename to imgsrc/sd.svg
diff --git a/resources/images/search.svg b/imgsrc/search.svg
similarity index 100%
rename from resources/images/search.svg
rename to imgsrc/search.svg
diff --git a/resources/images/search_add_saved.svg b/imgsrc/search_add_saved.svg
similarity index 100%
rename from resources/images/search_add_saved.svg
rename to imgsrc/search_add_saved.svg
diff --git a/resources/images/search_copy_saved.svg b/imgsrc/search_copy_saved.svg
similarity index 100%
rename from resources/images/search_copy_saved.svg
rename to imgsrc/search_copy_saved.svg
diff --git a/resources/images/search_delete_saved.svg b/imgsrc/search_delete_saved.svg
similarity index 100%
rename from resources/images/search_delete_saved.svg
rename to imgsrc/search_delete_saved.svg
diff --git a/resources/images/series.svg b/imgsrc/series.svg
similarity index 100%
rename from resources/images/series.svg
rename to imgsrc/series.svg
diff --git a/resources/images/swap.svg b/imgsrc/swap.svg
similarity index 100%
rename from resources/images/swap.svg
rename to imgsrc/swap.svg
diff --git a/resources/images/sync.svg b/imgsrc/sync.svg
similarity index 100%
rename from resources/images/sync.svg
rename to imgsrc/sync.svg
diff --git a/resources/images/tags.svg b/imgsrc/tags.svg
similarity index 100%
rename from resources/images/tags.svg
rename to imgsrc/tags.svg
diff --git a/resources/images/trash.svg b/imgsrc/trash.svg
similarity index 100%
rename from resources/images/trash.svg
rename to imgsrc/trash.svg
diff --git a/resources/images/user_profile.svg b/imgsrc/user_profile.svg
similarity index 100%
rename from resources/images/user_profile.svg
rename to imgsrc/user_profile.svg
diff --git a/resources/images/view.svg b/imgsrc/view.svg
similarity index 100%
rename from resources/images/view.svg
rename to imgsrc/view.svg
diff --git a/resources/images/viewer.svg b/imgsrc/viewer.svg
similarity index 100%
rename from resources/images/viewer.svg
rename to imgsrc/viewer.svg
diff --git a/resources/images/welcome_wizard.svg b/imgsrc/welcome_wizard.svg
similarity index 100%
rename from resources/images/welcome_wizard.svg
rename to imgsrc/welcome_wizard.svg
diff --git a/resources/images/window-close.svg b/imgsrc/window-close.svg
similarity index 100%
rename from resources/images/window-close.svg
rename to imgsrc/window-close.svg
diff --git a/resources/images/wizard.svg b/imgsrc/wizard.svg
similarity index 100%
rename from resources/images/wizard.svg
rename to imgsrc/wizard.svg
diff --git a/resources/images/add_book.png b/resources/images/add_book.png
new file mode 100644
index 0000000000..d6c678ecac
Binary files /dev/null and b/resources/images/add_book.png differ
diff --git a/resources/images/arrow-down.png b/resources/images/arrow-down.png
new file mode 100644
index 0000000000..3ff7d46058
Binary files /dev/null and b/resources/images/arrow-down.png differ
diff --git a/resources/images/arrow-up.png b/resources/images/arrow-up.png
new file mode 100644
index 0000000000..f16e69a8ec
Binary files /dev/null and b/resources/images/arrow-up.png differ
diff --git a/resources/images/auto_author_sort.png b/resources/images/auto_author_sort.png
new file mode 100644
index 0000000000..a6787f19fb
Binary files /dev/null and b/resources/images/auto_author_sort.png differ
diff --git a/resources/images/back.png b/resources/images/back.png
new file mode 100644
index 0000000000..4b2bceb6ed
Binary files /dev/null and b/resources/images/back.png differ
diff --git a/resources/images/blank.png b/resources/images/blank.png
new file mode 100644
index 0000000000..60b8803d95
Binary files /dev/null and b/resources/images/blank.png differ
diff --git a/resources/images/book.png b/resources/images/book.png
new file mode 100644
index 0000000000..a49c8f3db9
Binary files /dev/null and b/resources/images/book.png differ
diff --git a/resources/images/bookmarks.png b/resources/images/bookmarks.png
new file mode 100644
index 0000000000..91613db90b
Binary files /dev/null and b/resources/images/bookmarks.png differ
diff --git a/resources/images/books_in_series.png b/resources/images/books_in_series.png
new file mode 100644
index 0000000000..67d5be2fdd
Binary files /dev/null and b/resources/images/books_in_series.png differ
diff --git a/resources/images/catalog.png b/resources/images/catalog.png
new file mode 100644
index 0000000000..c422cf0861
Binary files /dev/null and b/resources/images/catalog.png differ
diff --git a/resources/images/chapters.png b/resources/images/chapters.png
new file mode 100644
index 0000000000..a904bcec87
Binary files /dev/null and b/resources/images/chapters.png differ
diff --git a/resources/images/clear_left.png b/resources/images/clear_left.png
new file mode 100644
index 0000000000..dcf7263e89
Binary files /dev/null and b/resources/images/clear_left.png differ
diff --git a/resources/images/column.png b/resources/images/column.png
new file mode 100644
index 0000000000..ae26292b25
Binary files /dev/null and b/resources/images/column.png differ
diff --git a/resources/images/config.png b/resources/images/config.png
new file mode 100644
index 0000000000..81d1318b56
Binary files /dev/null and b/resources/images/config.png differ
diff --git a/resources/images/connect_share.png b/resources/images/connect_share.png
new file mode 100644
index 0000000000..0932ce42de
Binary files /dev/null and b/resources/images/connect_share.png differ
diff --git a/resources/images/convert.png b/resources/images/convert.png
new file mode 100644
index 0000000000..89f0d7352e
Binary files /dev/null and b/resources/images/convert.png differ
diff --git a/resources/images/cover_flow.png b/resources/images/cover_flow.png
new file mode 100644
index 0000000000..0f3a324a1a
Binary files /dev/null and b/resources/images/cover_flow.png differ
diff --git a/resources/images/debug.png b/resources/images/debug.png
new file mode 100644
index 0000000000..790a603dcd
Binary files /dev/null and b/resources/images/debug.png differ
diff --git a/resources/images/default_cover.png b/resources/images/default_cover.png
new file mode 100644
index 0000000000..bd3d546203
Binary files /dev/null and b/resources/images/default_cover.png differ
diff --git a/resources/images/devices/folder.png b/resources/images/devices/folder.png
new file mode 100644
index 0000000000..febee0ce2c
Binary files /dev/null and b/resources/images/devices/folder.png differ
diff --git a/resources/images/dialog_error.png b/resources/images/dialog_error.png
new file mode 100644
index 0000000000..2956723fee
Binary files /dev/null and b/resources/images/dialog_error.png differ
diff --git a/resources/images/dialog_information.png b/resources/images/dialog_information.png
new file mode 100644
index 0000000000..bdfe771002
Binary files /dev/null and b/resources/images/dialog_information.png differ
diff --git a/resources/images/dialog_question.png b/resources/images/dialog_question.png
new file mode 100644
index 0000000000..251ced14c9
Binary files /dev/null and b/resources/images/dialog_question.png differ
diff --git a/resources/images/dialog_warning.png b/resources/images/dialog_warning.png
new file mode 100644
index 0000000000..8375ed463e
Binary files /dev/null and b/resources/images/dialog_warning.png differ
diff --git a/resources/images/dictionary.png b/resources/images/dictionary.png
new file mode 100644
index 0000000000..a4b395685c
Binary files /dev/null and b/resources/images/dictionary.png differ
diff --git a/resources/images/document_open.png b/resources/images/document_open.png
new file mode 100644
index 0000000000..b9fd9e5f1e
Binary files /dev/null and b/resources/images/document_open.png differ
diff --git a/resources/images/donate.png b/resources/images/donate.png
new file mode 100644
index 0000000000..dc726c896a
Binary files /dev/null and b/resources/images/donate.png differ
diff --git a/resources/images/drawer.png b/resources/images/drawer.png
new file mode 100644
index 0000000000..356de02a88
Binary files /dev/null and b/resources/images/drawer.png differ
diff --git a/resources/images/edit_copy.png b/resources/images/edit_copy.png
new file mode 100644
index 0000000000..0760f6b52b
Binary files /dev/null and b/resources/images/edit_copy.png differ
diff --git a/resources/images/edit_input.png b/resources/images/edit_input.png
new file mode 100644
index 0000000000..63fe3d34e5
Binary files /dev/null and b/resources/images/edit_input.png differ
diff --git a/resources/images/eject.png b/resources/images/eject.png
new file mode 100644
index 0000000000..748a8b7f7d
Binary files /dev/null and b/resources/images/eject.png differ
diff --git a/resources/images/exec.png b/resources/images/exec.png
new file mode 100644
index 0000000000..f4a2161d3f
Binary files /dev/null and b/resources/images/exec.png differ
diff --git a/resources/images/font_size_larger.png b/resources/images/font_size_larger.png
new file mode 100644
index 0000000000..7bc0fad27a
Binary files /dev/null and b/resources/images/font_size_larger.png differ
diff --git a/resources/images/font_size_smaller.png b/resources/images/font_size_smaller.png
new file mode 100644
index 0000000000..56bff937e1
Binary files /dev/null and b/resources/images/font_size_smaller.png differ
diff --git a/resources/images/forward.png b/resources/images/forward.png
new file mode 100644
index 0000000000..95bde41e8d
Binary files /dev/null and b/resources/images/forward.png differ
diff --git a/resources/images/help.png b/resources/images/help.png
new file mode 100644
index 0000000000..5e869ef201
Binary files /dev/null and b/resources/images/help.png differ
diff --git a/resources/images/jobs.png b/resources/images/jobs.png
new file mode 100644
index 0000000000..a9e8dcec89
Binary files /dev/null and b/resources/images/jobs.png differ
diff --git a/resources/images/list_remove.png b/resources/images/list_remove.png
new file mode 100644
index 0000000000..323bcdd697
Binary files /dev/null and b/resources/images/list_remove.png differ
diff --git a/resources/images/lookfeel.png b/resources/images/lookfeel.png
new file mode 100644
index 0000000000..4d3690bf8d
Binary files /dev/null and b/resources/images/lookfeel.png differ
diff --git a/resources/images/mail.png b/resources/images/mail.png
new file mode 100644
index 0000000000..718103cb53
Binary files /dev/null and b/resources/images/mail.png differ
diff --git a/resources/images/merge_books.png b/resources/images/merge_books.png
new file mode 100644
index 0000000000..4097e3457e
Binary files /dev/null and b/resources/images/merge_books.png differ
diff --git a/resources/images/metadata.png b/resources/images/metadata.png
new file mode 100644
index 0000000000..0d294b1ca9
Binary files /dev/null and b/resources/images/metadata.png differ
diff --git a/resources/images/mimetypes/bmp.png b/resources/images/mimetypes/bmp.png
new file mode 100644
index 0000000000..f8d4274e14
Binary files /dev/null and b/resources/images/mimetypes/bmp.png differ
diff --git a/resources/images/mimetypes/computer.png b/resources/images/mimetypes/computer.png
new file mode 100644
index 0000000000..c15662dba7
Binary files /dev/null and b/resources/images/mimetypes/computer.png differ
diff --git a/resources/images/mimetypes/dir.png b/resources/images/mimetypes/dir.png
new file mode 100644
index 0000000000..36f9f423bb
Binary files /dev/null and b/resources/images/mimetypes/dir.png differ
diff --git a/resources/images/mimetypes/epub.png b/resources/images/mimetypes/epub.png
new file mode 100644
index 0000000000..61f0f51384
Binary files /dev/null and b/resources/images/mimetypes/epub.png differ
diff --git a/resources/images/mimetypes/fb2.png b/resources/images/mimetypes/fb2.png
new file mode 100644
index 0000000000..4778a4848f
Binary files /dev/null and b/resources/images/mimetypes/fb2.png differ
diff --git a/resources/images/mimetypes/gif.png b/resources/images/mimetypes/gif.png
new file mode 100644
index 0000000000..f8d4274e14
Binary files /dev/null and b/resources/images/mimetypes/gif.png differ
diff --git a/resources/images/mimetypes/html.png b/resources/images/mimetypes/html.png
new file mode 100644
index 0000000000..710c721ab3
Binary files /dev/null and b/resources/images/mimetypes/html.png differ
diff --git a/resources/images/mimetypes/jpeg.png b/resources/images/mimetypes/jpeg.png
new file mode 100644
index 0000000000..f8d4274e14
Binary files /dev/null and b/resources/images/mimetypes/jpeg.png differ
diff --git a/resources/images/mimetypes/lit.png b/resources/images/mimetypes/lit.png
new file mode 100644
index 0000000000..83999940a6
Binary files /dev/null and b/resources/images/mimetypes/lit.png differ
diff --git a/resources/images/mimetypes/lrf.png b/resources/images/mimetypes/lrf.png
new file mode 100644
index 0000000000..b29d3b381a
Binary files /dev/null and b/resources/images/mimetypes/lrf.png differ
diff --git a/resources/images/mimetypes/lrx.png b/resources/images/mimetypes/lrx.png
new file mode 100644
index 0000000000..8496a30345
Binary files /dev/null and b/resources/images/mimetypes/lrx.png differ
diff --git a/resources/images/mimetypes/mobi.png b/resources/images/mimetypes/mobi.png
new file mode 100644
index 0000000000..cb1230a15b
Binary files /dev/null and b/resources/images/mimetypes/mobi.png differ
diff --git a/resources/images/mimetypes/odt.png b/resources/images/mimetypes/odt.png
new file mode 100644
index 0000000000..8765b3eb0b
Binary files /dev/null and b/resources/images/mimetypes/odt.png differ
diff --git a/resources/images/mimetypes/pdf.png b/resources/images/mimetypes/pdf.png
new file mode 100644
index 0000000000..a0b1961cde
Binary files /dev/null and b/resources/images/mimetypes/pdf.png differ
diff --git a/resources/images/mimetypes/png.png b/resources/images/mimetypes/png.png
new file mode 100644
index 0000000000..edbe5afa1b
Binary files /dev/null and b/resources/images/mimetypes/png.png differ
diff --git a/resources/images/mimetypes/rar.png b/resources/images/mimetypes/rar.png
new file mode 100644
index 0000000000..1be23aabbb
Binary files /dev/null and b/resources/images/mimetypes/rar.png differ
diff --git a/resources/images/mimetypes/rtf.png b/resources/images/mimetypes/rtf.png
new file mode 100644
index 0000000000..4cc6604cc2
Binary files /dev/null and b/resources/images/mimetypes/rtf.png differ
diff --git a/resources/images/mimetypes/svg.png b/resources/images/mimetypes/svg.png
new file mode 100644
index 0000000000..c6ee95c4e2
Binary files /dev/null and b/resources/images/mimetypes/svg.png differ
diff --git a/resources/images/mimetypes/txt.png b/resources/images/mimetypes/txt.png
new file mode 100644
index 0000000000..1febe414d4
Binary files /dev/null and b/resources/images/mimetypes/txt.png differ
diff --git a/resources/images/mimetypes/unknown.png b/resources/images/mimetypes/unknown.png
new file mode 100644
index 0000000000..75d1ae4ae5
Binary files /dev/null and b/resources/images/mimetypes/unknown.png differ
diff --git a/resources/images/mimetypes/zero.png b/resources/images/mimetypes/zero.png
new file mode 100644
index 0000000000..43462d91f4
Binary files /dev/null and b/resources/images/mimetypes/zero.png differ
diff --git a/resources/images/mimetypes/zip.png b/resources/images/mimetypes/zip.png
new file mode 100644
index 0000000000..a3ee074086
Binary files /dev/null and b/resources/images/mimetypes/zip.png differ
diff --git a/resources/images/minus.png b/resources/images/minus.png
new file mode 100644
index 0000000000..d9054cc90c
Binary files /dev/null and b/resources/images/minus.png differ
diff --git a/resources/images/network-server.png b/resources/images/network-server.png
new file mode 100644
index 0000000000..b75de74928
Binary files /dev/null and b/resources/images/network-server.png differ
diff --git a/resources/images/news.png b/resources/images/news.png
new file mode 100644
index 0000000000..bfa62b211f
Binary files /dev/null and b/resources/images/news.png differ
diff --git a/resources/images/next.png b/resources/images/next.png
new file mode 100644
index 0000000000..2df68e42dc
Binary files /dev/null and b/resources/images/next.png differ
diff --git a/resources/images/ok.png b/resources/images/ok.png
new file mode 100644
index 0000000000..3f8dc38a8c
Binary files /dev/null and b/resources/images/ok.png differ
diff --git a/resources/images/page.png b/resources/images/page.png
new file mode 100644
index 0000000000..71a1b00e68
Binary files /dev/null and b/resources/images/page.png differ
diff --git a/resources/images/plugins.png b/resources/images/plugins.png
new file mode 100644
index 0000000000..804aa98d7a
Binary files /dev/null and b/resources/images/plugins.png differ
diff --git a/resources/images/plus.png b/resources/images/plus.png
new file mode 100644
index 0000000000..130528836c
Binary files /dev/null and b/resources/images/plus.png differ
diff --git a/resources/images/previous.png b/resources/images/previous.png
new file mode 100644
index 0000000000..d21b443aa3
Binary files /dev/null and b/resources/images/previous.png differ
diff --git a/resources/images/print-preview.png b/resources/images/print-preview.png
new file mode 100644
index 0000000000..88e7cc0c97
Binary files /dev/null and b/resources/images/print-preview.png differ
diff --git a/resources/images/print.png b/resources/images/print.png
new file mode 100644
index 0000000000..c120d5ff01
Binary files /dev/null and b/resources/images/print.png differ
diff --git a/resources/images/reader.png b/resources/images/reader.png
new file mode 100644
index 0000000000..bfc532f5ee
Binary files /dev/null and b/resources/images/reader.png differ
diff --git a/resources/images/save.png b/resources/images/save.png
new file mode 100644
index 0000000000..57ba0686ae
Binary files /dev/null and b/resources/images/save.png differ
diff --git a/resources/images/scheduler.png b/resources/images/scheduler.png
new file mode 100644
index 0000000000..0035262d1c
Binary files /dev/null and b/resources/images/scheduler.png differ
diff --git a/resources/images/sd.png b/resources/images/sd.png
new file mode 100644
index 0000000000..23ebd3d6a5
Binary files /dev/null and b/resources/images/sd.png differ
diff --git a/resources/images/search.png b/resources/images/search.png
new file mode 100644
index 0000000000..1fd7872786
Binary files /dev/null and b/resources/images/search.png differ
diff --git a/resources/images/search_add_saved.png b/resources/images/search_add_saved.png
new file mode 100644
index 0000000000..1395f69094
Binary files /dev/null and b/resources/images/search_add_saved.png differ
diff --git a/resources/images/search_copy_saved.png b/resources/images/search_copy_saved.png
new file mode 100644
index 0000000000..579b529cf0
Binary files /dev/null and b/resources/images/search_copy_saved.png differ
diff --git a/resources/images/search_delete_saved.png b/resources/images/search_delete_saved.png
new file mode 100644
index 0000000000..5e40e68de3
Binary files /dev/null and b/resources/images/search_delete_saved.png differ
diff --git a/resources/images/series.png b/resources/images/series.png
new file mode 100644
index 0000000000..7b1138b5e4
Binary files /dev/null and b/resources/images/series.png differ
diff --git a/resources/images/swap.png b/resources/images/swap.png
new file mode 100644
index 0000000000..60b8803d95
Binary files /dev/null and b/resources/images/swap.png differ
diff --git a/resources/images/sync.png b/resources/images/sync.png
new file mode 100644
index 0000000000..2219f01fa8
Binary files /dev/null and b/resources/images/sync.png differ
diff --git a/resources/images/tags.png b/resources/images/tags.png
new file mode 100644
index 0000000000..816adb3504
Binary files /dev/null and b/resources/images/tags.png differ
diff --git a/resources/images/trash.png b/resources/images/trash.png
new file mode 100644
index 0000000000..f5d453a173
Binary files /dev/null and b/resources/images/trash.png differ
diff --git a/resources/images/user_profile.png b/resources/images/user_profile.png
new file mode 100644
index 0000000000..7f08ad437c
Binary files /dev/null and b/resources/images/user_profile.png differ
diff --git a/resources/images/view.png b/resources/images/view.png
new file mode 100644
index 0000000000..6c9d3e498d
Binary files /dev/null and b/resources/images/view.png differ
diff --git a/resources/images/viewer.png b/resources/images/viewer.png
new file mode 100644
index 0000000000..8bcab85ed2
Binary files /dev/null and b/resources/images/viewer.png differ
diff --git a/resources/images/welcome_wizard.png b/resources/images/welcome_wizard.png
new file mode 100644
index 0000000000..fa1536a3a4
Binary files /dev/null and b/resources/images/welcome_wizard.png differ
diff --git a/resources/images/window-close.png b/resources/images/window-close.png
new file mode 100644
index 0000000000..2bee0fc10e
Binary files /dev/null and b/resources/images/window-close.png differ
diff --git a/resources/images/wizard.png b/resources/images/wizard.png
new file mode 100644
index 0000000000..df492e6112
Binary files /dev/null and b/resources/images/wizard.png differ
diff --git a/src/calibre/devices/folder_device/driver.py b/src/calibre/devices/folder_device/driver.py
index 552e713ad8..9cd1280cc9 100644
--- a/src/calibre/devices/folder_device/driver.py
+++ b/src/calibre/devices/folder_device/driver.py
@@ -42,7 +42,7 @@ class FOLDER_DEVICE(USBMS):
     SUPPORTS_SUB_DIRS = True
 
     #: Icon for this device
-    icon = I('devices/folder.svg')
+    icon = I('devices/folder.png')
     METADATA_CACHE = '.metadata.calibre'
 
     _main_prefix = ''
diff --git a/src/calibre/gui2/__init__.py b/src/calibre/gui2/__init__.py
index 39cf253fbe..1b61404589 100644
--- a/src/calibre/gui2/__init__.py
+++ b/src/calibre/gui2/__init__.py
@@ -372,7 +372,7 @@ class FileIconProvider(QFileIconProvider):
         QFileIconProvider.__init__(self)
         self.icons = {}
         for key in self.__class__.ICONS.keys():
-            self.icons[key] = I('mimetypes/')+self.__class__.ICONS[key]+'.svg'
+            self.icons[key] = I('mimetypes/')+self.__class__.ICONS[key]+'.png'
         for i in ('dir', 'default', 'zero'):
             self.icons[i] = QIcon(self.icons[i])
 
diff --git a/src/calibre/gui2/actions/device.py b/src/calibre/gui2/actions/device.py
index 9b3a147010..6b8c303fbe 100644
--- a/src/calibre/gui2/actions/device.py
+++ b/src/calibre/gui2/actions/device.py
@@ -23,7 +23,7 @@ class ShareConnMenu(QMenu): # {{{
 
     def __init__(self, parent=None):
         QMenu.__init__(self, parent)
-        mitem = self.addAction(QIcon(I('devices/folder.svg')), _('Connect to folder'))
+        mitem = self.addAction(QIcon(I('devices/folder.png')), _('Connect to folder'))
         mitem.setEnabled(True)
         mitem.triggered.connect(lambda x : self.connect_to_folder.emit())
         self.connect_to_folder_action = mitem
diff --git a/src/calibre/library/catalog.py b/src/calibre/library/catalog.py
index 273726a6d8..4637730116 100644
--- a/src/calibre/library/catalog.py
+++ b/src/calibre/library/catalog.py
@@ -2587,24 +2587,8 @@ class EPUB_MOBI(CatalogPlugin):
                     # Check to see if thumbnail exists
                     thumb_fp = "%s/thumbnail_default.jpg" % (image_dir)
                     cover = "%s/DefaultCover.png" % (self.catalogPath)
-
-                    # Init Qt for image conversion
-                    from calibre.gui2 import is_ok_to_use_qt
-                    if is_ok_to_use_qt():
-                        from PyQt4.Qt import QImage, QColor, QPainter, Qt
-
-                        # Convert .svg to .jpg
-                        cover_img = QImage(I('book.png'))
-                        i = QImage(cover_img.size(),
-                                QImage.Format_ARGB32_Premultiplied)
-                        i.fill(QColor(Qt.white).rgb())
-                        p = QPainter(i)
-                        p.drawImage(0, 0, cover_img)
-                        p.end()
-                        i.save(cover)
-                    else:
-                        if not os.path.exists(cover):
-                            shutil.copyfile(I('library.png'), cover)
+                    if not os.path.exists(cover):
+                        shutil.copyfile(I('book.png'), cover)
 
                     if os.path.isfile(thumb_fp):
                         # Check to see if default cover is newer than thumbnail