diff --git a/YACReader/main_window_viewer.cpp b/YACReader/main_window_viewer.cpp
index 5f67d446..96526fe5 100644
--- a/YACReader/main_window_viewer.cpp
+++ b/YACReader/main_window_viewer.cpp
@@ -36,40 +36,48 @@
 #include <QDate>
 #include <QMenuBar>
 
-/* TODO remove, no longer used
-#ifdef Q_OS_MAC
-class MacToolBarSeparator : public QWidget
+// TODO there are no SVG assets in macos yet
+// we need two sets of icons, one for the toolbar and one for the context menu because of this bug (QTBUG-96553): https://bugreports.qt.io/browse/QTBUG-96553
+
+QString addExtensionToIconPath(const QString &path)
 {
-public:
-        MacToolBarSeparator(QWidget * parent =0)
-                :QWidget(parent)
-        {
-                setFixedWidth(2);
-        }
+#ifdef Q_OS_MAC
+    return path + ".png";
+#else
+    return path + ".svg";
+#endif
+}
 
-        void paintEvent(QPaintEvent *event)
-        {
-                Q_UNUSED(event);
-                QPainter painter(this);
+QString addExtensionToIconPathInToolbar(const QString &path)
+{
+#ifdef Q_OS_MAC
+    return path + ".png";
+#else
+    return path + "_18x18.svg";
+#endif
+}
 
-                QLinearGradient lG(0,0,0,height());
+QAction *actionWithCustomIcon(const QIcon &icon, const QAction *action)
+{
 
-                lG.setColorAt(0,QColor(128,128,128,0));
-                lG.setColorAt(0.5,QColor(128,128,128,255));
-                lG.setColorAt(1,QColor(128,128,128,0));
+#ifdef Q_OS_MAC
+    return action;
+#else
+    auto a = new QAction(icon, action->text());
 
-                painter.fillRect(0,0,1,height(),lG);
+    a->setEnabled(action->isEnabled());
+    a->setCheckable(action->isCheckable());
 
-                QLinearGradient lG2(1,0,1,height());
+    a->setChecked(action->isChecked());
 
-                lG2.setColorAt(0,QColor(220,220,220,0));
-                lG2.setColorAt(0.5,QColor(220,220,220,255));
-                lG2.setColorAt(1,QColor(220,220,220,0));
+    QObject::connect(a, &QAction::triggered, action, &QAction::triggered);
+    QObject::connect(action, &QAction::enabledChanged, a, &QAction::setEnabled);
+    QObject::connect(a, &QAction::toggled, action, &QAction::setChecked);
+    QObject::connect(action, &QAction::toggled, a, &QAction::setChecked);
 
-                painter.fillRect(1,0,1,height(),lG2);
-        }
-};
-#endif*/
+    return a;
+#endif
+}
 
 MainWindowViewer::MainWindowViewer()
     : QMainWindow(), fullscreen(false), toolbars(true), currentDirectory("."), currentDirectoryImgDest("."), isClient(false)
@@ -217,7 +225,7 @@ void MainWindowViewer::setupUI()
 void MainWindowViewer::createActions()
 {
     openAction = new QAction(tr("&Open"), this);
-    openAction->setIcon(QIcon(":/images/viewer_toolbar/open.png"));
+    openAction->setIcon(QIcon(addExtensionToIconPath(":/images/viewer_toolbar/open")));
     openAction->setToolTip(tr("Open a comic"));
     openAction->setData(OPEN_ACTION_Y);
     openAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(OPEN_ACTION_Y));
@@ -244,7 +252,7 @@ void MainWindowViewer::createActions()
 #endif
 
     openFolderAction = new QAction(tr("Open Folder"), this);
-    openFolderAction->setIcon(QIcon(":/images/viewer_toolbar/openFolder.png"));
+    openFolderAction->setIcon(QIcon(addExtensionToIconPath(":/images/viewer_toolbar/openFolder")));
     openFolderAction->setToolTip(tr("Open image folder"));
     openFolderAction->setData(OPEN_FOLDER_ACTION_Y);
     openFolderAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(OPEN_FOLDER_ACTION_Y));
@@ -268,28 +276,28 @@ void MainWindowViewer::createActions()
     connect(clearRecentFilesAction, &QAction::triggered, this, &MainWindowViewer::clearRecentFiles);
 
     saveImageAction = new QAction(tr("Save"), this);
-    saveImageAction->setIcon(QIcon(":/images/viewer_toolbar/save.png"));
+    saveImageAction->setIcon(QIcon(addExtensionToIconPath(":/images/viewer_toolbar/save")));
     saveImageAction->setToolTip(tr("Save current page"));
     saveImageAction->setData(SAVE_IMAGE_ACTION_Y);
     saveImageAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(SAVE_IMAGE_ACTION_Y));
     connect(saveImageAction, &QAction::triggered, this, &MainWindowViewer::saveImage);
 
     openComicOnTheLeftAction = new QAction(tr("Previous Comic"), this);
-    openComicOnTheLeftAction->setIcon(QIcon(":/images/viewer_toolbar/openPrevious.png"));
+    openComicOnTheLeftAction->setIcon(QIcon(addExtensionToIconPath(":/images/viewer_toolbar/openPrevious")));
     openComicOnTheLeftAction->setToolTip(tr("Open previous comic"));
     openComicOnTheLeftAction->setData(OPEN_PREVIOUS_COMIC_ACTION_Y);
     openComicOnTheLeftAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(OPEN_PREVIOUS_COMIC_ACTION_Y));
     connect(openComicOnTheLeftAction, &QAction::triggered, this, &MainWindowViewer::openLeftComic);
 
     openComicOnTheRightAction = new QAction(tr("Next Comic"), this);
-    openComicOnTheRightAction->setIcon(QIcon(":/images/viewer_toolbar/openNext.png"));
+    openComicOnTheRightAction->setIcon(QIcon(addExtensionToIconPath(":/images/viewer_toolbar/openNext")));
     openComicOnTheRightAction->setToolTip(tr("Open next comic"));
     openComicOnTheRightAction->setData(OPEN_NEXT_COMIC_ACTION_Y);
     openComicOnTheRightAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(OPEN_NEXT_COMIC_ACTION_Y));
     connect(openComicOnTheRightAction, &QAction::triggered, this, &MainWindowViewer::openRightComic);
 
     goToPageOnTheLeftAction = new QAction(tr("&Previous"), this);
-    goToPageOnTheLeftAction->setIcon(QIcon(":/images/viewer_toolbar/previous.png"));
+    goToPageOnTheLeftAction->setIcon(QIcon(addExtensionToIconPath(":/images/viewer_toolbar/previous")));
     goToPageOnTheLeftAction->setShortcutContext(Qt::WidgetShortcut);
     goToPageOnTheLeftAction->setToolTip(tr("Go to previous page"));
     goToPageOnTheLeftAction->setData(PREV_ACTION_Y);
@@ -297,7 +305,7 @@ void MainWindowViewer::createActions()
     connect(goToPageOnTheLeftAction, &QAction::triggered, viewer, &Viewer::left);
 
     goToPageOnTheRightAction = new QAction(tr("&Next"), this);
-    goToPageOnTheRightAction->setIcon(QIcon(":/images/viewer_toolbar/next.png"));
+    goToPageOnTheRightAction->setIcon(QIcon(addExtensionToIconPath(":/images/viewer_toolbar/next")));
     goToPageOnTheRightAction->setShortcutContext(Qt::WidgetShortcut);
     goToPageOnTheRightAction->setToolTip(tr("Go to next page"));
     goToPageOnTheRightAction->setData(NEXT_ACTION_Y);
@@ -305,27 +313,27 @@ void MainWindowViewer::createActions()
     connect(goToPageOnTheRightAction, &QAction::triggered, viewer, &Viewer::right);
 
     adjustHeightAction = new QAction(tr("Fit Height"), this);
-    adjustHeightAction->setIcon(QIcon(":/images/viewer_toolbar/toHeight.png"));
+    adjustHeightAction->setIcon(QIcon(addExtensionToIconPath(":/images/viewer_toolbar/toHeight")));
     // adjustWidth->setCheckable(true);
     adjustHeightAction->setToolTip(tr("Fit image to height"));
-    // adjustWidth->setIcon(QIcon(":/images/fitWidth.png"));
+    // adjustWidth->setIcon(QIcon(":/images/fitWidth.svg"));
     adjustHeightAction->setData(ADJUST_HEIGHT_ACTION_Y);
     adjustHeightAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(ADJUST_HEIGHT_ACTION_Y));
     adjustHeightAction->setCheckable(true);
     connect(adjustHeightAction, &QAction::triggered, this, &MainWindowViewer::fitToHeight);
 
     adjustWidthAction = new QAction(tr("Fit Width"), this);
-    adjustWidthAction->setIcon(QIcon(":/images/viewer_toolbar/toWidth.png"));
+    adjustWidthAction->setIcon(QIcon(addExtensionToIconPath(":/images/viewer_toolbar/toWidth")));
     // adjustWidth->setCheckable(true);
     adjustWidthAction->setToolTip(tr("Fit image to width"));
-    // adjustWidth->setIcon(QIcon(":/images/fitWidth.png"));
+    // adjustWidth->setIcon(QIcon(":/images/fitWidth.svg"));
     adjustWidthAction->setData(ADJUST_WIDTH_ACTION_Y);
     adjustWidthAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(ADJUST_WIDTH_ACTION_Y));
     adjustWidthAction->setCheckable(true);
     connect(adjustWidthAction, &QAction::triggered, this, &MainWindowViewer::fitToWidth);
 
     adjustToFullSizeAction = new QAction(tr("Show full size"), this);
-    adjustToFullSizeAction->setIcon(QIcon(":/images/viewer_toolbar/full.png"));
+    adjustToFullSizeAction->setIcon(QIcon(addExtensionToIconPath(":/images/viewer_toolbar/full")));
     adjustToFullSizeAction->setCheckable(false);
     adjustToFullSizeAction->setData(ADJUST_TO_FULL_SIZE_ACTION_Y);
     adjustToFullSizeAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(ADJUST_TO_FULL_SIZE_ACTION_Y));
@@ -333,7 +341,7 @@ void MainWindowViewer::createActions()
     connect(adjustToFullSizeAction, &QAction::triggered, this, &MainWindowViewer::adjustToFullSizeSwitch);
 
     fitToPageAction = new QAction(tr("Fit to page"), this);
-    fitToPageAction->setIcon(QIcon(":/images/viewer_toolbar/fitToPage.png"));
+    fitToPageAction->setIcon(QIcon(addExtensionToIconPath(":/images/viewer_toolbar/fitToPage")));
     fitToPageAction->setData(FIT_TO_PAGE_ACTION_Y);
     fitToPageAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(FIT_TO_PAGE_ACTION_Y));
     fitToPageAction->setCheckable(true);
@@ -369,7 +377,7 @@ void MainWindowViewer::createActions()
     connect(resetZoomAction, &QAction::triggered, this, &MainWindowViewer::resetZoomLevel);
 
     showZoomSliderlAction = new QAction(tr("Show zoom slider"), this);
-    showZoomSliderlAction->setIcon(QIcon(":/images/viewer_toolbar/zoom.png"));
+    showZoomSliderlAction->setIcon(QIcon(addExtensionToIconPath(":/images/viewer_toolbar/zoom")));
 
     increasePageZoomAction = new QAction(tr("Zoom+"), this);
     increasePageZoomAction->setData(ZOOM_PLUS_ACTION_Y);
@@ -382,20 +390,20 @@ void MainWindowViewer::createActions()
     connect(decreasePageZoomAction, &QAction::triggered, this, &MainWindowViewer::decreasePageZoomLevel);
 
     leftRotationAction = new QAction(tr("Rotate image to the left"), this);
-    leftRotationAction->setIcon(QIcon(":/images/viewer_toolbar/rotateL.png"));
+    leftRotationAction->setIcon(QIcon(addExtensionToIconPath(":/images/viewer_toolbar/rotateL")));
     leftRotationAction->setData(LEFT_ROTATION_ACTION_Y);
     leftRotationAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(LEFT_ROTATION_ACTION_Y));
     connect(leftRotationAction, &QAction::triggered, viewer, &Viewer::rotateLeft);
 
     rightRotationAction = new QAction(tr("Rotate image to the right"), this);
-    rightRotationAction->setIcon(QIcon(":/images/viewer_toolbar/rotateR.png"));
+    rightRotationAction->setIcon(QIcon(addExtensionToIconPath(":/images/viewer_toolbar/rotateR")));
     rightRotationAction->setData(RIGHT_ROTATION_ACTION_Y);
     rightRotationAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(RIGHT_ROTATION_ACTION_Y));
     connect(rightRotationAction, &QAction::triggered, viewer, &Viewer::rotateRight);
 
     doublePageAction = new QAction(tr("Double page mode"), this);
     doublePageAction->setToolTip(tr("Switch to double page mode"));
