diff --git a/YACReader/YACReader.pro b/YACReader/YACReader.pro
index 7c4d5a0e..855de657 100644
--- a/YACReader/YACReader.pro
+++ b/YACReader/YACReader.pro
@@ -171,11 +171,7 @@ include(../compressed_archive/libarchive/libarchive-wrapper.pri)
 include(../shortcuts_management/shortcuts_management.pri)
 
 RESOURCES += yacreader_images.qrc \
-    yacreader_files.qrc
-
-win32:RESOURCES += yacreader_images_win.qrc
-unix:!macx:RESOURCES += yacreader_images_win.qrc
-macx:RESOURCES += yacreader_images_osx.qrc
+             yacreader_files.qrc
 
 include(../third_party/QsLog/QsLog.pri)
 
diff --git a/YACReader/main_window_viewer.cpp b/YACReader/main_window_viewer.cpp
index 96526fe5..329aafb9 100644
--- a/YACReader/main_window_viewer.cpp
+++ b/YACReader/main_window_viewer.cpp
@@ -41,28 +41,17 @@
 
 QString addExtensionToIconPath(const QString &path)
 {
-#ifdef Q_OS_MAC
-    return path + ".png";
-#else
+
     return path + ".svg";
-#endif
 }
 
 QString addExtensionToIconPathInToolbar(const QString &path)
 {
-#ifdef Q_OS_MAC
-    return path + ".png";
-#else
     return path + "_18x18.svg";
-#endif
 }
 
-QAction *actionWithCustomIcon(const QIcon &icon, const QAction *action)
+QAction *actionWithCustomIcon(const QIcon &icon, QAction *action)
 {
-
-#ifdef Q_OS_MAC
-    return action;
-#else
     auto a = new QAction(icon, action->text());
 
     a->setEnabled(action->isEnabled());
@@ -76,7 +65,6 @@ QAction *actionWithCustomIcon(const QIcon &icon, const QAction *action)
     QObject::connect(action, &QAction::toggled, a, &QAction::setChecked);
 
     return a;
-#endif
 }
 
 MainWindowViewer::MainWindowViewer()
@@ -522,16 +510,15 @@ void MainWindowViewer::createToolBars()
     comicToolBar = addToolBar(tr("&File"));
 #endif
 
-#ifdef Q_OS_MAC
-    // comicToolBar->setIconSize(QSize(16,16));
-#else
     comicToolBar->setIconSize(QSize(18, 18));
+
+#ifndef Q_OS_MAC
     comicToolBar->setStyleSheet("QToolBar{border:none;}");
 #endif
 
 #ifdef Q_OS_MAC
-    comicToolBar->addAction(openAction);
-    comicToolBar->addAction(openFolderAction);
+    comicToolBar->addAction(actionWithCustomIcon(QIcon(addExtensionToIconPathInToolbar(":/images/viewer_toolbar/open")), openAction));
+    comicToolBar->addAction(actionWithCustomIcon(QIcon(addExtensionToIconPathInToolbar(":/images/viewer_toolbar/openFolder")), openFolderAction));
 #else
     auto recentmenu = new QMenu(tr("Open recent"));
     recentmenu->addActions(recentFilesActionList);
diff --git a/YACReader/yacreader_images.qrc b/YACReader/yacreader_images.qrc
index 96434918..ac14706b 100644
--- a/YACReader/yacreader_images.qrc
+++ b/YACReader/yacreader_images.qrc
@@ -33,5 +33,59 @@
     <file>../images/shortcuts_group_visualization.svg</file>
     <file>../images/custom_dialog/custom_close_button.svg</file>
     <file>../images/whats_new/whatsnew_header.svg</file>
