diff --git a/YACReaderLibrary/images.qrc b/YACReaderLibrary/images.qrc
index 0086639e..caffa5a1 100644
--- a/YACReaderLibrary/images.qrc
+++ b/YACReaderLibrary/images.qrc
@@ -1,104 +1,99 @@
-
- ../images/folder.png
- ../images/folder_finished.png
- ../images/icon.png
- ../images/iconLibrary.png
- ../images/new.png
- ../images/openLibrary.png
- ../images/removeLibraryIcon.png
- ../images/updateLibraryIcon.png
- ../images/comicFolder.png
- ../images/notCover.png
- ../images/edit.png
- ../images/editIcon.png
- ../images/flow1.png
- ../images/flow2.png
- ../images/flow3.png
- ../images/flow4.png
- ../images/flow5.png
- ../images/importLibrary.png
- ../images/importLibraryIcon.png
- ../images/exportLibrary.png
- ../images/exportLibraryIcon.png
- ../images/importLibraryIcon.png
- ../images/open.png
- ../images/coversPackage.png
- ../images/setRead.png
-
- ../images/setUnread.png
-
- ../images/showMarks.png
- ../images/editComic.png
- ../images/selectAll.png
- ../images/hideComicFlow.png
- ../images/exportComicsInfo.png
- ../images/importComicsInfo.png
- ../images/exportComicsInfoIcon.png
- ../images/importComicsInfoIcon.png
- ../images/db.png
- ../images/asignNumber.png
- ../images/defaultCover.png
- ../images/iphoneConfig.png
- ../images/onStartFlowSelection.png
- ../images/onStartFlowSelection_es.png
- ../images/useNewFlowButton.png
- ../images/useOldFlowButton.png
- ../images/serverConfigBackground.png
- ../images/noLibrariesIcon.png
- ../images/noLibrariesLine.png
- ../images/importingIcon.png
- ../images/updatingIcon.png
- ../images/importTopCoversDecoration.png
- ../images/importBottomCoversDecoration.png
- ../images/glowLine.png
- ../images/readRibbon.png
- ../images/readingRibbon.png
- ../images/shownCovers.png
- ../images/hiddenCovers.png
- ../images/trash.png
- ../images/setReadButton.png
- ../images/openInYACReader.png
-
- ../images/main_toolbar/divider.png
- ../images/collapsed_branch_osx.png
- ../images/expanded_branch_osx.png
- ../images/folder_macosx.png
- ../images/libraryIconSelected.png
- ../images/libraryOptions.png
- ../images/branch-open.png
- ../images/branch-closed.png
- ../images/expanded_branch_selected.png
- ../images/collapsed_branch_selected.png
- ../images/previousCoverPage.png
- ../images/nextCoverPage.png
- ../images/getInfo.png
- ../images/comic_vine/radioChecked.png
- ../images/comic_vine/radioUnchecked.png
- ../images/comic_vine/radioUnchecked.png
- ../images/comic_vine/rowDown.png
- ../images/comic_vine/rowUp.png
- ../images/comic_vine/previousPage.png
- ../images/comic_vine/nextPage.png
- ../images/comic_vine/downArrow.png
- ../images/comic_vine/upArrow.png
- ../images/find_folder.png
- ../images/clear_shortcut.png
- ../images/accept_shortcut.png
- ../images/f_overlayed.png
- ../images/f_overlayed_retina.png
- ../images/shortcuts_group_comics.png
- ../images/shortcuts_group_folders.png
- ../images/shortcuts_group_general.png
- ../images/shortcuts_group_libraries.png
- ../images/shortcuts_group_mglass.png
- ../images/shortcuts_group_page.png
- ../images/shortcuts_group_reading.png
- ../images/shortcuts_group_visualization.png
- ../images/searching_icon.png
- ../images/empty_label.png
- ../images/empty_current_readings.png
- ../images/empty_favorites.png
-
-
-
\ No newline at end of file
+
+ ../images/sidebar/folder.png
+ ../images/sidebar/folder_finished.png
+ ../images/icon.png
+ ../images/iconLibrary.png
+ ../images/new.png
+ ../images/openLibrary.png
+ ../images/removeLibraryIcon.png
+ ../images/updateLibraryIcon.png
+ ../images/comicFolder.png
+ ../images/notCover.png
+ ../images/edit.png
+ ../images/editIcon.png
+ ../images/flow1.png
+ ../images/flow2.png
+ ../images/flow3.png
+ ../images/flow4.png
+ ../images/flow5.png
+ ../images/importLibrary.png
+ ../images/importLibraryIcon.png
+ ../images/exportLibrary.png
+ ../images/exportLibraryIcon.png
+ ../images/importLibraryIcon.png
+ ../images/open.png
+ ../images/coversPackage.png
+ ../images/setRead.png
+ ../images/setUnread.png
+ ../images/showMarks.png
+ ../images/editComic.png
+ ../images/selectAll.png
+ ../images/hideComicFlow.png
+ ../images/exportComicsInfo.png
+ ../images/importComicsInfo.png
+ ../images/exportComicsInfoIcon.png
+ ../images/importComicsInfoIcon.png
+ ../images/db.png
+ ../images/asignNumber.png
+ ../images/defaultCover.png
+ ../images/iphoneConfig.png
+ ../images/onStartFlowSelection.png
+ ../images/onStartFlowSelection_es.png
+ ../images/useNewFlowButton.png
+ ../images/useOldFlowButton.png
+ ../images/serverConfigBackground.png
+ ../images/noLibrariesIcon.png
+ ../images/noLibrariesLine.png
+ ../images/importingIcon.png
+ ../images/updatingIcon.png
+ ../images/importTopCoversDecoration.png
+ ../images/importBottomCoversDecoration.png
+ ../images/glowLine.png
+ ../images/readRibbon.png
+ ../images/readingRibbon.png
+ ../images/shownCovers.png
+ ../images/hiddenCovers.png
+ ../images/trash.png
+ ../images/setReadButton.png
+ ../images/openInYACReader.png
+ ../images/main_toolbar/divider.png
+ ../images/sidebar/collapsed_branch_osx.png
+ ../images/sidebar/expanded_branch_osx.png
+ ../images/sidebar/libraryIconSelected.png
+ ../images/sidebar/libraryOptions.png
+ ../images/sidebar/branch-open.png
+ ../images/sidebar/branch-closed.png
+ ../images/sidebar/expanded_branch_selected.png
+ ../images/sidebar/collapsed_branch_selected.png
+ ../images/previousCoverPage.png
+ ../images/nextCoverPage.png
+ ../images/getInfo.png
+ ../images/comic_vine/radioChecked.png
+ ../images/comic_vine/radioUnchecked.png
+ ../images/comic_vine/radioUnchecked.png
+ ../images/comic_vine/rowDown.png
+ ../images/comic_vine/rowUp.png
+ ../images/comic_vine/previousPage.png
+ ../images/comic_vine/nextPage.png
+ ../images/comic_vine/downArrow.png
+ ../images/comic_vine/upArrow.png
+ ../images/find_folder.png
+ ../images/clear_shortcut.png
+ ../images/accept_shortcut.png
+ ../images/f_overlayed.png
+ ../images/f_overlayed_retina.png
+ ../images/shortcuts_group_comics.png
+ ../images/shortcuts_group_folders.png
+ ../images/shortcuts_group_general.png
+ ../images/shortcuts_group_libraries.png
+ ../images/shortcuts_group_mglass.png
+ ../images/shortcuts_group_page.png
+ ../images/shortcuts_group_reading.png
+ ../images/shortcuts_group_visualization.png
+ ../images/searching_icon.png
+ ../images/empty_label.png
+ ../images/empty_current_readings.png
+ ../images/empty_favorites.png
+
+
diff --git a/YACReaderLibrary/images_osx.qrc b/YACReaderLibrary/images_osx.qrc
index 1f4c3a18..5f9106a3 100644
--- a/YACReaderLibrary/images_osx.qrc
+++ b/YACReaderLibrary/images_osx.qrc
@@ -15,12 +15,6 @@
../images/main_toolbar/flow_osx@2x.png
../images/main_toolbar/grid_osx.png
../images/main_toolbar/grid_osx@2x.png
- ../images/libraryIcon_osx.png
- ../images/setRoot_osx.png
- ../images/expand_osx.png
- ../images/colapse_osx.png
- ../images/newLibraryIcon_osx.png
- ../images/openLibraryIcon_osx.png
../images/flow_to_grid_osx.gif
../images/grid_to_flow_osx.gif
../images/empty_folder_osx.png
@@ -60,5 +54,27 @@
../images/lists/label_white_osx@2x.png
../images/lists/label_yellow_osx@2x.png
../images/lists/list_osx@2x.png
+
+ ../images/sidebar/libraryIcon_osx.png
+ ../images/sidebar/setRoot_osx.png
+ ../images/sidebar/expand_osx.png
+ ../images/sidebar/colapse_osx.png
+ ../images/sidebar/newLibraryIcon_osx.png
+ ../images/sidebar/openLibraryIcon_osx.png
+ ../images/sidebar/addNew_sidebar_osx.png
+ ../images/sidebar/delete_sidebar_osx.png
+ ../images/sidebar/addLabelIcon_osx.png
+ ../images/sidebar/renameListIcon_osx.png
+
+
+ ../images/sidebar/setRoot_osx@2x.png
+ ../images/sidebar/expand_osx@2x.png
+ ../images/sidebar/colapse_osx@2x.png
+ ../images/sidebar/newLibraryIcon_osx@2x.png
+ ../images/sidebar/openLibraryIcon_osx@2x.png
+ ../images/sidebar/addNew_sidebar_osx@2x.png
+ ../images/sidebar/delete_sidebar_osx@2x.png
+ ../images/sidebar/addLabelIcon_osx@2x.png
+ ../images/sidebar/renameListIcon_osx@2x.png
diff --git a/YACReaderLibrary/images_win.qrc b/YACReaderLibrary/images_win.qrc
index 66c4015d..0e042c76 100644
--- a/YACReaderLibrary/images_win.qrc
+++ b/YACReaderLibrary/images_win.qrc
@@ -8,24 +8,24 @@
../images/main_toolbar/server.png
../images/main_toolbar/help.png
../images/main_toolbar/fullscreen.png
- ../images/libraryIcon.png
- ../images/setRoot.png
- ../images/expand.png
- ../images/colapse.png
- ../images/newLibraryIcon.png
- ../images/openLibraryIcon.png
+ ../images/sidebar/libraryIcon.png
+ ../images/sidebar/setRoot.png
+ ../images/sidebar/expand.png
+ ../images/sidebar/colapse.png
+ ../images/sidebar/newLibraryIcon.png
+ ../images/sidebar/openLibraryIcon.png
../images/main_toolbar/flow.png
../images/main_toolbar/grid.png
../images/flow_to_grid.gif
../images/grid_to_flow.gif
../images/empty_folder.png
../images/empty_search.png
- ../images/addNew_sidebar.png
- ../images/delete_sidebar.png
+ ../images/sidebar/addNew_sidebar.png
+ ../images/sidebar/delete_sidebar.png
../images/iconSearchNew.png
../images/clearSearchNew.png
- ../images/addLabelIcon.png
- ../images/renameListIcon.png
+ ../images/sidebar/addLabelIcon.png
+ ../images/sidebar/renameListIcon.png
../images/lists/default_0.png
../images/lists/default_1.png
diff --git a/images/7z.png b/images/7z.png
deleted file mode 100644
index 611b0946..00000000
Binary files a/images/7z.png and /dev/null differ
diff --git a/images/colapse_osx.png b/images/colapse_osx.png
deleted file mode 100644
index 001a153d..00000000
Binary files a/images/colapse_osx.png and /dev/null differ
diff --git a/images/comic.png b/images/comic.png
deleted file mode 100644
index 444b062c..00000000
Binary files a/images/comic.png and /dev/null differ
diff --git a/images/comic7z.png b/images/comic7z.png
deleted file mode 100644
index 12a63f73..00000000
Binary files a/images/comic7z.png and /dev/null differ
diff --git a/images/comicRar.png b/images/comicRar.png
deleted file mode 100644
index 95b379da..00000000
Binary files a/images/comicRar.png and /dev/null differ
diff --git a/images/comicTar.png b/images/comicTar.png
deleted file mode 100644
index 00071cac..00000000
Binary files a/images/comicTar.png and /dev/null differ
diff --git a/images/comicZip.png b/images/comicZip.png
deleted file mode 100644
index d49b7a91..00000000
Binary files a/images/comicZip.png and /dev/null differ
diff --git a/images/expand_osx.png b/images/expand_osx.png
deleted file mode 100644
index 659b25ca..00000000
Binary files a/images/expand_osx.png and /dev/null differ
diff --git a/images/folder_macosx.png b/images/folder_macosx.png
deleted file mode 100644
index 71d84e2f..00000000
Binary files a/images/folder_macosx.png and /dev/null differ
diff --git a/images/newLibraryIcon_osx.png b/images/newLibraryIcon_osx.png
deleted file mode 100644
index 07473c33..00000000
Binary files a/images/newLibraryIcon_osx.png and /dev/null differ
diff --git a/images/openLibraryIcon_osx.png b/images/openLibraryIcon_osx.png
deleted file mode 100644
index 18f0154c..00000000
Binary files a/images/openLibraryIcon_osx.png and /dev/null differ
diff --git a/images/pdf.png b/images/pdf.png
deleted file mode 100644
index cf60ca0f..00000000
Binary files a/images/pdf.png and /dev/null differ
diff --git a/images/rar.png b/images/rar.png
deleted file mode 100644
index f2aa7102..00000000
Binary files a/images/rar.png and /dev/null differ
diff --git a/images/setRoot_osx.png b/images/setRoot_osx.png
deleted file mode 100644
index 2b670ba0..00000000
Binary files a/images/setRoot_osx.png and /dev/null differ
diff --git a/images/addLabelIcon.png b/images/sidebar/addLabelIcon.png
similarity index 100%
rename from images/addLabelIcon.png
rename to images/sidebar/addLabelIcon.png
diff --git a/images/sidebar/addLabelIcon_osx.png b/images/sidebar/addLabelIcon_osx.png
new file mode 100644
index 00000000..e1d4eee2
Binary files /dev/null and b/images/sidebar/addLabelIcon_osx.png differ
diff --git a/images/sidebar/addLabelIcon_osx@2x.png b/images/sidebar/addLabelIcon_osx@2x.png
new file mode 100644
index 00000000..6f688eab
Binary files /dev/null and b/images/sidebar/addLabelIcon_osx@2x.png differ
diff --git a/images/addNew_sidebar.png b/images/sidebar/addNew_sidebar.png
similarity index 100%
rename from images/addNew_sidebar.png
rename to images/sidebar/addNew_sidebar.png
diff --git a/images/sidebar/addNew_sidebar_osx.png b/images/sidebar/addNew_sidebar_osx.png
new file mode 100644
index 00000000..454b9fc8
Binary files /dev/null and b/images/sidebar/addNew_sidebar_osx.png differ
diff --git a/images/sidebar/addNew_sidebar_osx@2x.png b/images/sidebar/addNew_sidebar_osx@2x.png
new file mode 100644
index 00000000..3baf3d1b
Binary files /dev/null and b/images/sidebar/addNew_sidebar_osx@2x.png differ
diff --git a/images/branch-closed.png b/images/sidebar/branch-closed.png
similarity index 100%
rename from images/branch-closed.png
rename to images/sidebar/branch-closed.png
diff --git a/images/branch-open.png b/images/sidebar/branch-open.png
similarity index 100%
rename from images/branch-open.png
rename to images/sidebar/branch-open.png
diff --git a/images/colapse.png b/images/sidebar/colapse.png
similarity index 100%
rename from images/colapse.png
rename to images/sidebar/colapse.png
diff --git a/images/sidebar/colapse_osx.png b/images/sidebar/colapse_osx.png
new file mode 100644
index 00000000..96bfa372
Binary files /dev/null and b/images/sidebar/colapse_osx.png differ
diff --git a/images/sidebar/colapse_osx@2x.png b/images/sidebar/colapse_osx@2x.png
new file mode 100644
index 00000000..eaf7a5f4
Binary files /dev/null and b/images/sidebar/colapse_osx@2x.png differ
diff --git a/images/collapsed_branch_osx.png b/images/sidebar/collapsed_branch_osx.png
similarity index 100%
rename from images/collapsed_branch_osx.png
rename to images/sidebar/collapsed_branch_osx.png
diff --git a/images/collapsed_branch_selected.png b/images/sidebar/collapsed_branch_selected.png
similarity index 100%
rename from images/collapsed_branch_selected.png
rename to images/sidebar/collapsed_branch_selected.png
diff --git a/images/delete_sidebar.png b/images/sidebar/delete_sidebar.png
similarity index 100%
rename from images/delete_sidebar.png
rename to images/sidebar/delete_sidebar.png
diff --git a/images/sidebar/delete_sidebar_osx.png b/images/sidebar/delete_sidebar_osx.png
new file mode 100644
index 00000000..6a4808d2
Binary files /dev/null and b/images/sidebar/delete_sidebar_osx.png differ
diff --git a/images/sidebar/delete_sidebar_osx@2x.png b/images/sidebar/delete_sidebar_osx@2x.png
new file mode 100644
index 00000000..237e4982
Binary files /dev/null and b/images/sidebar/delete_sidebar_osx@2x.png differ
diff --git a/images/expand.png b/images/sidebar/expand.png
similarity index 100%
rename from images/expand.png
rename to images/sidebar/expand.png
diff --git a/images/sidebar/expand_osx.png b/images/sidebar/expand_osx.png
new file mode 100644
index 00000000..e537efa3
Binary files /dev/null and b/images/sidebar/expand_osx.png differ
diff --git a/images/sidebar/expand_osx@2x.png b/images/sidebar/expand_osx@2x.png
new file mode 100644
index 00000000..135314f8
Binary files /dev/null and b/images/sidebar/expand_osx@2x.png differ
diff --git a/images/expanded_branch_osx.png b/images/sidebar/expanded_branch_osx.png
similarity index 100%
rename from images/expanded_branch_osx.png
rename to images/sidebar/expanded_branch_osx.png
diff --git a/images/expanded_branch_selected.png b/images/sidebar/expanded_branch_selected.png
similarity index 100%
rename from images/expanded_branch_selected.png
rename to images/sidebar/expanded_branch_selected.png
diff --git a/images/folder.png b/images/sidebar/folder.png
similarity index 100%
rename from images/folder.png
rename to images/sidebar/folder.png
diff --git a/images/folder_finished.png b/images/sidebar/folder_finished.png
similarity index 100%
rename from images/folder_finished.png
rename to images/sidebar/folder_finished.png
diff --git a/images/libraryIcon.png b/images/sidebar/libraryIcon.png
similarity index 100%
rename from images/libraryIcon.png
rename to images/sidebar/libraryIcon.png
diff --git a/images/libraryIconSelected.png b/images/sidebar/libraryIconSelected.png
similarity index 100%
rename from images/libraryIconSelected.png
rename to images/sidebar/libraryIconSelected.png
diff --git a/images/libraryIcon_osx.png b/images/sidebar/libraryIcon_osx.png
similarity index 100%
rename from images/libraryIcon_osx.png
rename to images/sidebar/libraryIcon_osx.png
diff --git a/images/libraryOptions.png b/images/sidebar/libraryOptions.png
similarity index 100%
rename from images/libraryOptions.png
rename to images/sidebar/libraryOptions.png
diff --git a/images/newLibraryIcon.png b/images/sidebar/newLibraryIcon.png
similarity index 100%
rename from images/newLibraryIcon.png
rename to images/sidebar/newLibraryIcon.png
diff --git a/images/sidebar/newLibraryIcon_osx.png b/images/sidebar/newLibraryIcon_osx.png
new file mode 100644
index 00000000..60e1eed9
Binary files /dev/null and b/images/sidebar/newLibraryIcon_osx.png differ
diff --git a/images/sidebar/newLibraryIcon_osx@2x.png b/images/sidebar/newLibraryIcon_osx@2x.png
new file mode 100644
index 00000000..3baf3d1b
Binary files /dev/null and b/images/sidebar/newLibraryIcon_osx@2x.png differ
diff --git a/images/openLibraryIcon.png b/images/sidebar/openLibraryIcon.png
similarity index 100%
rename from images/openLibraryIcon.png
rename to images/sidebar/openLibraryIcon.png
diff --git a/images/sidebar/openLibraryIcon_osx.png b/images/sidebar/openLibraryIcon_osx.png
new file mode 100644
index 00000000..51eabbfb
Binary files /dev/null and b/images/sidebar/openLibraryIcon_osx.png differ
diff --git a/images/sidebar/openLibraryIcon_osx@2x.png b/images/sidebar/openLibraryIcon_osx@2x.png
new file mode 100644
index 00000000..da93f1f9
Binary files /dev/null and b/images/sidebar/openLibraryIcon_osx@2x.png differ
diff --git a/images/renameListIcon.png b/images/sidebar/renameListIcon.png
similarity index 100%
rename from images/renameListIcon.png
rename to images/sidebar/renameListIcon.png
diff --git a/images/sidebar/renameListIcon_osx.png b/images/sidebar/renameListIcon_osx.png
new file mode 100644
index 00000000..8f6fffda
Binary files /dev/null and b/images/sidebar/renameListIcon_osx.png differ
diff --git a/images/sidebar/renameListIcon_osx@2x.png b/images/sidebar/renameListIcon_osx@2x.png
new file mode 100644
index 00000000..7270703c
Binary files /dev/null and b/images/sidebar/renameListIcon_osx@2x.png differ
diff --git a/images/setRoot.png b/images/sidebar/setRoot.png
similarity index 100%
rename from images/setRoot.png
rename to images/sidebar/setRoot.png
diff --git a/images/sidebar/setRoot_osx.png b/images/sidebar/setRoot_osx.png
new file mode 100644
index 00000000..6101b824
Binary files /dev/null and b/images/sidebar/setRoot_osx.png differ
diff --git a/images/sidebar/setRoot_osx@2x.png b/images/sidebar/setRoot_osx@2x.png
new file mode 100644
index 00000000..e4a110eb
Binary files /dev/null and b/images/sidebar/setRoot_osx@2x.png differ
diff --git a/images/tar.png b/images/tar.png
deleted file mode 100644
index f58107c5..00000000
Binary files a/images/tar.png and /dev/null differ
diff --git a/images/zip.png b/images/zip.png
deleted file mode 100644
index c25270d7..00000000
Binary files a/images/zip.png and /dev/null differ