-    doublePageAction->setIcon(QIcon(":/images/viewer_toolbar/doublePage.png"));
+    doublePageAction->setIcon(QIcon(addExtensionToIconPath(":/images/viewer_toolbar/doublePage")));
     doublePageAction->setCheckable(true);
     doublePageAction->setChecked(Configuration::getConfiguration().getDoublePage());
     doublePageAction->setData(DOUBLE_PAGE_ACTION_Y);
@@ -405,7 +413,7 @@ void MainWindowViewer::createActions()
     // inversed pictures mode
     doubleMangaPageAction = new QAction(tr("Double page manga mode"), this);
     doubleMangaPageAction->setToolTip(tr("Reverse reading order in double page mode"));
-    doubleMangaPageAction->setIcon(QIcon(":/images/viewer_toolbar/doubleMangaPage.png"));
+    doubleMangaPageAction->setIcon(QIcon(addExtensionToIconPath(":/images/viewer_toolbar/doubleMangaPage")));
     doubleMangaPageAction->setCheckable(true);
     doubleMangaPageAction->setChecked(Configuration::getConfiguration().getDoubleMangaPage());
     doubleMangaPageAction->setData(DOUBLE_MANGA_PAGE_ACTION_Y);
@@ -414,7 +422,7 @@ void MainWindowViewer::createActions()
     connect(doubleMangaPageAction, &QAction::triggered, this, &MainWindowViewer::doubleMangaPageSwitch);
 
     goToPageAction = new QAction(tr("Go To"), this);
-    goToPageAction->setIcon(QIcon(":/images/viewer_toolbar/goto.png"));
+    goToPageAction->setIcon(QIcon(addExtensionToIconPath(":/images/viewer_toolbar/goto")));
     goToPageAction->setToolTip(tr("Go to page ..."));
     goToPageAction->setData(GO_TO_PAGE_ACTION_Y);
     goToPageAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(GO_TO_PAGE_ACTION_Y));
@@ -424,20 +432,20 @@ void MainWindowViewer::createActions()
     optionsAction->setToolTip(tr("YACReader options"));
     optionsAction->setData(OPTIONS_ACTION_Y);
     optionsAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(OPTIONS_ACTION_Y));
-    optionsAction->setIcon(QIcon(":/images/viewer_toolbar/options.png"));
+    optionsAction->setIcon(QIcon(addExtensionToIconPath(":/images/viewer_toolbar/options")));
 
     connect(optionsAction, &QAction::triggered, optionsDialog, &OptionsDialog::show);
 
     helpAboutAction = new QAction(tr("Help"), this);
     helpAboutAction->setToolTip(tr("Help, About YACReader"));
-    helpAboutAction->setIcon(QIcon(":/images/viewer_toolbar/help.png"));
+    helpAboutAction->setIcon(QIcon(addExtensionToIconPath(":/images/viewer_toolbar/help")));
     helpAboutAction->setData(HELP_ABOUT_ACTION_Y);
     helpAboutAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(HELP_ABOUT_ACTION_Y));
     connect(helpAboutAction, &QAction::triggered, had, &QWidget::show);
 
     showMagnifyingGlassAction = new QAction(tr("Magnifying glass"), this);
     showMagnifyingGlassAction->setToolTip(tr("Switch Magnifying glass"));
-    showMagnifyingGlassAction->setIcon(QIcon(":/images/viewer_toolbar/magnifyingGlass.png"));
+    showMagnifyingGlassAction->setIcon(QIcon(addExtensionToIconPath(":/images/viewer_toolbar/magnifyingGlass")));
     showMagnifyingGlassAction->setCheckable(true);
     showMagnifyingGlassAction->setData(SHOW_MAGNIFYING_GLASS_ACTION_Y);
     showMagnifyingGlassAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(SHOW_MAGNIFYING_GLASS_ACTION_Y));
@@ -445,7 +453,7 @@ void MainWindowViewer::createActions()
 
     setBookmarkAction = new QAction(tr("Set bookmark"), this);
     setBookmarkAction->setToolTip(tr("Set a bookmark on the current page"));
-    setBookmarkAction->setIcon(QIcon(":/images/viewer_toolbar/bookmark.png"));
+    setBookmarkAction->setIcon(QIcon(addExtensionToIconPath(":/images/viewer_toolbar/bookmark")));
     setBookmarkAction->setCheckable(true);
     setBookmarkAction->setData(SET_BOOKMARK_ACTION_Y);
     setBookmarkAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(SET_BOOKMARK_ACTION_Y));
@@ -455,39 +463,38 @@ void MainWindowViewer::createActions()
 
     showBookmarksAction = new QAction(tr("Show bookmarks"), this);
     showBookmarksAction->setToolTip(tr("Show the bookmarks of the current comic"));
-    showBookmarksAction->setIcon(QIcon(":/images/viewer_toolbar/showBookmarks.png"));
+    showBookmarksAction->setIcon(QIcon(addExtensionToIconPath(":/images/viewer_toolbar/showBookmarks")));
     showBookmarksAction->setData(SHOW_BOOKMARKS_ACTION_Y);
     showBookmarksAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(SHOW_BOOKMARKS_ACTION_Y));
     connect(showBookmarksAction, &QAction::triggered, viewer->getBookmarksDialog(), &QWidget::show);
 
     showShorcutsAction = new QAction(tr("Show keyboard shortcuts"), this);
-    showShorcutsAction->setIcon(QIcon(":/images/viewer_toolbar/shortcuts.png"));
+    showShorcutsAction->setIcon(QIcon(addExtensionToIconPath(":/images/viewer_toolbar/shortcuts")));
     showShorcutsAction->setData(SHOW_SHORCUTS_ACTION_Y);
     showShorcutsAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(SHOW_SHORCUTS_ACTION_Y));
-    // connect(showShorcutsAction, SIGNAL(triggered()),shortcutsDialog,SLOT(show()));
     connect(showShorcutsAction, &QAction::triggered, editShortcutsDialog, &QWidget::show);
 
     showInfoAction = new QAction(tr("Show Info"), this);
-    showInfoAction->setIcon(QIcon(":/images/viewer_toolbar/info.png"));
+    showInfoAction->setIcon(QIcon(addExtensionToIconPath(":/images/viewer_toolbar/info")));
     showInfoAction->setData(SHOW_INFO_ACTION_Y);
     showInfoAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(SHOW_INFO_ACTION_Y));
     connect(showInfoAction, &QAction::triggered, viewer, &Viewer::informationSwitch);
 
     closeAction = new QAction(tr("Close"), this);
-    closeAction->setIcon(QIcon(":/images/viewer_toolbar/close.png"));
+    closeAction->setIcon(QIcon(addExtensionToIconPath(":/images/viewer_toolbar/close")));
     closeAction->setData(CLOSE_ACTION_Y);
     closeAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(CLOSE_ACTION_Y));
     connect(closeAction, &QAction::triggered, this, &QWidget::close);
 
     showDictionaryAction = new QAction(tr("Show Dictionary"), this);
-    showDictionaryAction->setIcon(QIcon(":/images/viewer_toolbar/translator.png"));
+    showDictionaryAction->setIcon(QIcon(addExtensionToIconPath(":/images/viewer_toolbar/translator")));
     // showDictionaryAction->setCheckable(true);
     showDictionaryAction->setData(SHOW_DICTIONARY_ACTION_Y);
     showDictionaryAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(SHOW_DICTIONARY_ACTION_Y));
     connect(showDictionaryAction, &QAction::triggered, viewer, &Viewer::translatorSwitch);
 
     showFlowAction = new QAction(tr("Show go to flow"), this);
-    showFlowAction->setIcon(QIcon(":/images/viewer_toolbar/flow.png"));
+    showFlowAction->setIcon(QIcon(addExtensionToIconPath(":/images/viewer_toolbar/flow")));
     showFlowAction->setData(SHOW_FLOW_ACTION_Y);
     showFlowAction->setShortcut(ShortcutsManager::getShortcutsManager().getShortcut(SHOW_FLOW_ACTION_Y));
     connect(showFlowAction, &QAction::triggered, viewer, &Viewer::goToFlowSwitch);
@@ -533,61 +540,72 @@ void MainWindowViewer::createToolBars()
     refreshRecentFilesActionList();
 
     auto tb = new QToolButton();
-    tb->addAction(openAction);
-    tb->addAction(openLatestComicAction);
-    tb->addAction(openFolderAction);
+    auto open = actionWithCustomIcon(QIcon(addExtensionToIconPathInToolbar(":/images/viewer_toolbar/open")), openAction);
+    tb->addAction(open);
+    tb->addAction(actionWithCustomIcon(QIcon(), openLatestComicAction));
+    tb->addAction(actionWithCustomIcon(QIcon(addExtensionToIconPathInToolbar(":/images/viewer_toolbar/openFolder")), openFolderAction));
     tb->addAction(recentmenu->menuAction());
     tb->setPopupMode(QToolButton::MenuButtonPopup);
-    tb->setDefaultAction(openAction);
+    tb->setDefaultAction(open);
 
     comicToolBar->addWidget(tb);
 #endif
 
-    comicToolBar->addAction(saveImageAction);
-    comicToolBar->addAction(openComicOnTheLeftAction);
-    comicToolBar->addAction(openComicOnTheRightAction);
+    comicToolBar->addAction(actionWithCustomIcon(QIcon(addExtensionToIconPathInToolbar(":/images/viewer_toolbar/save")), saveImageAction));
+    comicToolBar->addAction(actionWithCustomIcon(QIcon(addExtensionToIconPathInToolbar(":/images/viewer_toolbar/openPrevious")), openComicOnTheLeftAction));
+    comicToolBar->addAction(actionWithCustomIcon(QIcon(addExtensionToIconPathInToolbar(":/images/viewer_toolbar/openNext")), openComicOnTheRightAction));
 
     comicToolBar->addSeparator();
 
-    comicToolBar->addAction(goToPageOnTheLeftAction);
-    comicToolBar->addAction(goToPageOnTheRightAction);
-    comicToolBar->addAction(goToPageAction);
+    comicToolBar->addAction(actionWithCustomIcon(QIcon(addExtensionToIconPathInToolbar(":/images/viewer_toolbar/previous")), goToPageOnTheLeftAction));
+    comicToolBar->addAction(actionWithCustomIcon(QIcon(addExtensionToIconPathInToolbar(":/images/viewer_toolbar/next")), goToPageOnTheRightAction));
+    comicToolBar->addAction(actionWithCustomIcon(QIcon(addExtensionToIconPathInToolbar(":/images/viewer_toolbar/goto")), goToPageAction));
 
     comicToolBar->addSeparator();
 
-    comicToolBar->addAction(adjustWidthAction);
-    comicToolBar->addAction(adjustHeightAction);
+    auto adjustToWidthTBAction = actionWithCustomIcon(QIcon(addExtensionToIconPathInToolbar(":/images/viewer_toolbar/toWidth")), adjustWidthAction);
+    comicToolBar->addAction(adjustToWidthTBAction);
+    auto adjustToHeightTBAction = actionWithCustomIcon(QIcon(addExtensionToIconPathInToolbar(":/images/viewer_toolbar/toHeight")), adjustHeightAction);
+    comicToolBar->addAction(adjustToHeightTBAction);
+    auto adjustToFullSizeTBAction = actionWithCustomIcon(QIcon(addExtensionToIconPathInToolbar(":/images/viewer_toolbar/full")), adjustToFullSizeAction);
     comicToolBar->addAction(adjustToFullSizeAction);
-    comicToolBar->addAction(fitToPageAction);
+    auto fitToPageTBAction = actionWithCustomIcon(QIcon(addExtensionToIconPathInToolbar(":/images/viewer_toolbar/fitToPage")), fitToPageAction);
+    comicToolBar->addAction(fitToPageTBAction);
+
+    auto fitModes = new QActionGroup(this);
+    fitModes->addAction(adjustToWidthTBAction);
+    fitModes->addAction(adjustToHeightTBAction);
+    fitModes->addAction(adjustToFullSizeTBAction);
+    fitModes->addAction(fitToPageTBAction);
 
     zoomSliderAction = new YACReaderSlider(this);
     zoomSliderAction->hide();
 