+    <file>../images/viewer_toolbar/bookmark.svg</file>
+    <file>../images/viewer_toolbar/close.svg</file>
+    <file>../images/viewer_toolbar/doublePage.svg</file>
+    <file>../images/viewer_toolbar/doubleMangaPage.svg</file>
+    <file>../images/viewer_toolbar/fitToPage.svg</file>
+    <file>../images/viewer_toolbar/flow.svg</file>
+    <file>../images/viewer_toolbar/full.svg</file>
+    <file>../images/viewer_toolbar/goto.svg</file>
+    <file>../images/viewer_toolbar/help.svg</file>
+    <file>../images/viewer_toolbar/info.svg</file>
+    <file>../images/viewer_toolbar/magnifyingGlass.svg</file>
+    <file>../images/viewer_toolbar/next.svg</file>
+    <file>../images/viewer_toolbar/open.svg</file>
+    <file>../images/viewer_toolbar/openFolder.svg</file>
+    <file>../images/viewer_toolbar/openNext.svg</file>
+    <file>../images/viewer_toolbar/openPrevious.svg</file>
+    <file>../images/viewer_toolbar/options.svg</file>
+    <file>../images/viewer_toolbar/previous.svg</file>
+    <file>../images/viewer_toolbar/rotateL.svg</file>
+    <file>../images/viewer_toolbar/rotateR.svg</file>
+    <file>../images/viewer_toolbar/save.svg</file>
+    <file>../images/viewer_toolbar/shortcuts.svg</file>
+    <file>../images/viewer_toolbar/showBookmarks.svg</file>
+    <file>../images/viewer_toolbar/toHeight.svg</file>
+    <file>../images/viewer_toolbar/toWidth.svg</file>
+    <file>../images/viewer_toolbar/translator.svg</file>
+    <file>../images/viewer_toolbar/zoom.svg</file>
+    <file>../images/viewer_toolbar/bookmark_18x18.svg</file>
+    <file>../images/viewer_toolbar/close_18x18.svg</file>
+    <file>../images/viewer_toolbar/doublePage_18x18.svg</file>
+    <file>../images/viewer_toolbar/doubleMangaPage_18x18.svg</file>
+    <file>../images/viewer_toolbar/fitToPage_18x18.svg</file>
+    <file>../images/viewer_toolbar/flow_18x18.svg</file>
+    <file>../images/viewer_toolbar/full_18x18.svg</file>
+    <file>../images/viewer_toolbar/goto_18x18.svg</file>
+    <file>../images/viewer_toolbar/help_18x18.svg</file>
+    <file>../images/viewer_toolbar/info_18x18.svg</file>
+    <file>../images/viewer_toolbar/magnifyingGlass_18x18.svg</file>
+    <file>../images/viewer_toolbar/next_18x18.svg</file>
+    <file>../images/viewer_toolbar/open_18x18.svg</file>
+    <file>../images/viewer_toolbar/openFolder_18x18.svg</file>
+    <file>../images/viewer_toolbar/openNext_18x18.svg</file>
+    <file>../images/viewer_toolbar/openPrevious_18x18.svg</file>
+    <file>../images/viewer_toolbar/options_18x18.svg</file>
+    <file>../images/viewer_toolbar/previous_18x18.svg</file>
+    <file>../images/viewer_toolbar/rotateL_18x18.svg</file>
+    <file>../images/viewer_toolbar/rotateR_18x18.svg</file>
+    <file>../images/viewer_toolbar/save_18x18.svg</file>
+    <file>../images/viewer_toolbar/shortcuts_18x18.svg</file>
+    <file>../images/viewer_toolbar/showBookmarks_18x18.svg</file>
+    <file>../images/viewer_toolbar/toHeight_18x18.svg</file>
+    <file>../images/viewer_toolbar/toWidth_18x18.svg</file>
+    <file>../images/viewer_toolbar/translator_18x18.svg</file>
+    <file>../images/viewer_toolbar/zoom_18x18.svg</file>
   </qresource>
 </RCC>