-    comicToolBar->addAction(showZoomSliderlAction);
+    comicToolBar->addAction(actionWithCustomIcon(QIcon(addExtensionToIconPathInToolbar(":/images/viewer_toolbar/zoom")), showZoomSliderlAction));
 
     connect(showZoomSliderlAction, &QAction::triggered, this, &MainWindowViewer::toggleFitToWidthSlider);
     connect(zoomSliderAction, &YACReaderSlider::zoomRatioChanged, viewer, &Viewer::updateZoomRatio);
     connect(viewer, &Viewer::zoomUpdated, zoomSliderAction, &YACReaderSlider::updateZoomRatio);
 
-    comicToolBar->addAction(leftRotationAction);
-    comicToolBar->addAction(rightRotationAction);
-    comicToolBar->addAction(doublePageAction);
-    comicToolBar->addAction(doubleMangaPageAction);
+    comicToolBar->addAction(actionWithCustomIcon(QIcon(addExtensionToIconPathInToolbar(":/images/viewer_toolbar/rotateL")), leftRotationAction));
+    comicToolBar->addAction(actionWithCustomIcon(QIcon(addExtensionToIconPathInToolbar(":/images/viewer_toolbar/rotateR")), rightRotationAction));
+    comicToolBar->addAction(actionWithCustomIcon(QIcon(addExtensionToIconPathInToolbar(":/images/viewer_toolbar/doublePage")), doublePageAction));
+    comicToolBar->addAction(actionWithCustomIcon(QIcon(addExtensionToIconPathInToolbar(":/images/viewer_toolbar/doubleMangaPage")), doubleMangaPageAction));
 
     comicToolBar->addSeparator();
 
-    comicToolBar->addAction(showMagnifyingGlassAction);
+    comicToolBar->addAction(actionWithCustomIcon(QIcon(addExtensionToIconPathInToolbar(":/images/viewer_toolbar/magnifyingGlass")), showMagnifyingGlassAction));
 
     comicToolBar->addSeparator();
 
-    comicToolBar->addAction(setBookmarkAction);
-    comicToolBar->addAction(showBookmarksAction);
+    comicToolBar->addAction(actionWithCustomIcon(QIcon(addExtensionToIconPathInToolbar(":/images/viewer_toolbar/bookmark")), setBookmarkAction));
+    comicToolBar->addAction(actionWithCustomIcon(QIcon(addExtensionToIconPathInToolbar(":/images/viewer_toolbar/showBookmarks")), showBookmarksAction));
 
     comicToolBar->addSeparator();
 
-    comicToolBar->addAction(showDictionaryAction);
-    comicToolBar->addAction(showFlowAction);
-    comicToolBar->addAction(showInfoAction);
+    comicToolBar->addAction(actionWithCustomIcon(QIcon(addExtensionToIconPathInToolbar(":/images/viewer_toolbar/translator")), showDictionaryAction));
+    comicToolBar->addAction(actionWithCustomIcon(QIcon(addExtensionToIconPathInToolbar(":/images/viewer_toolbar/flow")), showFlowAction));
+    comicToolBar->addAction(actionWithCustomIcon(QIcon(addExtensionToIconPathInToolbar(":/images/viewer_toolbar/info")), showInfoAction));
 
 #ifdef Q_OS_MAC
     comicToolBar->addStretch();
@@ -595,10 +613,9 @@ void MainWindowViewer::createToolBars()
     comicToolBar->addWidget(new YACReaderToolBarStretch());
 #endif
 
-    comicToolBar->addAction(showShorcutsAction);
-    comicToolBar->addAction(optionsAction);
-    comicToolBar->addAction(helpAboutAction);
-    // comicToolBar->addAction(closeAction);
+    comicToolBar->addAction(actionWithCustomIcon(QIcon(addExtensionToIconPathInToolbar(":/images/viewer_toolbar/shortcuts")), showShorcutsAction));
+    comicToolBar->addAction(actionWithCustomIcon(QIcon(addExtensionToIconPathInToolbar(":/images/viewer_toolbar/options")), optionsAction));
+    comicToolBar->addAction(actionWithCustomIcon(QIcon(addExtensionToIconPathInToolbar(":/images/viewer_toolbar/help")), helpAboutAction));
 
 #ifndef Q_OS_MAC
     comicToolBar->setMovable(false);
@@ -1156,7 +1173,7 @@ void MainWindowViewer::setUpShortcutsManagement()
     QList<QAction *> allActions;
     QList<QAction *> tmpList;
 