diff --git a/YACReader/yacreader_images_osx.qrc b/YACReader/yacreader_images_osx.qrc
deleted file mode 100644
index 64c97517..00000000
--- a/YACReader/yacreader_images_osx.qrc
+++ /dev/null
@@ -1,61 +0,0 @@
-<RCC>
-  <qresource prefix="/" >
-<file alias="images/viewer_toolbar/bookmark.png">../images/viewer_toolbar/bookmark_osx.png</file>
-<file alias="images/viewer_toolbar/bookmark@2x.png">../images/viewer_toolbar/bookmark_osx@2x.png</file>
-<file alias="images/viewer_toolbar/close.png">../images/viewer_toolbar/close_osx.png</file>
-<file alias="images/viewer_toolbar/close@2x.png">../images/viewer_toolbar/close_osx@2x.png</file>
-<file alias="images/viewer_toolbar/doubleMangaPage.png">../images/viewer_toolbar/doubleMangaPage_osx.png</file>
-<file alias="images/viewer_toolbar/doubleMangaPage@2x.png">../images/viewer_toolbar/doubleMangaPage_osx@2x.png</file>
-<file alias="images/viewer_toolbar/doublePage.png">../images/viewer_toolbar/doublePage_osx.png</file>
-<file alias="images/viewer_toolbar/doublePage@2x.png">../images/viewer_toolbar/doublePage_osx@2x.png</file>
-<file alias="images/viewer_toolbar/fitToPage.png">../images/viewer_toolbar/fitToPage_osx.png</file>
-<file alias="images/viewer_toolbar/fitToPage@2x.png">../images/viewer_toolbar/fitToPage_osx@2x.png</file>
-<file alias="images/viewer_toolbar/flow.png">../images/viewer_toolbar/flow_osx.png</file>
-<file alias="images/viewer_toolbar/flow@2x.png">../images/viewer_toolbar/flow_osx@2x.png</file>
-<file alias="images/viewer_toolbar/full.png">../images/viewer_toolbar/full_osx.png</file>
-<file alias="images/viewer_toolbar/full@2x.png">../images/viewer_toolbar/full_osx@2x.png</file>
-<file alias="images/viewer_toolbar/goto.png">../images/viewer_toolbar/goto_osx.png</file>
-<file alias="images/viewer_toolbar/goto@2x.png">../images/viewer_toolbar/goto_osx@2x.png</file>
-<file alias="images/viewer_toolbar/help.png">../images/viewer_toolbar/help_osx.png</file>
-<file alias="images/viewer_toolbar/help@2x.png">../images/viewer_toolbar/help_osx@2x.png</file>
-<file alias="images/viewer_toolbar/info.png">../images/viewer_toolbar/info_osx.png</file>
-<file alias="images/viewer_toolbar/info@2x.png">../images/viewer_toolbar/info_osx@2x.png</file>
-<file alias="images/viewer_toolbar/magnifyingGlass.png">../images/viewer_toolbar/magnifyingGlass_osx.png</file>
-<file alias="images/viewer_toolbar/magnifyingGlass@2x.png">../images/viewer_toolbar/magnifyingGlass_osx@2x.png</file>
-<file alias="images/viewer_toolbar/next.png">../images/viewer_toolbar/next_osx.png</file>
-<file alias="images/viewer_toolbar/next@2x.png">../images/viewer_toolbar/next_osx@2x.png</file>
-<file alias="images/viewer_toolbar/open.png">../images/viewer_toolbar/open_osx.png</file>
-<file alias="images/viewer_toolbar/open@2x.png">../images/viewer_toolbar/open_osx@2x.png</file>
-<file alias="images/viewer_toolbar/openFolder.png">../images/viewer_toolbar/openFolder_osx.png</file>
-<file alias="images/viewer_toolbar/openFolder@2x.png">../images/viewer_toolbar/openFolder_osx@2x.png</file>
-<file alias="images/viewer_toolbar/openNext.png">../images/viewer_toolbar/openNext_osx.png</file>
-<file alias="images/viewer_toolbar/openNext@2x.png">../images/viewer_toolbar/openNext_osx@2x.png</file>
-<file alias="images/viewer_toolbar/openPrevious.png">../images/viewer_toolbar/openPrevious_osx.png</file>
-<file alias="images/viewer_toolbar/openPrevious@2x.png">../images/viewer_toolbar/openPrevious_osx@2x.png</file>
-<file alias="images/viewer_toolbar/options.png">../images/viewer_toolbar/options_osx.png</file>
-<file alias="images/viewer_toolbar/options@2x.png">../images/viewer_toolbar/options_osx@2x.png</file>
-<file alias="images/viewer_toolbar/previous.png">../images/viewer_toolbar/previous_osx.png</file>
-<file alias="images/viewer_toolbar/previous@2x.png">../images/viewer_toolbar/previous_osx@2x.png</file>
-<file alias="images/viewer_toolbar/rotateL.png">../images/viewer_toolbar/rotateL_osx.png</file>
-<file alias="images/viewer_toolbar/rotateL@2x.png">../images/viewer_toolbar/rotateL_osx@2x.png</file>
-<file alias="images/viewer_toolbar/rotateR.png">../images/viewer_toolbar/rotateR_osx.png</file>
-<file alias="images/viewer_toolbar/rotateR@2x.png">../images/viewer_toolbar/rotateR_osx@2x.png</file>
-<file alias="images/viewer_toolbar/save.png">../images/viewer_toolbar/save_osx.png</file>
-<file alias="images/viewer_toolbar/save@2x.png">../images/viewer_toolbar/save_osx@2x.png</file>
-<file alias="images/viewer_toolbar/shortcuts.png">../images/viewer_toolbar/shortcuts_osx.png</file>
-<file alias="images/viewer_toolbar/shortcuts@2x.png">../images/viewer_toolbar/shortcuts_osx@2x.png</file>
-<file alias="images/viewer_toolbar/showBookmarks.png">../images/viewer_toolbar/showBookmarks_osx.png</file>
-<file alias="images/viewer_toolbar/showBookmarks@2x.png">../images/viewer_toolbar/showBookmarks_osx@2x.png</file>
-<file alias="images/viewer_toolbar/toHeight.png">../images/viewer_toolbar/toHeight_osx.png</file>
-<file alias="images/viewer_toolbar/toHeight@2x.png">../images/viewer_toolbar/toHeight_osx@2x.png</file>
-<file alias="images/viewer_toolbar/toWidth.png">../images/viewer_toolbar/toWidth_osx.png</file>
-<file alias="images/viewer_toolbar/toWidth@2x.png">../images/viewer_toolbar/toWidth_osx@2x.png</file>
-<file alias="images/viewer_toolbar/toWidthSlider.png">../images/viewer_toolbar/toWidthSlider_osx.png</file>
-<file alias="images/viewer_toolbar/toWidthSlider@2x.png">../images/viewer_toolbar/toWidthSlider_osx@2x.png</file>
-<file alias="images/viewer_toolbar/translator.png">../images/viewer_toolbar/translator_osx.png</file>
-<file alias="images/viewer_toolbar/translator@2x.png">../images/viewer_toolbar/translator_osx@2x.png</file>
-<file alias="images/viewer_toolbar/zoom.png">../images/viewer_toolbar/zoom_osx.png</file>
-<file alias="images/viewer_toolbar/zoom@2x.png">../images/viewer_toolbar/zoom_osx@2x.png</file>
-  </qresource>
-</RCC>
-
diff --git a/YACReader/yacreader_images_win.qrc b/YACReader/yacreader_images_win.qrc
deleted file mode 100644
index 7915c821..00000000
--- a/YACReader/yacreader_images_win.qrc
+++ /dev/null
@@ -1,58 +0,0 @@
-<RCC>
-  <qresource prefix="/" >
-    <file>../images/viewer_toolbar/bookmark.svg</file>
-    <file>../images/viewer_toolbar/close.svg</file>
-    <file>../images/viewer_toolbar/doublePage.svg</file>
-    <file>../images/viewer_toolbar/doubleMangaPage.svg</file>
-    <file>../images/viewer_toolbar/fitToPage.svg</file>
-    <file>../images/viewer_toolbar/flow.svg</file>
-    <file>../images/viewer_toolbar/full.svg</file>
-    <file>../images/viewer_toolbar/goto.svg</file>
-    <file>../images/viewer_toolbar/help.svg</file>
-    <file>../images/viewer_toolbar/info.svg</file>
-    <file>../images/viewer_toolbar/magnifyingGlass.svg</file>
-    <file>../images/viewer_toolbar/next.svg</file>
-    <file>../images/viewer_toolbar/open.svg</file>
-    <file>../images/viewer_toolbar/openFolder.svg</file>
-    <file>../images/viewer_toolbar/openNext.svg</file>
-    <file>../images/viewer_toolbar/openPrevious.svg</file>
-    <file>../images/viewer_toolbar/options.svg</file>
-    <file>../images/viewer_toolbar/previous.svg</file>
-    <file>../images/viewer_toolbar/rotateL.svg</file>
-    <file>../images/viewer_toolbar/rotateR.svg</file>
-    <file>../images/viewer_toolbar/save.svg</file>
-    <file>../images/viewer_toolbar/shortcuts.svg</file>
-    <file>../images/viewer_toolbar/showBookmarks.svg</file>
-    <file>../images/viewer_toolbar/toHeight.svg</file>
-    <file>../images/viewer_toolbar/toWidth.svg</file>
-    <file>../images/viewer_toolbar/translator.svg</file>
-    <file>../images/viewer_toolbar/zoom.svg</file>
-    <file>../images/viewer_toolbar/bookmark_18x18.svg</file>
-    <file>../images/viewer_toolbar/close_18x18.svg</file>
-    <file>../images/viewer_toolbar/doublePage_18x18.svg</file>
-    <file>../images/viewer_toolbar/doubleMangaPage_18x18.svg</file>
-    <file>../images/viewer_toolbar/fitToPage_18x18.svg</file>
-    <file>../images/viewer_toolbar/flow_18x18.svg</file>
-    <file>../images/viewer_toolbar/full_18x18.svg</file>
-    <file>../images/viewer_toolbar/goto_18x18.svg</file>
-    <file>../images/viewer_toolbar/help_18x18.svg</file>
-    <file>../images/viewer_toolbar/info_18x18.svg</file>
-    <file>../images/viewer_toolbar/magnifyingGlass_18x18.svg</file>
-    <file>../images/viewer_toolbar/next_18x18.svg</file>
-    <file>../images/viewer_toolbar/open_18x18.svg</file>
-    <file>../images/viewer_toolbar/openFolder_18x18.svg</file>
-    <file>../images/viewer_toolbar/openNext_18x18.svg</file>
-    <file>../images/viewer_toolbar/openPrevious_18x18.svg</file>
-    <file>../images/viewer_toolbar/options_18x18.svg</file>
-    <file>../images/viewer_toolbar/previous_18x18.svg</file>
-    <file>../images/viewer_toolbar/rotateL_18x18.svg</file>
-    <file>../images/viewer_toolbar/rotateR_18x18.svg</file>
-    <file>../images/viewer_toolbar/save_18x18.svg</file>
-    <file>../images/viewer_toolbar/shortcuts_18x18.svg</file>
-    <file>../images/viewer_toolbar/showBookmarks_18x18.svg</file>
-    <file>../images/viewer_toolbar/toHeight_18x18.svg</file>
-    <file>../images/viewer_toolbar/toWidth_18x18.svg</file>
-    <file>../images/viewer_toolbar/translator_18x18.svg</file>
-    <file>../images/viewer_toolbar/zoom_18x18.svg</file>
-  </qresource>
-</RCC>