-    editShortcutsDialog->addActionsGroup(tr("Comics"), QIcon(":/images/shortcuts_group_comics.png"),
+    editShortcutsDialog->addActionsGroup(tr("Comics"), QIcon(":/images/shortcuts_group_comics.svg"),
                                          tmpList = { openAction,
                                                      openLatestComicAction,
                                                      openFolderAction,
@@ -1172,7 +1189,7 @@ void MainWindowViewer::setUpShortcutsManagement()
     auto *const toggleToolbarsAction = addActionWithShortcut(tr("Hide/show toolbar"), TOGGLE_TOOL_BARS_ACTION_Y);
     connect(toggleToolbarsAction, &QAction::triggered, this, &MainWindowViewer::toggleToolBars);
 
-    editShortcutsDialog->addActionsGroup(tr("General"), QIcon(":/images/shortcuts_group_general.png"),
+    editShortcutsDialog->addActionsGroup(tr("General"), QIcon(":/images/shortcuts_group_general.svg"),
                                          tmpList = QList<QAction *>()
                                                  << optionsAction
                                                  << helpAboutAction
@@ -1206,7 +1223,7 @@ void MainWindowViewer::setUpShortcutsManagement()
     mglassActions = { sizeUpMglassAction, sizeDownMglassAction,
                       zoomInMglassAction, zoomOutMglassAction };
 
-    editShortcutsDialog->addActionsGroup(tr("Magnifiying glass"), QIcon(":/images/shortcuts_group_mglass.png"),
+    editShortcutsDialog->addActionsGroup(tr("Magnifiying glass"), QIcon(":/images/shortcuts_group_mglass.svg"),
                                          tmpList = QList<QAction *>()
                                                  << showMagnifyingGlassAction
                                                  << mglassActions);
@@ -1217,7 +1234,7 @@ void MainWindowViewer::setUpShortcutsManagement()
                                                                 CHANGE_FIT_ACTION_Y);
     connect(toggleFitToScreenAction, &QAction::triggered, this, &MainWindowViewer::toggleWidthHeight);
 
-    editShortcutsDialog->addActionsGroup(tr("Page adjustement"), QIcon(":/images/shortcuts_group_page.png"),
+    editShortcutsDialog->addActionsGroup(tr("Page adjustement"), QIcon(":/images/shortcuts_group_page.svg"),
                                          tmpList = QList<QAction *>()
                                                  << adjustHeightAction
                                                  << adjustWidthAction
@@ -1287,7 +1304,7 @@ void MainWindowViewer::setUpShortcutsManagement()
                            goToFirstPageAction,
                            goToLastPageAction };
 
-    editShortcutsDialog->addActionsGroup(tr("Reading"), QIcon(":/images/shortcuts_group_reading.png"),
+    editShortcutsDialog->addActionsGroup(tr("Reading"), QIcon(":/images/shortcuts_group_reading.svg"),
                                          tmpList = QList<QAction *>()
                                                  << goToPageOnTheRightAction
                                                  << goToPageOnTheLeftAction
diff --git a/YACReader/yacreader_images.qrc b/YACReader/yacreader_images.qrc
index 7eaf093c..96434918 100644
--- a/YACReader/yacreader_images.qrc
+++ b/YACReader/yacreader_images.qrc
@@ -21,16 +21,16 @@
     <file>../images/dropDownArrow.png</file>
     <file>../images/translatorSearch.png</file>
     <file>../images/speaker.png</file>
-    <file>../images/clear_shortcut.png</file>
-    <file>../images/accept_shortcut.png</file>
-    <file>../images/shortcuts_group_comics.png</file>
-    <file>../images/shortcuts_group_folders.png</file>
-    <file>../images/shortcuts_group_general.png</file>
-    <file>../images/shortcuts_group_libraries.png</file>
-    <file>../images/shortcuts_group_mglass.png</file>
-    <file>../images/shortcuts_group_page.png</file>
-    <file>../images/shortcuts_group_reading.png</file>
-    <file>../images/shortcuts_group_visualization.png</file>
+    <file>../images/clear_shortcut.svg</file>
+    <file>../images/accept_shortcut.svg</file>
+    <file>../images/shortcuts_group_comics.svg</file>
+    <file>../images/shortcuts_group_folders.svg</file>
+    <file>../images/shortcuts_group_general.svg</file>
+    <file>../images/shortcuts_group_libraries.svg</file>
+    <file>../images/shortcuts_group_mglass.svg</file>
+    <file>../images/shortcuts_group_page.svg</file>
+    <file>../images/shortcuts_group_reading.svg</file>
+    <file>../images/shortcuts_group_visualization.svg</file>
     <file>../images/custom_dialog/custom_close_button.svg</file>
     <file>../images/whats_new/whatsnew_header.svg</file>
   </qresource>
diff --git a/YACReader/yacreader_images_win.qrc b/YACReader/yacreader_images_win.qrc
index c98b2d86..7915c821 100644
--- a/YACReader/yacreader_images_win.qrc
+++ b/YACReader/yacreader_images_win.qrc
@@ -1,31 +1,58 @@
 <RCC>
   <qresource prefix="/" >
-    <file>../images/viewer_toolbar/bookmark.png</file>
-    <file>../images/viewer_toolbar/close.png</file>
-    <file>../images/viewer_toolbar/doublePage.png</file>
-    <file>../images/viewer_toolbar/doubleMangaPage.png</file>
-    <file>../images/viewer_toolbar/fitToPage.png</file>
-    <file>../images/viewer_toolbar/flow.png</file>
-    <file>../images/viewer_toolbar/full.png</file>
-    <file>../images/viewer_toolbar/goto.png</file>
-    <file>../images/viewer_toolbar/help.png</file>
-    <file>../images/viewer_toolbar/info.png</file>
-    <file>../images/viewer_toolbar/magnifyingGlass.png</file>
-    <file>../images/viewer_toolbar/next.png</file>
-    <file>../images/viewer_toolbar/open.png</file>
-    <file>../images/viewer_toolbar/openFolder.png</file>
-    <file>../images/viewer_toolbar/openNext.png</file>
-    <file>../images/viewer_toolbar/openPrevious.png</file>
-    <file>../images/viewer_toolbar/options.png</file>
-    <file>../images/viewer_toolbar/previous.png</file>
-    <file>../images/viewer_toolbar/rotateL.png</file>
-    <file>../images/viewer_toolbar/rotateR.png</file>
-    <file>../images/viewer_toolbar/save.png</file>
-    <file>../images/viewer_toolbar/shortcuts.png</file>
-    <file>../images/viewer_toolbar/showBookmarks.png</file>
-    <file>../images/viewer_toolbar/toHeight.png</file>
-    <file>../images/viewer_toolbar/toWidth.png</file>
-    <file>../images/viewer_toolbar/translator.png</file>
-    <file>../images/viewer_toolbar/zoom.png</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/YACReaderLibrary/images.qrc b/YACReaderLibrary/images.qrc
index c9cf0200..e43b7f81 100644
--- a/YACReaderLibrary/images.qrc
+++ b/YACReaderLibrary/images.qrc
@@ -1,7 +1,7 @@
 <RCC>
     <qresource prefix="/">
-        <file>../images/accept_shortcut.png</file>
-        <file>../images/clear_shortcut.png</file>
+        <file>../images/accept_shortcut.svg</file>
+        <file>../images/clear_shortcut.svg</file>
         <file>../images/comic_vine/downArrow.png</file>
         <file>../images/comic_vine/nextPage.png</file>
         <file>../images/comic_vine/previousPage.png</file>
@@ -92,14 +92,14 @@
         <file>../images/readRibbon.png</file>
         <file>../images/searching_icon.png</file>
         <file>../images/serverConfigBackground.png</file>
-        <file>../images/shortcuts_group_comics.png</file>
-        <file>../images/shortcuts_group_folders.png</file>
-        <file>../images/shortcuts_group_general.png</file>
-        <file>../images/shortcuts_group_libraries.png</file>
-        <file>../images/shortcuts_group_mglass.png</file>
-        <file>../images/shortcuts_group_page.png</file>
-        <file>../images/shortcuts_group_reading.png</file>
-        <file>../images/shortcuts_group_visualization.png</file>
+        <file>../images/shortcuts_group_comics.svg</file>
+        <file>../images/shortcuts_group_folders.svg</file>
+        <file>../images/shortcuts_group_general.svg</file>
+        <file>../images/shortcuts_group_libraries.svg</file>
+        <file>../images/shortcuts_group_mglass.svg</file>
+        <file>../images/shortcuts_group_page.svg</file>
+        <file>../images/shortcuts_group_reading.svg</file>
+        <file>../images/shortcuts_group_visualization.svg</file>
         <file>../images/shownCovers.png</file>
         <file>../images/sidebar/branch-closed.png</file>
         <file>../images/sidebar/branch-open.png</file>
diff --git a/YACReaderLibrary/library_window.cpp b/YACReaderLibrary/library_window.cpp
index 26d76811..637e449c 100644
--- a/YACReaderLibrary/library_window.cpp
+++ b/YACReaderLibrary/library_window.cpp
@@ -361,7 +361,7 @@ void LibraryWindow::setUpShortcutsManagement()
     QList<QAction *> allActions;
     QList<QAction *> tmpList;
 
-    editShortcutsDialog->addActionsGroup("Comics", QIcon(":/images/shortcuts_group_comics.png"),
+    editShortcutsDialog->addActionsGroup("Comics", QIcon(":/images/shortcuts_group_comics.svg"),
                                          tmpList = QList<QAction *>()
                                                  << openComicAction
                                                  << saveCoversToAction
@@ -379,7 +379,7 @@ void LibraryWindow::setUpShortcutsManagement()
 
     allActions << tmpList;
 
-    editShortcutsDialog->addActionsGroup("Folders", QIcon(":/images/shortcuts_group_folders.png"),
+    editShortcutsDialog->addActionsGroup("Folders", QIcon(":/images/shortcuts_group_folders.svg"),
                                          tmpList = QList<QAction *>()
                                                  << addFolderAction
                                                  << deleteFolderAction
@@ -396,7 +396,7 @@ void LibraryWindow::setUpShortcutsManagement()
                                                  << updateCurrentFolderAction);
     allActions << tmpList;
 
-    editShortcutsDialog->addActionsGroup("Lists", QIcon(":/images/shortcuts_group_folders.png"), // TODO change icon
+    editShortcutsDialog->addActionsGroup("Lists", QIcon(":/images/shortcuts_group_folders.svg"), // TODO change icon
                                          tmpList = QList<QAction *>()
                                                  << addReadingListAction
                                                  << deleteReadingListAction
@@ -404,7 +404,7 @@ void LibraryWindow::setUpShortcutsManagement()
                                                  << renameListAction);
     allActions << tmpList;
 
-    editShortcutsDialog->addActionsGroup("General", QIcon(":/images/shortcuts_group_general.png"),
+    editShortcutsDialog->addActionsGroup("General", QIcon(":/images/shortcuts_group_general.svg"),
                                          tmpList = QList<QAction *>()
                                                  << backAction
                                                  << forwardAction
@@ -418,7 +418,7 @@ void LibraryWindow::setUpShortcutsManagement()
 
     allActions << tmpList;
 
-    editShortcutsDialog->addActionsGroup("Libraries", QIcon(":/images/shortcuts_group_libraries.png"),
+    editShortcutsDialog->addActionsGroup("Libraries", QIcon(":/images/shortcuts_group_libraries.svg"),
                                          tmpList = QList<QAction *>()
                                                  << createLibraryAction
                                                  << openLibraryAction
@@ -433,7 +433,7 @@ void LibraryWindow::setUpShortcutsManagement()
 
     allActions << tmpList;
 
-    editShortcutsDialog->addActionsGroup("Visualization", QIcon(":/images/shortcuts_group_visualization.png"),
+    editShortcutsDialog->addActionsGroup("Visualization", QIcon(":/images/shortcuts_group_visualization.svg"),
                                          tmpList = QList<QAction *>()
                                                  << showHideMarksAction
 #ifndef Q_OS_MAC
diff --git a/images/accept_shortcut.svg b/images/accept_shortcut.svg
new file mode 100644
index 00000000..7c40300c
--- /dev/null
+++ b/images/accept_shortcut.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 15 15"><defs><style>.cls-1{fill:#8c8b8b;}</style></defs><polygon class="cls-1" points="13.35 4.35 12.65 3.65 6 10.29 2.35 6.65 1.65 7.35 5.65 11.35 6.01 11.69 6.35 11.35 13.35 4.35"/></svg>
\ No newline at end of file
diff --git a/images/clear_shortcut.svg b/images/clear_shortcut.svg
new file mode 100644
index 00000000..ada051c0
--- /dev/null
+++ b/images/clear_shortcut.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 15 15"><defs><style>.cls-1{fill:#8c8b8b;}</style></defs><path class="cls-1" d="M11,6v7H4V6h7m0-1H4c-.55,0-1,.45-1,1v7c0,.55,.45,1,1,1h7c.55,0,1-.45,1-1V6c0-.55-.45-1-1-1h0Z"/><polygon class="cls-1" points="6 7 5 7 5 12 6 12 6 7 6 7"/><polygon class="cls-1" points="8 7 7 7 7 12 8 12 8 7 8 7"/><polygon class="cls-1" points="10 7 9 7 9 12 10 12 10 7 10 7"/><polygon class="cls-1" points="13 3 2 3 2 4 13 4 13 3 13 3"/><path class="cls-1" d="M9,2v1h-3v-1h3m0-1h-3c-.55,0-1,.45-1,1v1c0,.55,.45,1,1,1h3c.55,0,1-.45,1-1v-1c0-.55-.45-1-1-1h0Z"/></svg>
\ No newline at end of file
diff --git a/images/shortcuts_group_comics.svg b/images/shortcuts_group_comics.svg
new file mode 100644
index 00000000..66cc3bd6
--- /dev/null
+++ b/images/shortcuts_group_comics.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.cls-1{fill:#404040;}</style></defs><path class="cls-1" d="M15.8,7.14c0-3.28-3.5-5.94-7.8-5.94S.2,3.86,.2,7.14c0,2.46,1.97,4.58,4.78,5.48,.2,.78,.55,1.12-2.55,3.19,0,0,4.95,0,6.19-2.48l.29-.29c3.87-.34,6.89-2.85,6.89-5.9Z"/></svg>
\ No newline at end of file
diff --git a/images/shortcuts_group_folders.svg b/images/shortcuts_group_folders.svg
new file mode 100644
index 00000000..d66245ab
--- /dev/null
+++ b/images/shortcuts_group_folders.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.cls-1{fill:#404040;}</style></defs><polygon class="cls-1" points="14.93 14 1.07 14 0 5 16 5 14.93 14"/><polygon class="cls-1" points="6 3 6 2 1 2 1 4 6 4 15 4 15 3 6 3"/></svg>
\ No newline at end of file
diff --git a/images/shortcuts_group_general.svg b/images/shortcuts_group_general.svg
new file mode 100644
index 00000000..eb25e4de
--- /dev/null
+++ b/images/shortcuts_group_general.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.cls-1{fill:#404040;}</style></defs><path class="cls-1" d="M15.27,9.33c.4,0,.73-.36,.73-.8v-1.07c0-.44-.33-.8-.73-.8s-.84-.34-.97-.76l-.36-.87c-.21-.39-.14-.94,.14-1.22s.27-.77-.05-1.09l-.75-.75c-.31-.31-.8-.33-1.09-.05s-.84,.35-1.22,.14l-.87-.36c-.42-.13-.76-.57-.76-.97s-.36-.73-.8-.73h-1.07c-.44,0-.8,.33-.8,.73s-.34,.84-.76,.97l-.87,.36c-.39,.21-.94,.14-1.22-.14s-.77-.27-1.09,.05l-.75,.75c-.31,.31-.33,.8-.05,1.09s.35,.84,.14,1.22l-.36,.87c-.13,.42-.57,.76-.97,.76s-.73,.36-.73,.8v1.07c0,.44,.33,.8,.73,.8s.84,.34,.97,.76l.36,.87c.21,.39,.14,.94-.14,1.22s-.27,.77,.05,1.09l.75,.75c.31,.31,.8,.33,1.09,.05s.84-.35,1.22-.14l.87,.36c.42,.13,.76,.57,.76,.97s.36,.73,.8,.73h1.07c.44,0,.8-.33,.8-.73s.34-.84,.76-.97l.87-.36c.39-.21,.94-.14,1.22,.14s.77,.27,1.09-.05l.75-.75c.31-.31,.33-.8,.05-1.09s-.35-.84-.14-1.22l.36-.87c.13-.42,.57-.76,.97-.76Zm-7.27,1.6c-1.62,0-2.93-1.32-2.93-2.93s1.31-2.93,2.93-2.93,2.93,1.32,2.93,2.93-1.31,2.93-2.93,2.93Z"/></svg>
\ No newline at end of file
diff --git a/images/shortcuts_group_libraries.svg b/images/shortcuts_group_libraries.svg
new file mode 100644
index 00000000..250963dc
--- /dev/null
+++ b/images/shortcuts_group_libraries.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.cls-1{fill:#404040;}</style></defs><rect class="cls-1" x="1" y="1" width="14" height="3"/><path class="cls-1" d="M3,5h-1V14c0,.55,.45,1,1,1H13c.55,0,1-.45,1-1V5H3Zm8,4H5v-2h6v2Z"/></svg>
\ No newline at end of file
diff --git a/images/shortcuts_group_mglass.svg b/images/shortcuts_group_mglass.svg
new file mode 100644
index 00000000..64c1e780
--- /dev/null
+++ b/images/shortcuts_group_mglass.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.cls-1{fill:#404040;}</style></defs><path class="cls-1" d="M7.35,1C3.84,1,1,3.84,1,7.35s2.84,6.35,6.35,6.35,6.35-2.84,6.35-6.35S10.86,1,7.35,1Zm0,10.97c-2.55,0-4.62-2.07-4.62-4.62S4.8,2.73,7.35,2.73s4.62,2.07,4.62,4.62-2.07,4.62-4.62,4.62Z"/><rect class="cls-1" x="11.39" y="10.24" width="2.31" height="4.62" transform="translate(-5.2 12.55) rotate(-45)"/></svg>
\ No newline at end of file
diff --git a/images/shortcuts_group_page.svg b/images/shortcuts_group_page.svg
new file mode 100644
index 00000000..950d2890
--- /dev/null
+++ b/images/shortcuts_group_page.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.cls-1{fill:#404040;}</style></defs><polygon class="cls-1" points="13 15 3 15 3 1 9 1 9 5 13 5 13 15"/><polygon class="cls-1" points="13 4 10 4 10 1 13 4"/></svg>
\ No newline at end of file
diff --git a/images/shortcuts_group_reading.svg b/images/shortcuts_group_reading.svg
new file mode 100644
index 00000000..eccd1f81
--- /dev/null
+++ b/images/shortcuts_group_reading.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.cls-1{fill:#404040;}</style></defs><path class="cls-1" d="M9,1H3V15H13V5h-4V1Zm-1,11H4v-1h4v1Zm4-2H4v-1H12v1Zm0-3v1H4v-1H12Z"/><polygon class="cls-1" points="13 4 10 4 10 1 13 4"/></svg>
\ No newline at end of file
diff --git a/images/shortcuts_group_visualization.svg b/images/shortcuts_group_visualization.svg
new file mode 100644
index 00000000..ee2b6c0b
--- /dev/null
+++ b/images/shortcuts_group_visualization.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.cls-1{fill:#404040;}</style></defs><path class="cls-1" d="M8,13.79c-3.53,0-6.62-2.38-7.53-5.79,.91-3.42,3.99-5.79,7.53-5.79s6.62,2.38,7.53,5.79c-.91,3.42-3.99,5.79-7.53,5.79Zm0-10c-2.32,0-4.21,1.89-4.21,4.21s1.89,4.21,4.21,4.21,4.21-1.89,4.21-4.21-1.89-4.21-4.21-4.21Z"/><circle class="cls-1" cx="8" cy="8" r="1.79"/></svg>
\ No newline at end of file
diff --git a/images/viewer_toolbar/bookmark.png b/images/viewer_toolbar/bookmark.png
deleted file mode 100644
index 5d3dc1a6..00000000
Binary files a/images/viewer_toolbar/bookmark.png and /dev/null differ
diff --git a/images/viewer_toolbar/bookmark.svg b/images/viewer_toolbar/bookmark.svg
new file mode 100644
index 00000000..7b33172f
--- /dev/null
+++ b/images/viewer_toolbar/bookmark.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.cls-1{fill:#404040;}</style></defs><path class="cls-1" d="M13,0H3c-.55,0-1,.45-1,1v15l6-5,6,5V1c0-.55-.45-1-1-1Z"/></svg>
\ No newline at end of file
diff --git a/images/viewer_toolbar/bookmark_18x18.svg b/images/viewer_toolbar/bookmark_18x18.svg
new file mode 100644
index 00000000..edf0e4f8
--- /dev/null
+++ b/images/viewer_toolbar/bookmark_18x18.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 18 18"><defs><style>.cls-1{fill:#404040;}</style></defs><path class="cls-1" d="M14,1H4c-.55,0-1,.45-1,1v15l6-5,6,5V2c0-.55-.45-1-1-1Z"/></svg>
\ No newline at end of file
diff --git a/images/viewer_toolbar/close.png b/images/viewer_toolbar/close.png
deleted file mode 100644
index 187eff20..00000000
Binary files a/images/viewer_toolbar/close.png and /dev/null differ
diff --git a/images/viewer_toolbar/close.svg b/images/viewer_toolbar/close.svg
new file mode 100644
index 00000000..60a87915
--- /dev/null
+++ b/images/viewer_toolbar/close.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.cls-1{fill:#404040;}</style></defs><polygon class="cls-1" points="13.86 3.26 11.74 1.14 7.5 5.38 3.26 1.14 1.14 3.26 5.38 7.5 1.14 11.74 3.26 13.86 7.5 9.62 11.74 13.86 13.86 11.74 9.62 7.5 13.86 3.26"/></svg>
\ No newline at end of file
diff --git a/images/viewer_toolbar/close_18x18.svg b/images/viewer_toolbar/close_18x18.svg
new file mode 100644
index 00000000..82fad405
--- /dev/null
+++ b/images/viewer_toolbar/close_18x18.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 18 18"><defs><style>.cls-1{fill:#404040;}</style></defs><polygon class="cls-1" points="14.86 4.26 12.74 2.14 8.5 6.38 4.26 2.14 2.14 4.26 6.38 8.5 2.14 12.74 4.26 14.86 8.5 10.62 12.74 14.86 14.86 12.74 10.62 8.5 14.86 4.26"/></svg>
\ No newline at end of file
diff --git a/images/viewer_toolbar/doubleMangaPage.png b/images/viewer_toolbar/doubleMangaPage.png
deleted file mode 100644
index a280ebdc..00000000
Binary files a/images/viewer_toolbar/doubleMangaPage.png and /dev/null differ
diff --git a/images/viewer_toolbar/doubleMangaPage.svg b/images/viewer_toolbar/doubleMangaPage.svg
new file mode 100644
index 00000000..58493cf4
--- /dev/null
+++ b/images/viewer_toolbar/doubleMangaPage.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.cls-1{fill:#404040;}</style></defs><path class="cls-1" d="M13,1h-5V7h5v2h-5v6h5c1.1,0,2-.9,2-2V3c0-1.1-.9-2-2-2Z"/><path class="cls-1" d="M7,7V1H2C.9,1,0,1.9,0,3V13c0,1.1,.9,2,2,2H7v-6h-2v2l-3-3,3-3v2h2Z"/></svg>
\ No newline at end of file
diff --git a/images/viewer_toolbar/doubleMangaPage_18x18.svg b/images/viewer_toolbar/doubleMangaPage_18x18.svg
new file mode 100644
index 00000000..781526a3
--- /dev/null
+++ b/images/viewer_toolbar/doubleMangaPage_18x18.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 18 18"><defs><style>.cls-1{fill:#404040;}</style></defs><path class="cls-1" d="M14,2h-5v6h5v2h-5v6h5c1.1,0,2-.9,2-2V4c0-1.1-.9-2-2-2Z"/><path class="cls-1" d="M8,8V2H3c-1.1,0-2,.9-2,2V14c0,1.1,.9,2,2,2h5v-6h-2v2l-3-3,3-3v2h2Z"/></svg>
\ No newline at end of file
diff --git a/images/viewer_toolbar/doublePage.png b/images/viewer_toolbar/doublePage.png
deleted file mode 100644
index 67344d3b..00000000
Binary files a/images/viewer_toolbar/doublePage.png and /dev/null differ
diff --git a/images/viewer_toolbar/doublePage.svg b/images/viewer_toolbar/doublePage.svg
new file mode 100644
index 00000000..c12f5d4d
--- /dev/null
+++ b/images/viewer_toolbar/doublePage.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.cls-1{fill:#404040;}</style></defs><path class="cls-1" d="M2,1C.9,1,0,1.9,0,3V13c0,1.1,.9,2,2,2H7V1H2Z"/><path class="cls-1" d="M13,1h-5V15h5c1.1,0,2-.9,2-2V3c0-1.1-.9-2-2-2Z"/></svg>
\ No newline at end of file
diff --git a/images/viewer_toolbar/doublePage_18x18.svg b/images/viewer_toolbar/doublePage_18x18.svg
new file mode 100644
index 00000000..c5c60e39
--- /dev/null
+++ b/images/viewer_toolbar/doublePage_18x18.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 18 18"><defs><style>.cls-1{fill:#404040;}</style></defs><path class="cls-1" d="M3,2c-1.1,0-2,.9-2,2V14c0,1.1,.9,2,2,2h5V2H3Z"/><path class="cls-1" d="M14,2h-5v14h5c1.1,0,2-.9,2-2V4c0-1.1-.9-2-2-2Z"/></svg>
\ No newline at end of file
diff --git a/images/viewer_toolbar/fitToPage.png b/images/viewer_toolbar/fitToPage.png
deleted file mode 100644
index 7a3f8d78..00000000
Binary files a/images/viewer_toolbar/fitToPage.png and /dev/null differ
diff --git a/images/viewer_toolbar/fitToPage.svg b/images/viewer_toolbar/fitToPage.svg
new file mode 100644
index 00000000..28b1675a
--- /dev/null
+++ b/images/viewer_toolbar/fitToPage.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.cls-1{fill:#404040;}</style></defs><polygon class="cls-1" points="9 3 9 1 7 1 7 3 5 3 8 6 11 3 9 3"/><polygon class="cls-1" points="7 13 7 15 9 15 9 13 11 13 8 10 5 13 7 13"/><polygon class="cls-1" points="13 9 15 9 15 7 13 7 13 5 10 8 13 11 13 9"/><polygon class="cls-1" points="3 7 1 7 1 9 3 9 3 11 6 8 3 5 3 7"/></svg>
\ No newline at end of file
diff --git a/images/viewer_toolbar/fitToPage_18x18.svg b/images/viewer_toolbar/fitToPage_18x18.svg
new file mode 100644
index 00000000..390220d9
--- /dev/null
+++ b/images/viewer_toolbar/fitToPage_18x18.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 18 18"><defs><style>.cls-1{fill:#404040;}</style></defs><polygon class="cls-1" points="10 4 10 2 8 2 8 4 6 4 9 7 12 4 10 4"/><polygon class="cls-1" points="8 14 8 16 10 16 10 14 12 14 9 11 6 14 8 14"/><polygon class="cls-1" points="14 10 16 10 16 8 14 8 14 6 11 9 14 12 14 10"/><polygon class="cls-1" points="4 8 2 8 2 10 4 10 4 12 7 9 4 6 4 8"/></svg>
\ No newline at end of file
diff --git a/images/viewer_toolbar/flow.png b/images/viewer_toolbar/flow.png
deleted file mode 100644
index 6f8cf403..00000000
Binary files a/images/viewer_toolbar/flow.png and /dev/null differ
diff --git a/images/viewer_toolbar/flow.svg b/images/viewer_toolbar/flow.svg
new file mode 100644
index 00000000..779f27d7
--- /dev/null
+++ b/images/viewer_toolbar/flow.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.cls-1{fill:#404040;}</style></defs><rect class="cls-1" x="4" y="2" width="8" height="12"/><rect class="cls-1" x="13" y="2" width="1" height="12"/><rect class="cls-1" x="15" y="1" width="1" height="14"/><rect class="cls-1" x="2" y="2" width="1" height="12"/><rect class="cls-1" y="1" width="1" height="14"/></svg>
\ No newline at end of file
diff --git a/images/viewer_toolbar/flow_18x18.svg b/images/viewer_toolbar/flow_18x18.svg
new file mode 100644
index 00000000..20c060d1
--- /dev/null
+++ b/images/viewer_toolbar/flow_18x18.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 18 18"><defs><style>.cls-1{fill:#404040;}</style></defs><rect class="cls-1" x="5" y="3" width="8" height="12"/><rect class="cls-1" x="14" y="3" width="1" height="12"/><rect class="cls-1" x="16" y="2" width="1" height="14"/><rect class="cls-1" x="3" y="3" width="1" height="12"/><rect class="cls-1" x="1" y="2" width="1" height="14"/></svg>
\ No newline at end of file
diff --git a/images/viewer_toolbar/full.png b/images/viewer_toolbar/full.png
deleted file mode 100644
index 34d6dfe0..00000000
Binary files a/images/viewer_toolbar/full.png and /dev/null differ
diff --git a/images/viewer_toolbar/full.svg b/images/viewer_toolbar/full.svg
new file mode 100644
index 00000000..10ffa55a
--- /dev/null
+++ b/images/viewer_toolbar/full.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.cls-1{fill:#404040;}</style></defs><polygon class="cls-1" points="14 14 14 9 12 11 9 8 12 5 14 7 14 2 9 2 11 4 8 7 5 4 7 2 2 2 2 7 4 5 7 8 4 11 2 9 2 14 7 14 5 12 8 9 11 12 9 14 14 14"/></svg>
\ No newline at end of file
diff --git a/images/viewer_toolbar/full_18x18.svg b/images/viewer_toolbar/full_18x18.svg
new file mode 100644
index 00000000..2a264091
--- /dev/null
+++ b/images/viewer_toolbar/full_18x18.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 18 18"><defs><style>.cls-1{fill:#404040;}</style></defs><polygon class="cls-1" points="15 15 15 10 13 12 10 9 13 6 15 8 15 3 10 3 12 5 9 8 6 5 8 3 3 3 3 8 5 6 8 9 5 12 3 10 3 15 8 15 6 13 9 10 12 13 10 15 15 15"/></svg>
\ No newline at end of file
diff --git a/images/viewer_toolbar/goto.png b/images/viewer_toolbar/goto.png
deleted file mode 100644
index e451b1b0..00000000
Binary files a/images/viewer_toolbar/goto.png and /dev/null differ
diff --git a/images/viewer_toolbar/goto.svg b/images/viewer_toolbar/goto.svg
new file mode 100644
index 00000000..e2b346ab
--- /dev/null
+++ b/images/viewer_toolbar/goto.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.cls-1{fill:#404040;}</style></defs><path class="cls-1" d="M7,10h1s0,4,0,4l8-6L8,2V6s-2,0-2,0v.22c-.31-.06-.64-.13-1-.22C1,5,0,3,0,3c1,7,7,7,7,7Z"/></svg>
\ No newline at end of file
diff --git a/images/viewer_toolbar/goto_18x18.svg b/images/viewer_toolbar/goto_18x18.svg
new file mode 100644
index 00000000..1005c9d6
--- /dev/null
+++ b/images/viewer_toolbar/goto_18x18.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 18 18"><defs><style>.cls-1{fill:#404040;}</style></defs><path class="cls-1" d="M8,11h1s0,4,0,4l8-6L9,3V7s-2,0-2,0v.22c-.31-.06-.64-.13-1-.22C2,6,1,4,1,4c1,7,7,7,7,7Z"/></svg>
\ No newline at end of file
diff --git a/images/viewer_toolbar/help.png b/images/viewer_toolbar/help.png
deleted file mode 100644
index a3ae397d..00000000
Binary files a/images/viewer_toolbar/help.png and /dev/null differ
diff --git a/images/viewer_toolbar/help.svg b/images/viewer_toolbar/help.svg
new file mode 100644
index 00000000..1a318207
--- /dev/null
+++ b/images/viewer_toolbar/help.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.cls-1{fill:#404040;}</style></defs><path class="cls-1" d="M6.07,10.74l-.02-.6c-.07-1.17,.32-2.37,1.36-3.61,.74-.87,1.33-1.61,1.33-2.39s-.53-1.33-1.68-1.38c-.76,0-1.68,.28-2.28,.69l-.78-2.51c.83-.48,2.21-.94,3.84-.94,3.03,0,4.41,1.68,4.41,3.59,0,1.75-1.08,2.9-1.95,3.86-.85,.94-1.2,1.84-1.17,2.87v.41h-3.06Zm-.6,3.17c0-1.22,.85-2.09,2.05-2.09s2.05,.87,2.07,2.09c0,1.2-.83,2.09-2.07,2.09s-2.05-.9-2.05-2.09Z"/></svg>
\ No newline at end of file
diff --git a/images/viewer_toolbar/help_18x18.svg b/images/viewer_toolbar/help_18x18.svg
new file mode 100644
index 00000000..a665d883
--- /dev/null
+++ b/images/viewer_toolbar/help_18x18.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 18 18"><defs><style>.cls-1{fill:#404040;}</style></defs><path class="cls-1" d="M3.07,11.74l-.02-.6c-.07-1.17,.32-2.37,1.36-3.61,.74-.87,1.33-1.61,1.33-2.39s-.53-1.33-1.68-1.38c-.76,0-1.68,.28-2.28,.69L1,1.94c.83-.48,2.21-.94,3.84-.94,3.03,0,4.41,1.68,4.41,3.59,0,1.75-1.08,2.9-1.95,3.86-.85,.94-1.2,1.84-1.17,2.87v.41H3.07Zm-.6,3.17c0-1.22,.85-2.09,2.05-2.09s2.05,.87,2.07,2.09c0,1.2-.83,2.09-2.07,2.09s-2.05-.9-2.05-2.09Z"/></svg>
\ No newline at end of file
diff --git a/images/viewer_toolbar/info.png b/images/viewer_toolbar/info.png
deleted file mode 100644
index 0a97b1cf..00000000
Binary files a/images/viewer_toolbar/info.png and /dev/null differ
diff --git a/images/viewer_toolbar/info.svg b/images/viewer_toolbar/info.svg
new file mode 100644
index 00000000..a2ea1725
--- /dev/null
+++ b/images/viewer_toolbar/info.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.cls-1{fill:#404040;}</style></defs><path class="cls-1" d="M5.27,14.99l1.95-10.27h3.02l-1.95,10.27h-3.02ZM9.09,3.45c-.84,0-1.45-.59-1.45-1.47,0-1.03,.82-1.72,1.74-1.72s1.53,.59,1.53,1.49c0,1.07-.82,1.7-1.78,1.7h-.04Z"/></svg>
\ No newline at end of file
diff --git a/images/viewer_toolbar/info_18x18.svg b/images/viewer_toolbar/info_18x18.svg
new file mode 100644
index 00000000..013a91ea
--- /dev/null
+++ b/images/viewer_toolbar/info_18x18.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 18 18"><defs><style>.cls-1{fill:#404040;}</style></defs><path class="cls-1" d="M3,16.45l1.95-10.27h3.02l-1.95,10.27H3ZM6.82,4.9c-.84,0-1.45-.59-1.45-1.47,0-1.03,.82-1.72,1.74-1.72s1.53,.59,1.53,1.49c0,1.07-.82,1.7-1.78,1.7h-.04Z"/></svg>
\ No newline at end of file
diff --git a/images/viewer_toolbar/magnifyingGlass.png b/images/viewer_toolbar/magnifyingGlass.png
deleted file mode 100644
index 18afa28b..00000000
Binary files a/images/viewer_toolbar/magnifyingGlass.png and /dev/null differ
diff --git a/images/viewer_toolbar/magnifyingGlass.svg b/images/viewer_toolbar/magnifyingGlass.svg
new file mode 100644
index 00000000..06d16b1f
--- /dev/null
+++ b/images/viewer_toolbar/magnifyingGlass.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.cls-1{fill:#404040;}</style></defs><path class="cls-1" d="M8.9,10.18l-.12,.08c-.91,.62-1.98,.95-3.09,.95C2.65,11.2,.18,8.73,.18,5.69S2.65,.18,5.69,.18s5.51,2.47,5.51,5.51c0,.94-.24,1.87-.7,2.69l-.07,.12,5.31,5.31-1.61,1.61-5.24-5.24ZM5.69,1.79c-2.15,0-3.9,1.75-3.9,3.9s1.75,3.9,3.9,3.9,3.9-1.75,3.9-3.9-1.75-3.9-3.9-3.9Z"/></svg>
\ No newline at end of file
diff --git a/images/viewer_toolbar/magnifyingGlass_18x18.svg b/images/viewer_toolbar/magnifyingGlass_18x18.svg
new file mode 100644
index 00000000..37610af8
--- /dev/null
+++ b/images/viewer_toolbar/magnifyingGlass_18x18.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 18 18"><defs><style>.cls-1{fill:#404040;}</style></defs><path class="cls-1" d="M9.9,11.18l-.12,.08c-.91,.62-1.98,.95-3.09,.95-3.04,0-5.51-2.47-5.51-5.51S3.65,1.18,6.69,1.18s5.51,2.47,5.51,5.51c0,.94-.24,1.87-.7,2.69l-.07,.12,5.31,5.31-1.61,1.61-5.24-5.24ZM6.69,2.79c-2.15,0-3.9,1.75-3.9,3.9s1.75,3.9,3.9,3.9,3.9-1.75,3.9-3.9-1.75-3.9-3.9-3.9Z"/></svg>
\ No newline at end of file
diff --git a/images/viewer_toolbar/next.png b/images/viewer_toolbar/next.png
deleted file mode 100644
index 233507cc..00000000
Binary files a/images/viewer_toolbar/next.png and /dev/null differ
diff --git a/images/viewer_toolbar/next.svg b/images/viewer_toolbar/next.svg
new file mode 100644
index 00000000..67d8de34
--- /dev/null
+++ b/images/viewer_toolbar/next.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.cls-1{fill:#404040;}</style></defs><polygon class="cls-1" points="4 2 4 8 4 14 13 8 4 2"/></svg>
\ No newline at end of file
diff --git a/images/viewer_toolbar/next_18x18.svg b/images/viewer_toolbar/next_18x18.svg
new file mode 100644
index 00000000..76993a67
--- /dev/null
+++ b/images/viewer_toolbar/next_18x18.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 18 18"><defs><style>.cls-1{fill:#404040;}</style></defs><polygon class="cls-1" points="5 3 5 9 5 15 14 9 5 3"/></svg>
\ No newline at end of file
diff --git a/images/viewer_toolbar/open.png b/images/viewer_toolbar/open.png
deleted file mode 100644
index 0cd51686..00000000
Binary files a/images/viewer_toolbar/open.png and /dev/null differ
diff --git a/images/viewer_toolbar/open.svg b/images/viewer_toolbar/open.svg
new file mode 100644
index 00000000..66cc3bd6
--- /dev/null
+++ b/images/viewer_toolbar/open.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.cls-1{fill:#404040;}</style></defs><path class="cls-1" d="M15.8,7.14c0-3.28-3.5-5.94-7.8-5.94S.2,3.86,.2,7.14c0,2.46,1.97,4.58,4.78,5.48,.2,.78,.55,1.12-2.55,3.19,0,0,4.95,0,6.19-2.48l.29-.29c3.87-.34,6.89-2.85,6.89-5.9Z"/></svg>
\ No newline at end of file
diff --git a/images/viewer_toolbar/openFolder.png b/images/viewer_toolbar/openFolder.png
deleted file mode 100644
index fd40f6bd..00000000
Binary files a/images/viewer_toolbar/openFolder.png and /dev/null differ
diff --git a/images/viewer_toolbar/openFolder.svg b/images/viewer_toolbar/openFolder.svg
new file mode 100644
index 00000000..9ebf9036
--- /dev/null
+++ b/images/viewer_toolbar/openFolder.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.cls-1{fill:#404040;}</style></defs><path class="cls-1" d="M1,5H0V14c0,.55,.45,1,1,1H15c.55,0,1-.45,1-1V5H1Z"/><path class="cls-1" d="M15,2H5c0-.55-.45-1-1-1H1c-.55,0-1,.45-1,1v2H16v-1c0-.55-.45-1-1-1Z"/></svg>
\ No newline at end of file
diff --git a/images/viewer_toolbar/openFolder_18x18.svg b/images/viewer_toolbar/openFolder_18x18.svg
new file mode 100644
index 00000000..dc6a2221
--- /dev/null
+++ b/images/viewer_toolbar/openFolder_18x18.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 18 18"><defs><style>.cls-1{fill:#404040;}</style></defs><path class="cls-1" d="M2,6H1V15c0,.55,.45,1,1,1h14c.55,0,1-.45,1-1V6H2Z"/><path class="cls-1" d="M16,3H6c0-.55-.45-1-1-1H2c-.55,0-1,.45-1,1v2H17v-1c0-.55-.45-1-1-1Z"/></svg>
\ No newline at end of file
diff --git a/images/viewer_toolbar/openNext.png b/images/viewer_toolbar/openNext.png
deleted file mode 100644
index 4d65863e..00000000
Binary files a/images/viewer_toolbar/openNext.png and /dev/null differ
diff --git a/images/viewer_toolbar/openNext.svg b/images/viewer_toolbar/openNext.svg
new file mode 100644
index 00000000..b35a8a55
--- /dev/null
+++ b/images/viewer_toolbar/openNext.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.cls-1{fill:#404040;}</style></defs><polygon class="cls-1" points="0 2 0 8 0 14 9 8 0 2"/><polygon class="cls-1" points="11.5 8 7 11 7 14 16 8 7 2 7 5 11.5 8"/></svg>
\ No newline at end of file
diff --git a/images/viewer_toolbar/openNext_18x18.svg b/images/viewer_toolbar/openNext_18x18.svg
new file mode 100644
index 00000000..a3e827bf
--- /dev/null
+++ b/images/viewer_toolbar/openNext_18x18.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 18 18"><defs><style>.cls-1{fill:#404040;}</style></defs><polygon class="cls-1" points="1 3 1 9 1 15 10 9 1 3"/><polygon class="cls-1" points="12.5 9 8 12 8 15 17 9 8 3 8 6 12.5 9"/></svg>
\ No newline at end of file
diff --git a/images/viewer_toolbar/openPrevious.png b/images/viewer_toolbar/openPrevious.png
deleted file mode 100644
index 53c703f3..00000000
Binary files a/images/viewer_toolbar/openPrevious.png and /dev/null differ
diff --git a/images/viewer_toolbar/openPrevious.svg b/images/viewer_toolbar/openPrevious.svg
new file mode 100644
index 00000000..cc1a77e6
--- /dev/null
+++ b/images/viewer_toolbar/openPrevious.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.cls-1{fill:#404040;}</style></defs><polygon class="cls-1" points="16 14 16 8 16 2 7 8 16 14"/><polygon class="cls-1" points="4.5 8 9 5 9 2 0 8 9 14 9 11 4.5 8"/></svg>
\ No newline at end of file
diff --git a/images/viewer_toolbar/openPrevious_18x18.svg b/images/viewer_toolbar/openPrevious_18x18.svg
new file mode 100644
index 00000000..d6fe899b
--- /dev/null
+++ b/images/viewer_toolbar/openPrevious_18x18.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 18 18"><defs><style>.cls-1{fill:#404040;}</style></defs><polygon class="cls-1" points="17 15 17 9 17 3 8 9 17 15"/><polygon class="cls-1" points="5.5 9 10 6 10 3 1 9 10 15 10 12 5.5 9"/></svg>
\ No newline at end of file
diff --git a/images/viewer_toolbar/open_18x18.svg b/images/viewer_toolbar/open_18x18.svg
new file mode 100644
index 00000000..91c4d420
--- /dev/null
+++ b/images/viewer_toolbar/open_18x18.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 18 18"><defs><style>.cls-1{fill:#404040;}</style></defs><path class="cls-1" d="M16.8,8.14c0-3.28-3.5-5.94-7.8-5.94S1.2,4.86,1.2,8.14c0,2.46,1.97,4.58,4.78,5.48,.2,.78,.55,1.12-2.55,3.19,0,0,4.95,0,6.19-2.48l.29-.29c3.87-.34,6.89-2.85,6.89-5.9Z"/></svg>
\ No newline at end of file
diff --git a/images/viewer_toolbar/options.png b/images/viewer_toolbar/options.png
deleted file mode 100644
index 2eda3a5f..00000000
Binary files a/images/viewer_toolbar/options.png and /dev/null differ
diff --git a/images/viewer_toolbar/options.svg b/images/viewer_toolbar/options.svg
new file mode 100644
index 00000000..eb25e4de
--- /dev/null
+++ b/images/viewer_toolbar/options.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.cls-1{fill:#404040;}</style></defs><path class="cls-1" d="M15.27,9.33c.4,0,.73-.36,.73-.8v-1.07c0-.44-.33-.8-.73-.8s-.84-.34-.97-.76l-.36-.87c-.21-.39-.14-.94,.14-1.22s.27-.77-.05-1.09l-.75-.75c-.31-.31-.8-.33-1.09-.05s-.84,.35-1.22,.14l-.87-.36c-.42-.13-.76-.57-.76-.97s-.36-.73-.8-.73h-1.07c-.44,0-.8,.33-.8,.73s-.34,.84-.76,.97l-.87,.36c-.39,.21-.94,.14-1.22-.14s-.77-.27-1.09,.05l-.75,.75c-.31,.31-.33,.8-.05,1.09s.35,.84,.14,1.22l-.36,.87c-.13,.42-.57,.76-.97,.76s-.73,.36-.73,.8v1.07c0,.44,.33,.8,.73,.8s.84,.34,.97,.76l.36,.87c.21,.39,.14,.94-.14,1.22s-.27,.77,.05,1.09l.75,.75c.31,.31,.8,.33,1.09,.05s.84-.35,1.22-.14l.87,.36c.42,.13,.76,.57,.76,.97s.36,.73,.8,.73h1.07c.44,0,.8-.33,.8-.73s.34-.84,.76-.97l.87-.36c.39-.21,.94-.14,1.22,.14s.77,.27,1.09-.05l.75-.75c.31-.31,.33-.8,.05-1.09s-.35-.84-.14-1.22l.36-.87c.13-.42,.57-.76,.97-.76Zm-7.27,1.6c-1.62,0-2.93-1.32-2.93-2.93s1.31-2.93,2.93-2.93,2.93,1.32,2.93,2.93-1.31,2.93-2.93,2.93Z"/></svg>
\ No newline at end of file
diff --git a/images/viewer_toolbar/options_1.svg b/images/viewer_toolbar/options_1.svg
new file mode 100644
index 00000000..eb25e4de
--- /dev/null
+++ b/images/viewer_toolbar/options_1.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.cls-1{fill:#404040;}</style></defs><path class="cls-1" d="M15.27,9.33c.4,0,.73-.36,.73-.8v-1.07c0-.44-.33-.8-.73-.8s-.84-.34-.97-.76l-.36-.87c-.21-.39-.14-.94,.14-1.22s.27-.77-.05-1.09l-.75-.75c-.31-.31-.8-.33-1.09-.05s-.84,.35-1.22,.14l-.87-.36c-.42-.13-.76-.57-.76-.97s-.36-.73-.8-.73h-1.07c-.44,0-.8,.33-.8,.73s-.34,.84-.76,.97l-.87,.36c-.39,.21-.94,.14-1.22-.14s-.77-.27-1.09,.05l-.75,.75c-.31,.31-.33,.8-.05,1.09s.35,.84,.14,1.22l-.36,.87c-.13,.42-.57,.76-.97,.76s-.73,.36-.73,.8v1.07c0,.44,.33,.8,.73,.8s.84,.34,.97,.76l.36,.87c.21,.39,.14,.94-.14,1.22s-.27,.77,.05,1.09l.75,.75c.31,.31,.8,.33,1.09,.05s.84-.35,1.22-.14l.87,.36c.42,.13,.76,.57,.76,.97s.36,.73,.8,.73h1.07c.44,0,.8-.33,.8-.73s.34-.84,.76-.97l.87-.36c.39-.21,.94-.14,1.22,.14s.77,.27,1.09-.05l.75-.75c.31-.31,.33-.8,.05-1.09s-.35-.84-.14-1.22l.36-.87c.13-.42,.57-.76,.97-.76Zm-7.27,1.6c-1.62,0-2.93-1.32-2.93-2.93s1.31-2.93,2.93-2.93,2.93,1.32,2.93,2.93-1.31,2.93-2.93,2.93Z"/></svg>
\ No newline at end of file
diff --git a/images/viewer_toolbar/options_18x18.svg b/images/viewer_toolbar/options_18x18.svg
new file mode 100644
index 00000000..f11fb32c
--- /dev/null
+++ b/images/viewer_toolbar/options_18x18.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 18 18"><defs><style>.cls-1{fill:#404040;}</style></defs><path class="cls-1" d="M16.27,10.33c.4,0,.73-.36,.73-.8v-1.07c0-.44-.33-.8-.73-.8s-.84-.34-.97-.76l-.36-.87c-.21-.39-.14-.94,.14-1.22s.27-.77-.05-1.09l-.75-.75c-.31-.31-.8-.33-1.09-.05s-.84,.35-1.22,.14l-.87-.36c-.42-.13-.76-.57-.76-.97s-.36-.73-.8-.73h-1.07c-.44,0-.8,.33-.8,.73s-.34,.84-.76,.97l-.87,.36c-.39,.21-.94,.14-1.22-.14s-.77-.27-1.09,.05l-.75,.75c-.31,.31-.33,.8-.05,1.09s.35,.84,.14,1.22l-.36,.87c-.13,.42-.57,.76-.97,.76s-.73,.36-.73,.8v1.07c0,.44,.33,.8,.73,.8s.84,.34,.97,.76l.36,.87c.21,.39,.14,.94-.14,1.22s-.27,.77,.05,1.09l.75,.75c.31,.31,.8,.33,1.09,.05s.84-.35,1.22-.14l.87,.36c.42,.13,.76,.57,.76,.97s.36,.73,.8,.73h1.07c.44,0,.8-.33,.8-.73s.34-.84,.76-.97l.87-.36c.39-.21,.94-.14,1.22,.14s.77,.27,1.09-.05l.75-.75c.31-.31,.33-.8,.05-1.09s-.35-.84-.14-1.22l.36-.87c.13-.42,.57-.76,.97-.76Zm-7.27,1.6c-1.62,0-2.93-1.32-2.93-2.93s1.31-2.93,2.93-2.93,2.93,1.32,2.93,2.93-1.31,2.93-2.93,2.93Z"/></svg>
\ No newline at end of file
diff --git a/images/viewer_toolbar/options_18x18_1.svg b/images/viewer_toolbar/options_18x18_1.svg
new file mode 100644
index 00000000..f11fb32c
--- /dev/null
+++ b/images/viewer_toolbar/options_18x18_1.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 18 18"><defs><style>.cls-1{fill:#404040;}</style></defs><path class="cls-1" d="M16.27,10.33c.4,0,.73-.36,.73-.8v-1.07c0-.44-.33-.8-.73-.8s-.84-.34-.97-.76l-.36-.87c-.21-.39-.14-.94,.14-1.22s.27-.77-.05-1.09l-.75-.75c-.31-.31-.8-.33-1.09-.05s-.84,.35-1.22,.14l-.87-.36c-.42-.13-.76-.57-.76-.97s-.36-.73-.8-.73h-1.07c-.44,0-.8,.33-.8,.73s-.34,.84-.76,.97l-.87,.36c-.39,.21-.94,.14-1.22-.14s-.77-.27-1.09,.05l-.75,.75c-.31,.31-.33,.8-.05,1.09s.35,.84,.14,1.22l-.36,.87c-.13,.42-.57,.76-.97,.76s-.73,.36-.73,.8v1.07c0,.44,.33,.8,.73,.8s.84,.34,.97,.76l.36,.87c.21,.39,.14,.94-.14,1.22s-.27,.77,.05,1.09l.75,.75c.31,.31,.8,.33,1.09,.05s.84-.35,1.22-.14l.87,.36c.42,.13,.76,.57,.76,.97s.36,.73,.8,.73h1.07c.44,0,.8-.33,.8-.73s.34-.84,.76-.97l.87-.36c.39-.21,.94-.14,1.22,.14s.77,.27,1.09-.05l.75-.75c.31-.31,.33-.8,.05-1.09s-.35-.84-.14-1.22l.36-.87c.13-.42,.57-.76,.97-.76Zm-7.27,1.6c-1.62,0-2.93-1.32-2.93-2.93s1.31-2.93,2.93-2.93,2.93,1.32,2.93,2.93-1.31,2.93-2.93,2.93Z"/></svg>
\ No newline at end of file
diff --git a/images/viewer_toolbar/previous.png b/images/viewer_toolbar/previous.png
deleted file mode 100644
index b30acf76..00000000
Binary files a/images/viewer_toolbar/previous.png and /dev/null differ
diff --git a/images/viewer_toolbar/previous.svg b/images/viewer_toolbar/previous.svg
new file mode 100644
index 00000000..f672d5a9
--- /dev/null
+++ b/images/viewer_toolbar/previous.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.cls-1{fill:#404040;}</style></defs><polygon class="cls-1" points="12 14 12 8 12 2 3 8 12 14"/></svg>
\ No newline at end of file
diff --git a/images/viewer_toolbar/previous_18x18.svg b/images/viewer_toolbar/previous_18x18.svg
new file mode 100644
index 00000000..9b3b1ce1
--- /dev/null
+++ b/images/viewer_toolbar/previous_18x18.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 18 18"><defs><style>.cls-1{fill:#404040;}</style></defs><polygon class="cls-1" points="13 15 13 9 13 3 4 9 13 15"/></svg>
\ No newline at end of file
diff --git a/images/viewer_toolbar/rotateL.png b/images/viewer_toolbar/rotateL.png
deleted file mode 100644
index a696da3e..00000000
Binary files a/images/viewer_toolbar/rotateL.png and /dev/null differ
diff --git a/images/viewer_toolbar/rotateL.svg b/images/viewer_toolbar/rotateL.svg
new file mode 100644
index 00000000..bbba31fa
--- /dev/null
+++ b/images/viewer_toolbar/rotateL.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.cls-1{fill:#404040;}</style></defs><polygon class="cls-1" points="0 7 7 7 3.5 11 0 7"/><path class="cls-1" d="M9,14.9c-1.81,0-3.51-.69-4.81-1.95l1.98-1.98c.76,.73,1.76,1.13,2.83,1.13,2.26,0,4.1-1.84,4.1-4.1s-1.84-4.1-4.1-4.1-4.05,1.79-4.1,4H2.1c.05-3.76,3.13-6.8,6.9-6.8s6.9,3.1,6.9,6.9-3.1,6.9-6.9,6.9Z"/></svg>
\ No newline at end of file
diff --git a/images/viewer_toolbar/rotateL_18x18.svg b/images/viewer_toolbar/rotateL_18x18.svg
new file mode 100644
index 00000000..9a4bf748
--- /dev/null
+++ b/images/viewer_toolbar/rotateL_18x18.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 18 18"><defs><style>.cls-1{fill:#404040;}</style></defs><polygon class="cls-1" points="1 8 8 8 4.5 12 1 8"/><path class="cls-1" d="M10,15.9c-1.81,0-3.51-.69-4.81-1.95l1.98-1.98c.76,.73,1.76,1.13,2.83,1.13,2.26,0,4.1-1.84,4.1-4.1s-1.84-4.1-4.1-4.1-4.05,1.79-4.1,4H3.1c.05-3.76,3.13-6.8,6.9-6.8s6.9,3.1,6.9,6.9-3.1,6.9-6.9,6.9Z"/></svg>
\ No newline at end of file
diff --git a/images/viewer_toolbar/rotateR.png b/images/viewer_toolbar/rotateR.png
deleted file mode 100644
index 38d8620e..00000000
Binary files a/images/viewer_toolbar/rotateR.png and /dev/null differ
diff --git a/images/viewer_toolbar/rotateR.svg b/images/viewer_toolbar/rotateR.svg
new file mode 100644
index 00000000..2b24771e
--- /dev/null
+++ b/images/viewer_toolbar/rotateR.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.cls-1{fill:#404040;}</style></defs><polygon class="cls-1" points="16 7 9 7 12.5 11 16 7"/><path class="cls-1" d="M7,14.9C3.2,14.9,.1,11.8,.1,8S3.2,1.1,7,1.1s6.85,3.04,6.9,6.8h-2.8c-.05-2.22-1.87-4-4.1-4s-4.1,1.84-4.1,4.1,1.84,4.1,4.1,4.1c1.06,0,2.06-.4,2.83-1.13l1.98,1.98c-1.29,1.26-3,1.95-4.81,1.95Z"/></svg>
\ No newline at end of file
diff --git a/images/viewer_toolbar/rotateR_18x18.svg b/images/viewer_toolbar/rotateR_18x18.svg
new file mode 100644
index 00000000..8c7464a7
--- /dev/null
+++ b/images/viewer_toolbar/rotateR_18x18.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 18 18"><defs><style>.cls-1{fill:#404040;}</style></defs><polygon class="cls-1" points="17 8 10 8 13.5 12 17 8"/><path class="cls-1" d="M8,15.9c-3.8,0-6.9-3.1-6.9-6.9S4.2,2.1,8,2.1s6.85,3.04,6.9,6.8h-2.8c-.05-2.21-1.87-4-4.1-4s-4.1,1.84-4.1,4.1,1.84,4.1,4.1,4.1c1.06,0,2.06-.4,2.83-1.13l1.98,1.98c-1.29,1.26-3,1.95-4.81,1.95Z"/></svg>
\ No newline at end of file
diff --git a/images/viewer_toolbar/save.png b/images/viewer_toolbar/save.png
deleted file mode 100644
index b48e2946..00000000
Binary files a/images/viewer_toolbar/save.png and /dev/null differ
diff --git a/images/viewer_toolbar/save.svg b/images/viewer_toolbar/save.svg
new file mode 100644
index 00000000..fb24afb5
--- /dev/null
+++ b/images/viewer_toolbar/save.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.cls-1{fill:#404040;}</style></defs><path class="cls-1" d="M15,2H5c0-.55-.45-1-1-1H1c-.55,0-1,.45-1,1v2H16v-1c0-.55-.45-1-1-1Z"/><path class="cls-1" d="M1,5H0V14c0,.55,.45,1,1,1H7.5l-2.5-4h2V7h2v4h2l-2.5,4h6.5c.55,0,1-.45,1-1V5H1Z"/></svg>
\ No newline at end of file
diff --git a/images/viewer_toolbar/save_18x18.svg b/images/viewer_toolbar/save_18x18.svg
new file mode 100644
index 00000000..23b31224
--- /dev/null
+++ b/images/viewer_toolbar/save_18x18.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 18 18"><defs><style>.cls-1{fill:#404040;}</style></defs><path class="cls-1" d="M16,3H6c0-.55-.45-1-1-1H2c-.55,0-1,.45-1,1v2H17v-1c0-.55-.45-1-1-1Z"/><path class="cls-1" d="M2,6H1V15c0,.55,.45,1,1,1h6.5l-2.5-4h2v-4h2v4h2l-2.5,4h6.5c.55,0,1-.45,1-1V6H2Z"/></svg>
\ No newline at end of file
diff --git a/images/viewer_toolbar/shortcuts.png b/images/viewer_toolbar/shortcuts.png
deleted file mode 100644
index 43a88d5e..00000000
Binary files a/images/viewer_toolbar/shortcuts.png and /dev/null differ
diff --git a/images/viewer_toolbar/shortcuts.svg b/images/viewer_toolbar/shortcuts.svg
new file mode 100644
index 00000000..4b798fb0
--- /dev/null
+++ b/images/viewer_toolbar/shortcuts.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.cls-1{fill:#404040;}</style></defs><path class="cls-1" d="M14,0H2C.9,0,0,.9,0,2V14c0,1.1,.9,2,2,2H14c1.1,0,2-.9,2-2V2c0-1.1-.9-2-2-2Zm0,14H2V2H14V14Z"/><path class="cls-1" d="M7.46,9.9l-.95,2.1h-1.85L8.6,3.92h2.22l.95,8.08h-1.82l-.16-2.1h-2.33Zm2.25-1.32l-.17-1.74c-.02-.44-.07-1.09-.11-1.58h-.02c-.2,.49-.43,1.12-.65,1.58l-.8,1.74h1.75Z"/></svg>
\ No newline at end of file
diff --git a/images/viewer_toolbar/shortcuts_18x18.svg b/images/viewer_toolbar/shortcuts_18x18.svg
new file mode 100644
index 00000000..1036b886
--- /dev/null
+++ b/images/viewer_toolbar/shortcuts_18x18.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 18 18"><defs><style>.cls-1{fill:#404040;}</style></defs><path class="cls-1" d="M15,1H3C1.9,1,1,1.9,1,3V15c0,1.1,.9,2,2,2H15c1.1,0,2-.9,2-2V3c0-1.1-.9-2-2-2Zm0,14H3V3H15V15Z"/><path class="cls-1" d="M8.46,10.9l-.95,2.1h-1.85l3.93-8.08h2.22l.95,8.08h-1.82l-.16-2.1h-2.33Zm2.25-1.32l-.17-1.74c-.02-.44-.07-1.09-.11-1.58h-.02c-.2,.49-.43,1.12-.65,1.58l-.8,1.74h1.75Z"/></svg>
\ No newline at end of file
diff --git a/images/viewer_toolbar/showBookmarks.png b/images/viewer_toolbar/showBookmarks.png
deleted file mode 100644
index 5c3cbe36..00000000
Binary files a/images/viewer_toolbar/showBookmarks.png and /dev/null differ
diff --git a/images/viewer_toolbar/showBookmarks.svg b/images/viewer_toolbar/showBookmarks.svg
new file mode 100644
index 00000000..33a4f6e5
--- /dev/null
+++ b/images/viewer_toolbar/showBookmarks.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.cls-1{fill:#404040;}</style></defs><path class="cls-1" d="M1,1V15c0,.55,.45,1,1,1h1V0h-1c-.55,0-1,.45-1,1Z"/><path class="cls-1" d="M14,0h-2V7l-1.5-2-1.5,2V0H4V16H14c.55,0,1-.45,1-1V1c0-.55-.45-1-1-1Z"/></svg>
\ No newline at end of file
diff --git a/images/viewer_toolbar/showBookmarks_18x18.svg b/images/viewer_toolbar/showBookmarks_18x18.svg
new file mode 100644
index 00000000..1a94eba9
--- /dev/null
+++ b/images/viewer_toolbar/showBookmarks_18x18.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 18 18"><defs><style>.cls-1{fill:#404040;}</style></defs><path class="cls-1" d="M2,2v14c0,.55,.45,1,1,1h1V1h-1c-.55,0-1,.45-1,1Z"/><path class="cls-1" d="M15,1h-2v7l-1.5-2-1.5,2V1H5V17H15c.55,0,1-.45,1-1V2c0-.55-.45-1-1-1Z"/></svg>
\ No newline at end of file
diff --git a/images/viewer_toolbar/toHeight.png b/images/viewer_toolbar/toHeight.png
deleted file mode 100644
index 82d0121b..00000000
Binary files a/images/viewer_toolbar/toHeight.png and /dev/null differ
diff --git a/images/viewer_toolbar/toHeight.svg b/images/viewer_toolbar/toHeight.svg
new file mode 100644
index 00000000..4f63694e
--- /dev/null
+++ b/images/viewer_toolbar/toHeight.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.cls-1{fill:#404040;}</style></defs><polygon class="cls-1" points="9 4 11 4 8 0 5 4 7 4 7 12 5 12 8 16 11 12 9 12 9 4"/></svg>
\ No newline at end of file
diff --git a/images/viewer_toolbar/toHeight_18x18.svg b/images/viewer_toolbar/toHeight_18x18.svg
new file mode 100644
index 00000000..6c9729bb
--- /dev/null
+++ b/images/viewer_toolbar/toHeight_18x18.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 18 18"><defs><style>.cls-1{fill:#404040;}</style></defs><polygon class="cls-1" points="10 5 12 5 9 1 6 5 8 5 8 13 6 13 9 17 12 13 10 13 10 5"/></svg>
\ No newline at end of file
diff --git a/images/viewer_toolbar/toWidth.png b/images/viewer_toolbar/toWidth.png
deleted file mode 100644
index 819c5811..00000000
Binary files a/images/viewer_toolbar/toWidth.png and /dev/null differ
diff --git a/images/viewer_toolbar/toWidth.svg b/images/viewer_toolbar/toWidth.svg
new file mode 100644
index 00000000..62a6c846
--- /dev/null
+++ b/images/viewer_toolbar/toWidth.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.cls-1{fill:#404040;}</style></defs><polygon class="cls-1" points="12 9 12 11 16 8 12 5 12 7 4 7 4 5 0 8 4 11 4 9 12 9"/></svg>
\ No newline at end of file
diff --git a/images/viewer_toolbar/toWidth_18x18.svg b/images/viewer_toolbar/toWidth_18x18.svg
new file mode 100644
index 00000000..f796a3da
--- /dev/null
+++ b/images/viewer_toolbar/toWidth_18x18.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 18 18"><defs><style>.cls-1{fill:#404040;}</style></defs><polygon class="cls-1" points="13 10 13 12 17 9 13 6 13 8 5 8 5 6 1 9 5 12 5 10 13 10"/></svg>
\ No newline at end of file
diff --git a/images/viewer_toolbar/translator.png b/images/viewer_toolbar/translator.png
deleted file mode 100644
index 05026239..00000000
Binary files a/images/viewer_toolbar/translator.png and /dev/null differ
diff --git a/images/viewer_toolbar/translator.svg b/images/viewer_toolbar/translator.svg
new file mode 100644
index 00000000..6ff468e2
--- /dev/null
+++ b/images/viewer_toolbar/translator.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.cls-1{fill:#404040;}</style></defs><path class="cls-1" d="M1,1V15c0,.55,.45,1,1,1h1V0h-1c-.55,0-1,.45-1,1Z"/><g><path class="cls-1" d="M9.18,5h-.02c-.1,1-.2,1.05-.31,1.43l-.4,1.57h1.49l-.42-1.57c-.12-.4-.24-.43-.34-1.43Z"/><path class="cls-1" d="M14,0H4V16H14c.55,0,1-.45,1-1V1c0-.55-.45-1-1-1Zm-3.32,11l-.52-2h-1.93l-.48,2h-1.58l2.06-7h2l2.09,7h-1.64Z"/></g></svg>
\ No newline at end of file
diff --git a/images/viewer_toolbar/translator_18x18.svg b/images/viewer_toolbar/translator_18x18.svg
new file mode 100644
index 00000000..d78e2260
--- /dev/null
+++ b/images/viewer_toolbar/translator_18x18.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 18 18"><defs><style>.cls-1{fill:#404040;}</style></defs><path class="cls-1" d="M2,2v14c0,.55,.45,1,1,1h1V1h-1c-.55,0-1,.45-1,1Z"/><g><path class="cls-1" d="M10.18,6h-.02c-.1,1-.2,1.05-.31,1.43l-.4,1.57h1.49l-.42-1.57c-.12-.4-.24-.43-.34-1.43Z"/><path class="cls-1" d="M15,1H5V17H15c.55,0,1-.45,1-1V2c0-.55-.45-1-1-1Zm-3.32,11l-.52-2h-1.93l-.48,2h-1.58l2.06-7h2l2.09,7h-1.64Z"/></g></svg>
\ No newline at end of file
diff --git a/images/viewer_toolbar/zoom.png b/images/viewer_toolbar/zoom.png
deleted file mode 100644
index 912dfebd..00000000
Binary files a/images/viewer_toolbar/zoom.png and /dev/null differ
diff --git a/images/viewer_toolbar/zoom.svg b/images/viewer_toolbar/zoom.svg
new file mode 100644
index 00000000..5f085603
--- /dev/null
+++ b/images/viewer_toolbar/zoom.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.cls-1{fill:#424242;}</style></defs><rect class="cls-1" x="4" y="12" width="8" height="2"/><polygon class="cls-1" points="12 5 9 5 9 2 7 2 7 5 4 5 4 7 7 7 7 10 9 10 9 7 12 7 12 5"/></svg>
\ No newline at end of file
diff --git a/images/viewer_toolbar/zoom_18x18.svg b/images/viewer_toolbar/zoom_18x18.svg
new file mode 100644
index 00000000..270470fa
--- /dev/null
+++ b/images/viewer_toolbar/zoom_18x18.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 18 18"><defs><style>.cls-1{fill:#424242;}</style></defs><rect class="cls-1" x="5" y="13" width="8" height="2"/><polygon class="cls-1" points="13 6 10 6 10 3 8 3 8 6 5 6 5 8 8 8 8 11 10 11 10 8 13 8 13 6"/></svg>
\ No newline at end of file
diff --git a/shortcuts_management/edit_shortcut_item_delegate.cpp b/shortcuts_management/edit_shortcut_item_delegate.cpp
index 3cc84abc..ca93e88d 100644
--- a/shortcuts_management/edit_shortcut_item_delegate.cpp
+++ b/shortcuts_management/edit_shortcut_item_delegate.cpp
@@ -59,20 +59,17 @@ KeySequenceLineEdit::KeySequenceLineEdit(QWidget *parent)
     // keys[0] = keys[1] = keys[2] = keys[3] = 0;
     setAlignment(Qt::AlignRight);
 
-    QPixmap clearPixmap(":/images/clear_shortcut.png");
-    QPixmap acceptPixmap(":/images/accept_shortcut.png");
-
     clearButton = new QToolButton(this);
     acceptButton = new QToolButton(this);
     QString buttonsStyle = "QToolButton { border: none; padding: 0px; }";
 
-    clearButton->setIcon(QIcon(clearPixmap));
-    clearButton->setIconSize(clearPixmap.size());
+    clearButton->setIcon(QIcon(":/images/clear_shortcut.svg"));
+    clearButton->setIconSize(QSize(15, 15));
     clearButton->setCursor(Qt::ArrowCursor);
     clearButton->setStyleSheet(buttonsStyle);
 
-    acceptButton->setIcon(QIcon(acceptPixmap));
-    acceptButton->setIconSize(acceptPixmap.size());
+    acceptButton->setIcon(QIcon(":/images/accept_shortcut.svg"));
+    acceptButton->setIconSize(QSize(15, 15));
     acceptButton->setCursor(Qt::ArrowCursor);
     acceptButton->setStyleSheet(buttonsStyle);