diff --git a/app/actionmanager.cpp b/app/actionmanager.cpp
index f8b44ff..507a7c7 100644
--- a/app/actionmanager.cpp
+++ b/app/actionmanager.cpp
@@ -48,25 +48,25 @@ void ActionManager::setupAction(MainWindow *mainWindow)
     };
     #define CREATE_NEW_ICON_ACTION(w, a, i) create_action(w, &a, ICON_NAME(i), ACTION_NAME(a))
     CREATE_NEW_ICON_ACTION(mainWindow, actionActualSize, zoom-original);
-    CREATE_NEW_ICON_ACTION(mainWindow, actionToggleMaximize, view-fullscreen);
+    CREATE_NEW_ICON_ACTION(mainWindow, actionFitInView, fit-in-view);
+    CREATE_NEW_ICON_ACTION(mainWindow, actionHorizontalFlip, horizontal-flip);
     CREATE_NEW_ICON_ACTION(mainWindow, actionZoomIn, zoom-in);
     CREATE_NEW_ICON_ACTION(mainWindow, actionZoomOut, zoom-out);
     CREATE_NEW_ICON_ACTION(mainWindow, actionToggleCheckerboard, view-background-checkerboard);
     CREATE_NEW_ICON_ACTION(mainWindow, actionRotateClockwise, object-rotate-right);
+    CREATE_NEW_ICON_ACTION(mainWindow, actionRotateCounterClockwise, object-rotate-left);
+    CREATE_NEW_ICON_ACTION(mainWindow, actionPrevPicture, go-previous);
+    CREATE_NEW_ICON_ACTION(mainWindow, actionNextPicture, go-next);
     #undef CREATE_NEW_ICON_ACTION
 
     #define CREATE_NEW_ACTION(w, a) create_action(w, &a, QString(), ACTION_NAME(a))
     #define CREATE_NEW_THEMEICON_ACTION(w, a, i) create_action(w, &a, QLatin1String(STRIFY(i)), ACTION_NAME(a), true)
-    CREATE_NEW_ACTION(mainWindow, actionRotateCounterClockwise);
-    CREATE_NEW_ACTION(mainWindow, actionPrevPicture);
-    CREATE_NEW_ACTION(mainWindow, actionNextPicture);
+    CREATE_NEW_ACTION(mainWindow, actionToggleMaximize);
 
     CREATE_NEW_ACTION(mainWindow, actionTogglePauseAnimation);
     CREATE_NEW_ACTION(mainWindow, actionAnimationNextFrame);
 
     CREATE_NEW_THEMEICON_ACTION(mainWindow, actionOpen, document-open);
-    CREATE_NEW_ACTION(mainWindow, actionHorizontalFlip);
-    CREATE_NEW_ACTION(mainWindow, actionFitInView);
     CREATE_NEW_ACTION(mainWindow, actionFitByWidth);
     CREATE_NEW_THEMEICON_ACTION(mainWindow, actionCopyPixmap, edit-copy);
     CREATE_NEW_ACTION(mainWindow, actionCopyFilePath);
@@ -161,3 +161,8 @@ void ActionManager::setupShortcuts()
     });
 }
 
+void ActionManager::setPrevNextPictureActionEnabled(bool enabled)
+{
+    actionPrevPicture->setEnabled(enabled);
+    actionNextPicture->setEnabled(enabled);
+}
diff --git a/app/actionmanager.h b/app/actionmanager.h
index 314b107..0a50171 100644
--- a/app/actionmanager.h
+++ b/app/actionmanager.h
@@ -18,6 +18,7 @@ public:
     void setupAction(MainWindow * mainWindow);
     void retranslateUi(MainWindow *MainWindow);
     void setupShortcuts();
+    void setPrevNextPictureActionEnabled(bool enabled);
 
     static QIcon loadHidpiIcon(const QString &resp, QSize sz = QSize(32, 32));
 
diff --git a/app/bottombuttongroup.cpp b/app/bottombuttongroup.cpp
index 8d0234d..56549f6 100644
--- a/app/bottombuttongroup.cpp
+++ b/app/bottombuttongroup.cpp
@@ -21,11 +21,7 @@ BottomButtonGroup::BottomButtonGroup(const std::vector<QAction *> &actionList, Q
     this->setLayout(mainLayout);
     this->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
     this->setStyleSheet("BottomButtonGroup {"
-                        "border: 1px solid gray;"
-                        "border-top-left-radius: 10px;"
-                        "border-top-right-radius: 10px;"
                         "border-style: none;"
-                        "background-color:rgba(0,0,0,120)"
                         "}"
                         "QToolButton {"
                         "background:transparent;"
@@ -45,6 +41,7 @@ BottomButtonGroup::BottomButtonGroup(const std::vector<QAction *> &actionList, Q
     for (QAction * action : actionList) {
         addButton(newActionBtn(action));
     }
+
 }
 
 void BottomButtonGroup::setOpacity(qreal opacity, bool animated)
diff --git a/app/framelesswindow.cpp b/app/framelesswindow.cpp
index d5c0a39..c9befa4 100644
--- a/app/framelesswindow.cpp
+++ b/app/framelesswindow.cpp
@@ -14,22 +14,9 @@
 FramelessWindow::FramelessWindow(QWidget *parent)
     : QWidget(parent)
     , m_centralLayout(new QVBoxLayout(this))
-    , m_oldCursorShape(Qt::ArrowCursor)
-    , m_oldEdges()
 {
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-    this->setWindowFlags(Qt::Window | Qt::FramelessWindowHint | Qt::WindowMinMaxButtonsHint);
-#else
-    // There is a bug in Qt 5 that will make pressing Meta+Up cause the app
-    // fullscreen under Windows, see QTBUG-91226 to learn more.
-    // The bug seems no longer exists in Qt 6 (I only tested it under Qt 6.3.0).
-    this->setWindowFlags(Qt::Window | Qt::FramelessWindowHint | Qt::WindowMinimizeButtonHint);
-#endif // QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-    this->setMouseTracking(true);
-    this->setAttribute(Qt::WA_Hover, true);
-    this->installEventFilter(this);
-
-    m_centralLayout->setContentsMargins(QMargins());
+    this->setWindowFlags(Qt::Window | Qt::WindowTitleHint | Qt::WindowSystemMenuHint | Qt::WindowMinMaxButtonsHint | Qt::WindowCloseButtonHint);
+    m_centralLayout->setContentsMargins(QMargins(0, 0, 0, 60));
 }
 
 void FramelessWindow::setCentralWidget(QWidget *widget)
@@ -42,106 +29,3 @@ void FramelessWindow::setCentralWidget(QWidget *widget)
     m_centralLayout->addWidget(widget);
     m_centralWidget = widget;
 }
-
-void FramelessWindow::installResizeCapture(QObject* widget)
-{
-    widget->installEventFilter(this);
-}
-
-bool FramelessWindow::eventFilter(QObject* o, QEvent* e)
-{
-    switch (e->type()) {
-    case QEvent::HoverMove:
-    {
-        QWidget* wg = qobject_cast<QWidget*>(o);
-        if (wg != nullptr)
-            return mouseHover(static_cast<QHoverEvent*>(e), wg);
-
-        break;
-    }
-    case QEvent::MouseButtonPress:
-        return mousePress(static_cast<QMouseEvent*>(e));
-    }
-
-    return QWidget::eventFilter(o, e);
-}
-
-bool FramelessWindow::mouseHover(QHoverEvent* event, QWidget* wg)
-{
-    if (!isMaximized() && !isFullScreen()) {
-        QWindow* win = window()->windowHandle();
-        Qt::Edges edges = this->getEdgesByPos(wg->mapToGlobal(event->oldPos()), win->frameGeometry());
-
-        // backup & restore cursor shape
-        if (edges && !m_oldEdges)
-            // entering the edge. backup cursor shape
-            m_oldCursorShape = win->cursor().shape();
-        if (!edges && m_oldEdges)
-            // leaving the edge. restore cursor shape
-            win->setCursor(m_oldCursorShape);
-
-        // save the latest edges status
-        m_oldEdges = edges;
-
-        // show resize cursor shape if cursor is within border
-        if (edges) {
-            win->setCursor(this->getCursorByEdge(edges, Qt::ArrowCursor));
-            return true;
-        }
-    }
-
-    return false;
-}
-
-bool FramelessWindow::mousePress(QMouseEvent* event)
-{
-    if (event->buttons() & Qt::LeftButton && !isMaximized() && !isFullScreen()) {
-        QWindow* win = window()->windowHandle();
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-        Qt::Edges edges = this->getEdgesByPos(event->globalPosition().toPoint(), win->frameGeometry());
-#else
-        Qt::Edges edges = this->getEdgesByPos(event->globalPos(), win->frameGeometry());
-#endif // QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-        if (edges) {
-            win->startSystemResize(edges);
-            return true;
-        }
-    }
-
-    return false;
-}
-
-Qt::CursorShape FramelessWindow::getCursorByEdge(const Qt::Edges& edges, Qt::CursorShape default_cursor)
-{
-    if ((edges == (Qt::TopEdge | Qt::LeftEdge)) || (edges == (Qt::RightEdge | Qt::BottomEdge)))
-        return Qt::SizeFDiagCursor;
-    else if ((edges == (Qt::TopEdge | Qt::RightEdge)) || (edges == (Qt::LeftEdge | Qt::BottomEdge)))
-        return Qt::SizeBDiagCursor;
-    else if (edges & (Qt::TopEdge | Qt::BottomEdge))
-        return Qt::SizeVerCursor;
-    else if (edges & (Qt::LeftEdge | Qt::RightEdge))
-        return Qt::SizeHorCursor;
-    else
-        return default_cursor;
-}
-
-Qt::Edges FramelessWindow::getEdgesByPos(const QPoint gpos, const QRect& winrect)
-{
-    const int borderWidth = 8;
-    Qt::Edges edges;
-
-    int x = gpos.x() - winrect.x();
-    int y = gpos.y() - winrect.y();
-
-    if (x < borderWidth)
-        edges |= Qt::LeftEdge;
-    if (x > (winrect.width() - borderWidth))
-        edges |= Qt::RightEdge;
-    if (y < borderWidth)
-        edges |= Qt::TopEdge;
-    if (y > (winrect.height() - borderWidth))
-        edges |= Qt::BottomEdge;
-
-    return edges;
-}
-
diff --git a/app/framelesswindow.h b/app/framelesswindow.h
index 95d9c2e..75eb43b 100644
--- a/app/framelesswindow.h
+++ b/app/framelesswindow.h
@@ -16,22 +16,9 @@ class FramelessWindow : public QWidget
     Q_OBJECT
 public:
     explicit FramelessWindow(QWidget *parent = nullptr);
-
     void setCentralWidget(QWidget * widget);
-    void installResizeCapture(QObject* widget);
-
-protected:
-    bool eventFilter(QObject *o, QEvent *e) override;
-    bool mouseHover(QHoverEvent* event, QWidget* wg);
-    bool mousePress(QMouseEvent* event);
 
 private:
-    Qt::Edges m_oldEdges;
-    Qt::CursorShape m_oldCursorShape;
-
-    Qt::CursorShape getCursorByEdge(const Qt::Edges& edges, Qt::CursorShape default_cursor);
-    Qt::Edges getEdgesByPos(const QPoint pos, const QRect& winrect);
-
     QVBoxLayout * m_centralLayout = nullptr;
     QWidget * m_centralWidget = nullptr; // just a pointer, doesn't take the ownership.
 };
diff --git a/app/graphicsscene.cpp b/app/graphicsscene.cpp
index 101e2a7..1966bd6 100644
--- a/app/graphicsscene.cpp
+++ b/app/graphicsscene.cpp
@@ -119,7 +119,7 @@ void GraphicsScene::showText(const QString &text)
 {
     this->clear();
     QGraphicsTextItem * textItem = this->addText(text);
-    textItem->setDefaultTextColor(QColor("White"));
+    textItem->setDefaultTextColor(QColor("Black"));
     m_theThing = textItem;
     this->setSceneRect(m_theThing->boundingRect());
 }
diff --git a/app/graphicsview.cpp b/app/graphicsview.cpp
index f5b7555..f04cfe6 100644
--- a/app/graphicsview.cpp
+++ b/app/graphicsview.cpp
@@ -22,8 +22,7 @@ GraphicsView::GraphicsView(QWidget *parent)
     setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
     setResizeAnchor(QGraphicsView::AnchorUnderMouse);
     setTransformationAnchor(QGraphicsView::AnchorUnderMouse);
-    setStyleSheet("background-color: rgba(0, 0, 0, 220);"
-                  "border-radius: 3px;");
+    setStyleSheet("border-style: none;");
     setAcceptDrops(false);
     setCheckerboardEnabled(false);
 
diff --git a/app/mainwindow.cpp b/app/mainwindow.cpp
index 5dbf2b9..53d2b9c 100644
--- a/app/mainwindow.cpp
+++ b/app/mainwindow.cpp
@@ -5,7 +5,6 @@
 #include "mainwindow.h"
 
 #include "settings.h"
-#include "toolbutton.h"
 #include "bottombuttongroup.h"
 #include "graphicsview.h"
 #include "navigatorview.h"
@@ -54,31 +53,12 @@ MainWindow::MainWindow(QWidget *parent)
         this->setWindowFlag(Qt::WindowStaysOnTopHint);
     }
 
-    this->setAttribute(Qt::WA_TranslucentBackground, true);
-    this->setMinimumSize(350, 330);
+    this->setMinimumSize(600, 400);
     this->setWindowIcon(QIcon(":/icons/app-icon.svg"));
-    this->setMouseTracking(true);
     this->setAcceptDrops(true);
 
     m_pm->setAutoLoadFilterSuffixes(supportedImageFormats());
 
-    m_fadeOutAnimation = new QPropertyAnimation(this, "windowOpacity");
-    m_fadeOutAnimation->setDuration(300);
-    m_fadeOutAnimation->setStartValue(1);
-    m_fadeOutAnimation->setEndValue(0);
-    m_floatUpAnimation = new QPropertyAnimation(this, "geometry");
-    m_floatUpAnimation->setDuration(300);
-    m_floatUpAnimation->setEasingCurve(QEasingCurve::OutCirc);
-    m_exitAnimationGroup = new QParallelAnimationGroup(this);
-    m_exitAnimationGroup->addAnimation(m_fadeOutAnimation);
-    m_exitAnimationGroup->addAnimation(m_floatUpAnimation);
-    connect(m_exitAnimationGroup, &QParallelAnimationGroup::finished,
-#ifdef Q_OS_MAC
-            this, &QWidget::hide);
-#else
-            this, &QWidget::close);
-#endif
-
     GraphicsScene * scene = new GraphicsScene(this);
 
     m_graphicsView = new GraphicsView(this);
@@ -86,7 +66,7 @@ MainWindow::MainWindow(QWidget *parent)
     this->setCentralWidget(m_graphicsView);
 
     m_gv = new NavigatorView(this);
-    m_gv->setFixedSize(220, 160);
+    m_gv->setFixedSize(82, 60);
     m_gv->setScene(scene);
     m_gv->setMainView(m_graphicsView);
     m_gv->fitInView(m_gv->sceneRect(), Qt::KeepAspectRatio);
@@ -102,48 +82,25 @@ MainWindow::MainWindow(QWidget *parent)
     connect(m_graphicsView, &GraphicsView::viewportRectChanged,
             m_gv, &NavigatorView::updateMainViewportRegion);
 
-    m_closeButton = new ToolButton(true, m_graphicsView);
-    m_closeButton->setIconSize(QSize(32, 32));
-    m_closeButton->setFixedSize(QSize(50, 50));
-    m_closeButton->setIconResourcePath(":/icons/window-close.svg");
-
-    connect(m_closeButton, &QAbstractButton::clicked,
-            this, &MainWindow::closeWindow);
-
-    m_prevButton = new ToolButton(false, m_graphicsView);
-    m_prevButton->setIconSize(QSize(75, 75));
-    m_prevButton->setIconResourcePath(":/icons/go-previous.svg");
-    m_prevButton->setVisible(false);
-    m_prevButton->setOpacity(0, false);
-    m_nextButton = new ToolButton(false, m_graphicsView);
-    m_nextButton->setIconSize(QSize(75, 75));
-    m_nextButton->setIconResourcePath(":/icons/go-next.svg");
-    m_nextButton->setVisible(false);
-    m_nextButton->setOpacity(0, false);
-
-    connect(m_prevButton, &QAbstractButton::clicked,
-            this, &MainWindow::galleryPrev);
-    connect(m_nextButton, &QAbstractButton::clicked,
-            this, &MainWindow::galleryNext);
-
     m_am->setupAction(this);
+    m_am->setPrevNextPictureActionEnabled(false);
 
     m_bottomButtonGroup = new BottomButtonGroup({
         m_am->actionActualSize,
-        m_am->actionToggleMaximize,
+        m_am->actionFitInView,
         m_am->actionZoomIn,
         m_am->actionZoomOut,
-        m_am->actionToggleCheckerboard,
-        m_am->actionRotateClockwise
+        m_am->actionPrevPicture,
+        m_am->actionNextPicture,
+        m_am->actionRotateCounterClockwise,
+        m_am->actionRotateClockwise,
+        m_am->actionHorizontalFlip,
+        m_am->actionToggleCheckerboard
     }, this);
-
-    m_bottomButtonGroup->setOpacity(0, false);
-    m_gv->setOpacity(0, false);
-    m_closeButton->setOpacity(0, false);
+    m_bottomButtonGroup->setFixedHeight(60);
 
     connect(m_pm, &PlaylistManager::totalCountChanged, this, [this](int galleryFileCount) {
-        m_prevButton->setVisible(galleryFileCount > 1);
-        m_nextButton->setVisible(galleryFileCount > 1);
+        m_am->setPrevNextPictureActionEnabled(galleryFileCount > 1);
     });
 
     connect(m_pm->model(), &PlaylistModel::modelReset, this, std::bind(&MainWindow::galleryCurrent, this, false, false));
@@ -164,12 +121,6 @@ MainWindow::MainWindow(QWidget *parent)
         Settings::instance()->applyUserShortcuts(this);
     });
 
-    // allow some mouse events can go through these widgets for resizing window.
-    installResizeCapture(m_closeButton);
-    installResizeCapture(m_graphicsView);
-    installResizeCapture(m_graphicsView->viewport());
-    installResizeCapture(m_gv);
-    installResizeCapture(m_gv->viewport());
 }
 
 MainWindow::~MainWindow()
@@ -304,75 +255,6 @@ void MainWindow::showEvent(QShowEvent *event)
     return FramelessWindow::showEvent(event);
 }
 
-void MainWindow::enterEvent(QT_ENTER_EVENT *event)
-{
-    m_bottomButtonGroup->setOpacity(1);
-    m_gv->setOpacity(1);
-
-    m_closeButton->setOpacity(1);
-    m_prevButton->setOpacity(1);
-    m_nextButton->setOpacity(1);
-
-    return FramelessWindow::enterEvent(event);
-}
-
-void MainWindow::leaveEvent(QEvent *event)
-{
-    m_bottomButtonGroup->setOpacity(0);
-    m_gv->setOpacity(0);
-
-    m_closeButton->setOpacity(0);
-    m_prevButton->setOpacity(0);
-    m_nextButton->setOpacity(0);
-
-    return FramelessWindow::leaveEvent(event);
-}
-
-void MainWindow::mousePressEvent(QMouseEvent *event)
-{
-    if (event->buttons() & Qt::LeftButton && !isMaximized()) {
-        m_clickedOnWindow = true;
-        m_oldMousePos = event->pos();
-//        qDebug() << m_oldMousePos << m_graphicsView->transform().m11()
-//                 << m_graphicsView->transform().m22() << m_graphicsView->matrix().m12();
-        event->accept();
-    }
-
-    return FramelessWindow::mousePressEvent(event);
-}
-
-void MainWindow::mouseMoveEvent(QMouseEvent *event)
-{
-    if (event->buttons() & Qt::LeftButton && m_clickedOnWindow && !isMaximized() && !isFullScreen()) {
-        if (!window()->windowHandle()->startSystemMove()) {
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-            move(event->globalPosition().toPoint() - m_oldMousePos);
-#else
-            move(event->globalPos() - m_oldMousePos);
-#endif // QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-        }
-        event->accept();
-    }
-
-    return FramelessWindow::mouseMoveEvent(event);
-}
-
-void MainWindow::mouseReleaseEvent(QMouseEvent *event)
-{
-    m_clickedOnWindow = false;
-
-    // It seems the forward/back mouse button won't generate a key event [1] so we can't use
-    // QShortcut or QKeySequence to indicate these shortcuts, so we do it here.
-    // Reference:
-    // [1]: https://codereview.qt-project.org/c/qt/qtbase/+/177475
-    if (event->button() == Qt::ForwardButton || event->button() == Qt::BackButton) {
-        event->button() == Qt::BackButton ? galleryPrev() : galleryNext();
-        event->accept();
-    }
-
-    return FramelessWindow::mouseReleaseEvent(event);
-}
-
 void MainWindow::mouseDoubleClickEvent(QMouseEvent *event)
 {
     // The forward/back mouse button can also used to trigger a mouse double-click event
@@ -584,20 +466,12 @@ void MainWindow::centerWindow()
 
 void MainWindow::closeWindow()
 {
-    QRect windowRect(this->geometry());
-    m_floatUpAnimation->setStartValue(windowRect);
-    m_floatUpAnimation->setEndValue(windowRect.adjusted(0, -80, 0, 0));
-    m_floatUpAnimation->setStartValue(QRect(this->geometry().x(), this->geometry().y(), this->geometry().width(), this->geometry().height()));
-    m_floatUpAnimation->setEndValue(QRect(this->geometry().x(), this->geometry().y()-80, this->geometry().width(), this->geometry().height()));
-    m_exitAnimationGroup->start();
+    // YYC Mark: Exit animation is not supported in Remix fork.
+    this->close();
 }
 
 void MainWindow::updateWidgetsPosition()
 {
-    m_closeButton->move(width() - m_closeButton->width(), 0);
-    m_prevButton->move(25, (height() - m_prevButton->sizeHint().height()) / 2);
-    m_nextButton->move(width() - m_nextButton->sizeHint().width() - 25,
-                       (height() - m_prevButton->sizeHint().height()) / 2);
     m_bottomButtonGroup->move((width() - m_bottomButtonGroup->width()) / 2,
                               height() - m_bottomButtonGroup->height());
     m_gv->move(width() - m_gv->width(), height() - m_gv->height());
@@ -606,9 +480,7 @@ void MainWindow::updateWidgetsPosition()
 void MainWindow::toggleProtectedMode()
 {
     m_protectedMode = !m_protectedMode;
-    m_closeButton->setVisible(!m_protectedMode);
-    m_prevButton->setVisible(!m_protectedMode);
-    m_nextButton->setVisible(!m_protectedMode);
+    // YYC Mark: Protected mode is not supported in Remix fork.
 }
 
 void MainWindow::toggleStayOnTop()
@@ -647,7 +519,9 @@ bool MainWindow::canPaste() const
 
 void MainWindow::quitAppAction(bool force)
 {
-    if (!m_protectedMode || force) {
+    // YYC Mark: Protect mode is not supported in Remix fork
+    // Assume we are always in non-protected mode.
+    if (/*!m_protectedMode*/ true || force) {
         closeWindow();
     }
 }
diff --git a/app/mainwindow.h b/app/mainwindow.h
index c9b5a38..ac8ba33 100644
--- a/app/mainwindow.h
+++ b/app/mainwindow.h
@@ -51,11 +51,6 @@ public:
 
 protected slots:
     void showEvent(QShowEvent *event) override;
-    void enterEvent(QT_ENTER_EVENT *event) override;
-    void leaveEvent(QEvent *event) override;
-    void mousePressEvent(QMouseEvent *event) override;
-    void mouseMoveEvent(QMouseEvent *event) override;
-    void mouseReleaseEvent(QMouseEvent *event) override;
     void mouseDoubleClickEvent(QMouseEvent *event) override;
     void wheelEvent(QWheelEvent *event) override;
     void resizeEvent(QResizeEvent *event) override;
@@ -119,19 +114,11 @@ private:
     ActionManager *m_am;
     PlaylistManager *m_pm;
 
-    QPoint m_oldMousePos;
-    QPropertyAnimation *m_fadeOutAnimation;
-    QPropertyAnimation *m_floatUpAnimation;
-    QParallelAnimationGroup *m_exitAnimationGroup;
     QFileSystemWatcher *m_fileSystemWatcher;
-    ToolButton *m_closeButton;
-    ToolButton *m_prevButton;
-    ToolButton *m_nextButton;
     GraphicsView *m_graphicsView;
     NavigatorView *m_gv;
     BottomButtonGroup *m_bottomButtonGroup;
     bool m_protectedMode = false;
-    bool m_clickedOnWindow = false;
 };
 
 #endif // MAINWINDOW_H
diff --git a/app/navigatorview.cpp b/app/navigatorview.cpp
index 95c6cd1..f9e71d3 100644
--- a/app/navigatorview.cpp
+++ b/app/navigatorview.cpp
@@ -18,7 +18,7 @@ NavigatorView::NavigatorView(QWidget *parent)
     setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
     setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
     setStyleSheet("background-color: rgba(0, 0, 0, 120);"
-                  "border-radius: 3px;");
+                  "border-style: none;");
 }
 
 // doesn't take or manage its ownership
diff --git a/app/settings.cpp b/app/settings.cpp
index 7c70244..0af81fa 100644
--- a/app/settings.cpp
+++ b/app/settings.cpp
@@ -47,7 +47,7 @@ Settings *Settings::instance()
 
 bool Settings::stayOnTop()
 {
-    return m_qsettings->value("stay_on_top", true).toBool();
+    return m_qsettings->value("stay_on_top", false).toBool();
 }
 
 bool Settings::useLightCheckerboard()
@@ -57,9 +57,9 @@ bool Settings::useLightCheckerboard()
 
 Settings::DoubleClickBehavior Settings::doubleClickBehavior() const
 {
-    QString result = m_qsettings->value("double_click_behavior", "Close").toString();
+    QString result = m_qsettings->value("double_click_behavior", "Ignore").toString();
 
-    return QEnumHelper::fromString<DoubleClickBehavior>(result, DoubleClickBehavior::Close);
+    return QEnumHelper::fromString<DoubleClickBehavior>(result, DoubleClickBehavior::Ignore);
 }
 
 Settings::MouseWheelBehavior Settings::mouseWheelBehavior() const
@@ -71,9 +71,9 @@ Settings::MouseWheelBehavior Settings::mouseWheelBehavior() const
 
 Settings::WindowSizeBehavior Settings::initWindowSizeBehavior() const
 {
-    QString result = m_qsettings->value("init_window_size_behavior", "Auto").toString();
+    QString result = m_qsettings->value("init_window_size_behavior", "Maximized").toString();
 
-    return QEnumHelper::fromString<WindowSizeBehavior>(result, WindowSizeBehavior::Auto);
+    return QEnumHelper::fromString<WindowSizeBehavior>(result, WindowSizeBehavior::Maximized);
 }
 
 Qt::HighDpiScaleFactorRoundingPolicy Settings::hiDpiScaleFactorBehavior() const
diff --git a/assets/icons/fit-in-view.svg b/assets/icons/fit-in-view.svg
new file mode 100644
index 0000000..7908ba2
--- /dev/null
+++ b/assets/icons/fit-in-view.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><title>fit-to-screen</title><path d="M17 4H20C21.1 4 22 4.9 22 6V8H20V6H17V4M4 8V6H7V4H4C2.9 4 2 4.9 2 6V8H4M20 16V18H17V20H20C21.1 20 22 19.1 22 18V16H20M7 18H4V16H2V18C2 19.1 2.9 20 4 20H7V18M18 8H6V16H18V8Z" /></svg>
\ No newline at end of file
diff --git a/assets/icons/go-next.svg b/assets/icons/go-next.svg
index f769cde..99b869e 100644
--- a/assets/icons/go-next.svg
+++ b/assets/icons/go-next.svg
@@ -1,15 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width="100%" height="100%" viewBox="0 0 75 75" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;">
-    <g transform="matrix(1,0,0,1,-119,-102)">
-        <g id="go-next" transform="matrix(1.25,0,0,1.44231,119,-7.61538)">
-            <rect x="0" y="76" width="60" height="52" style="fill:none;"/>
-            <g transform="matrix(0.8,0,0,0.693333,0.260244,25.056)">
-                <circle cx="37.175" cy="110.977" r="33.175" style="fill-opacity:0.15;stroke:white;stroke-width:2px;"/>
-            </g>
-            <g id="path867" transform="matrix(0.8,0,0,0.693333,1.80436,76.0055)">
-                <path d="M31.578,26.175L42.911,37.508L31.578,48.809" style="fill:none;fill-rule:nonzero;stroke:white;stroke-width:2px;"/>
-            </g>
-        </g>
-    </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><title>page-last</title><path d="M5.59,7.41L10.18,12L5.59,16.59L7,18L13,12L7,6L5.59,7.41M16,6H18V18H16V6Z" /></svg>
\ No newline at end of file
diff --git a/assets/icons/go-previous.svg b/assets/icons/go-previous.svg
index cdf3dc5..c0d41a2 100644
--- a/assets/icons/go-previous.svg
+++ b/assets/icons/go-previous.svg
@@ -1,15 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width="100%" height="100%" viewBox="0 0 75 75" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;">
-    <g transform="matrix(1,0,0,1,-39,-102)">
-        <g id="go-previous" transform="matrix(1.25,0,0,1.44231,39,-7.61538)">
-            <rect x="0" y="76" width="60" height="52" style="fill:none;"/>
-            <g transform="matrix(0.8,0,0,0.693333,0.260244,25.056)">
-                <circle cx="37.175" cy="110.977" r="33.175" style="fill-opacity:0.15;stroke:white;stroke-width:2px;"/>
-            </g>
-            <g id="path867" transform="matrix(0.8,0,0,0.693333,-1.8205,76.0055)">
-                <path d="M43.442,26.175L32.109,37.508L43.442,48.809" style="fill:none;fill-rule:nonzero;stroke:white;stroke-width:2px;"/>
-            </g>
-        </g>
-    </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><title>page-first</title><path d="M18.41,16.59L13.82,12L18.41,7.41L17,6L11,12L17,18L18.41,16.59M6,6H8V18H6V6Z" /></svg>
\ No newline at end of file
diff --git a/assets/icons/horizontal-flip.svg b/assets/icons/horizontal-flip.svg
new file mode 100644
index 0000000..2c73e75
--- /dev/null
+++ b/assets/icons/horizontal-flip.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><title>flip-horizontal</title><path d="M15 21H17V19H15M19 9H21V7H19M3 5V19C3 20.1 3.9 21 5 21H9V19H5V5H9V3H5C3.9 3 3 3.9 3 5M19 3V5H21C21 3.9 20.1 3 19 3M11 23H13V1H11M19 17H21V15H19M15 5H17V3H15M19 13H21V11H19M19 21C20.1 21 21 20.1 21 19H19Z" /></svg>
\ No newline at end of file
diff --git a/assets/icons/object-rotate-left.svg b/assets/icons/object-rotate-left.svg
new file mode 100644
index 0000000..8b704d8
--- /dev/null
+++ b/assets/icons/object-rotate-left.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><title>rotate-left</title><path d="M13,4.07V1L8.45,5.55L13,10V6.09C15.84,6.57 18,9.03 18,12C18,14.97 15.84,17.43 13,17.91V19.93C16.95,19.44 20,16.08 20,12C20,7.92 16.95,4.56 13,4.07M7.1,18.32C8.26,19.22 9.61,19.76 11,19.93V17.9C10.13,17.75 9.29,17.41 8.54,16.87L7.1,18.32M6.09,13H4.07C4.24,14.39 4.79,15.73 5.69,16.89L7.1,15.47C6.58,14.72 6.23,13.88 6.09,13M7.11,8.53L5.7,7.11C4.8,8.27 4.24,9.61 4.07,11H6.09C6.23,10.13 6.58,9.28 7.11,8.53Z" /></svg>
\ No newline at end of file
diff --git a/assets/icons/object-rotate-right.svg b/assets/icons/object-rotate-right.svg
index 2aa9450..f6eda6d 100644
--- a/assets/icons/object-rotate-right.svg
+++ b/assets/icons/object-rotate-right.svg
@@ -1,17 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width="100%" height="100%" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.5;">
-    <g transform="matrix(1,0,0,1,-74,-7.10543e-15)">
-        <g id="object-rotate-right" transform="matrix(1,0,0,1,74,7.10543e-15)">
-            <rect x="0" y="0" width="32" height="32" style="fill:none;"/>
-            <g transform="matrix(1,0,0,1,-1,-0.275147)">
-                <g transform="matrix(1,0,0,1,-74,-7.10543e-15)">
-                    <path d="M100,18C100,22.967 95.967,27 91,27C86.033,27 82,22.967 82,18C82,13.033 86.033,9 91,9" style="fill:none;stroke:white;stroke-width:2px;"/>
-                </g>
-                <g transform="matrix(0.984136,-0.177418,0.177418,0.984136,-74.2676,16.4198)">
-                    <path d="M89,13L93,9L89,5" style="fill:none;stroke:white;stroke-width:2px;"/>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><title>rotate-right</title><path d="M16.89,15.5L18.31,16.89C19.21,15.73 19.76,14.39 19.93,13H17.91C17.77,13.87 17.43,14.72 16.89,15.5M13,17.9V19.92C14.39,19.75 15.74,19.21 16.9,18.31L15.46,16.87C14.71,17.41 13.87,17.76 13,17.9M19.93,11C19.76,9.61 19.21,8.27 18.31,7.11L16.89,8.53C17.43,9.28 17.77,10.13 17.91,11M15.55,5.55L11,1V4.07C7.06,4.56 4,7.92 4,12C4,16.08 7.05,19.44 11,19.93V17.91C8.16,17.43 6,14.97 6,12C6,9.03 8.16,6.57 11,6.09V10L15.55,5.55Z" /></svg>
\ No newline at end of file
diff --git a/assets/icons/view-background-checkerboard.svg b/assets/icons/view-background-checkerboard.svg
index 4e0e4ef..23884e8 100644
--- a/assets/icons/view-background-checkerboard.svg
+++ b/assets/icons/view-background-checkerboard.svg
@@ -1,24 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width="100%" height="100%" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.5;">
-    <g transform="matrix(1,0,0,1,0,-37)">
-        <g id="view-background-checkerboard" transform="matrix(1,0,0,1,0,37)">
-            <rect x="0" y="0" width="32" height="32" style="fill:none;"/>
-            <g id="rect814" transform="matrix(0.964431,0,0,0.907545,0.187581,-988.266)">
-                <rect x="6.027" y="1095.56" width="10.369" height="11.019" style="fill:white;fill-opacity:0.87;"/>
-            </g>
-            <g id="rect814-4" transform="matrix(0.984615,0,0,0.898704,-0.143354,-978.502)">
-                <rect x="16.396" y="1106.6" width="10.156" height="11.127" style="fill:white;fill-opacity:0.87;"/>
-            </g>
-            <g id="rect814-2" transform="matrix(0.963684,0,0,0.898697,0.199828,-978.495)">
-                <rect x="6.019" y="1106.6" width="10.377" height="11.127" style="fill:white;fill-opacity:0.07;"/>
-            </g>
-            <g id="rect814-2-6" transform="matrix(0.980558,0,0,0.898693,-0.0768322,-978.47)">
-                <rect x="16.396" y="1095.45" width="10.198" height="11.127" style="fill:white;fill-opacity:0.07;"/>
-            </g>
-            <g transform="matrix(1,0,0,0.952381,-74,-34)">
-                <rect x="80" y="42" width="20" height="21" style="fill:none;stroke:white;stroke-width:2.05px;"/>
-            </g>
-        </g>
-    </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><title>checkerboard</title><path d="M2 2V22H22V2H2M20 12H16V16H20V20H16V16H12V20H8V16H4V12H8V8H4V4H8V8H12V4H16V8H20V12M16 8V12H12V8H16M12 12V16H8V12H12Z" /></svg>
\ No newline at end of file
diff --git a/assets/icons/view-fullscreen.svg b/assets/icons/view-fullscreen.svg
deleted file mode 100644
index 1d25d09..0000000
--- a/assets/icons/view-fullscreen.svg
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width="100%" height="100%" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.5;">
-    <g transform="matrix(1,0,0,1,-37,-37)">
-        <g id="view-fullscreen" transform="matrix(1,0,0,1,37,37)">
-            <rect x="0" y="0" width="32" height="32" style="fill:none;"/>
-            <g transform="matrix(1,0,0,1,-36,-37)">
-                <path d="M42,49L42,43L48,43" style="fill:none;stroke:white;stroke-width:2px;"/>
-            </g>
-            <g transform="matrix(-1,1.22465e-16,1.22465e-16,1,68,-37)">
-                <path d="M42,49L42,43L48,43" style="fill:none;stroke:white;stroke-width:2px;"/>
-            </g>
-            <g transform="matrix(1,-2.46519e-32,-2.46519e-32,-1,-36,69)">
-                <path d="M42,49L42,43L48,43" style="fill:none;stroke:white;stroke-width:2px;"/>
-            </g>
-            <g transform="matrix(1.11111,0,0,1.14286,-42.3333,-42.8571)">
-                <rect x="48" y="48" width="9" height="7" style="fill:none;stroke:white;stroke-width:1.77px;"/>
-            </g>
-            <g transform="matrix(-1,-1.22465e-16,1.22465e-16,-1,68,69)">
-                <path d="M42,49L42,43L48,43" style="fill:none;stroke:white;stroke-width:2px;"/>
-            </g>
-        </g>
-    </g>
-</svg>
diff --git a/assets/icons/window-close.svg b/assets/icons/window-close.svg
deleted file mode 100644
index daca19c..0000000
--- a/assets/icons/window-close.svg
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="32"
-   height="32"
-   viewBox="0 0 8.4666665 8.4666669"
-   version="1.1"
-   id="svg8"
-   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
-   sodipodi:docname="window-close.svg">
-  <defs
-     id="defs2" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#000000"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.69803922"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.627417"
-     inkscape:cx="19.29838"
-     inkscape:cy="15.79404"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     units="px"
-     inkscape:pagecheckerboard="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1001"
-     inkscape:window-x="-9"
-     inkscape:window-y="-9"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-288.5333)">
-    <path
-       style="fill:none;stroke:#ffffff;stroke-width:0.396875;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
-       d="m 2.100237,290.55098 4.3234589,4.22265"
-       id="path817"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="fill:none;stroke:#ffffff;stroke-width:0.396875;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
-       d="m 2.099406,294.78651 4.3414732,-4.24185"
-       id="path819"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
-  </g>
-</svg>
diff --git a/assets/icons/zoom-in.svg b/assets/icons/zoom-in.svg
index 0f96eb1..1b89ee0 100644
--- a/assets/icons/zoom-in.svg
+++ b/assets/icons/zoom-in.svg
@@ -1,17 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width="100%" height="100%" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.5;">
-    <rect id="zoom-in" x="0" y="0" width="32" height="32" style="fill:none;"/>
-    <g id="zoom-in1" serif:id="zoom-in">
-        <g>
-            <g transform="matrix(1,0,0,1,-1,0)">
-                <circle cx="16" cy="15" r="9" style="fill:none;stroke:white;stroke-width:2px;"/>
-            </g>
-            <g transform="matrix(0.8,0.8,-0.8,0.8,27.6,-17.2)">
-                <path d="M21,28L26,28" style="fill:none;stroke:white;stroke-width:2.65px;"/>
-            </g>
-            <path d="M11,15L19,15" style="fill:none;stroke:white;stroke-width:2px;"/>
-            <path d="M15,11L15,19" style="fill:none;stroke:white;stroke-width:2px;"/>
-        </g>
-    </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><title>magnify-plus-outline</title><path d="M15.5,14L20.5,19L19,20.5L14,15.5V14.71L13.73,14.43C12.59,15.41 11.11,16 9.5,16A6.5,6.5 0 0,1 3,9.5A6.5,6.5 0 0,1 9.5,3A6.5,6.5 0 0,1 16,9.5C16,11.11 15.41,12.59 14.43,13.73L14.71,14H15.5M9.5,14C12,14 14,12 14,9.5C14,7 12,5 9.5,5C7,5 5,7 5,9.5C5,12 7,14 9.5,14M12,10H10V12H9V10H7V9H9V7H10V9H12V10Z" /></svg>
\ No newline at end of file
diff --git a/assets/icons/zoom-original.svg b/assets/icons/zoom-original.svg
index 9a5e3c9..c585c14 100644
--- a/assets/icons/zoom-original.svg
+++ b/assets/icons/zoom-original.svg
@@ -5,19 +5,19 @@
         <g id="zoom-original" transform="matrix(1,0,0,1,74,37)">
             <rect x="0" y="0" width="32" height="32" style="fill:none;"/>
             <g transform="matrix(1,0,0,1,-73,-37)">
-                <path d="M85,57L85,49L84,49" style="fill:none;stroke:white;stroke-width:2px;"/>
+                <path d="M85,57L85,49L84,49" style="fill:none;stroke:black;stroke-width:2px;"/>
             </g>
             <g transform="matrix(1,0,0,1,-74,-37)">
-                <rect x="89" y="50" width="2" height="2" style="fill:white;"/>
+                <rect x="89" y="50" width="2" height="2" style="fill:black;"/>
             </g>
             <g transform="matrix(1,0,0,1,-74,-33)">
-                <rect x="89" y="50" width="2" height="2" style="fill:white;"/>
+                <rect x="89" y="50" width="2" height="2" style="fill:black;"/>
             </g>
             <g transform="matrix(1,0,0,1,-64,-37)">
-                <path d="M85,57L85,49L84,49" style="fill:none;stroke:white;stroke-width:2px;"/>
+                <path d="M85,57L85,49L84,49" style="fill:none;stroke:black;stroke-width:2px;"/>
             </g>
             <g transform="matrix(1,0,0,0.952381,-74,-34)">
-                <rect x="80" y="42" width="20" height="21" style="fill:none;stroke:white;stroke-width:2.05px;stroke-linecap:round;stroke-linejoin:round;"/>
+                <rect x="80" y="42" width="20" height="21" style="fill:none;stroke:black;stroke-width:2.05px;stroke-linecap:round;stroke-linejoin:round;"/>
             </g>
         </g>
     </g>
diff --git a/assets/icons/zoom-out.svg b/assets/icons/zoom-out.svg
index d679957..2a5a377 100644
--- a/assets/icons/zoom-out.svg
+++ b/assets/icons/zoom-out.svg
@@ -1,18 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width="100%" height="100%" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.5;">
-    <g transform="matrix(1,0,0,1,-74,0)">
-        <g id="zoom-out" transform="matrix(1,0,0,1,74,0)">
-            <rect x="0" y="0" width="32" height="32" style="fill:none;"/>
-            <g>
-                <g transform="matrix(1,0,0,1,-1,0)">
-                    <circle cx="16" cy="15" r="9" style="fill:none;stroke:white;stroke-width:2px;"/>
-                </g>
-                <g transform="matrix(0.8,0.8,-0.8,0.8,27.6,-17.2)">
-                    <path d="M21,28L26,28" style="fill:none;stroke:white;stroke-width:2.65px;"/>
-                </g>
-                <path d="M11,15L19,15" style="fill:none;stroke:white;stroke-width:2px;"/>
-            </g>
-        </g>
-    </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><title>magnify-minus-outline</title><path d="M15.5,14H14.71L14.43,13.73C15.41,12.59 16,11.11 16,9.5A6.5,6.5 0 0,0 9.5,3A6.5,6.5 0 0,0 3,9.5A6.5,6.5 0 0,0 9.5,16C11.11,16 12.59,15.41 13.73,14.43L14,14.71V15.5L19,20.5L20.5,19L15.5,14M9.5,14C7,14 5,12 5,9.5C5,7 7,5 9.5,5C12,5 14,7 14,9.5C14,12 12,14 9.5,14M7,9H12V10H7V9Z" /></svg>
\ No newline at end of file
diff --git a/assets/resources.qrc b/assets/resources.qrc
index 82d4976..7997eed 100644
--- a/assets/resources.qrc
+++ b/assets/resources.qrc
@@ -2,12 +2,13 @@
     <qresource prefix="/">
         <file>icons/zoom-in.svg</file>
         <file>icons/zoom-out.svg</file>
-        <file>icons/view-fullscreen.svg</file>
+        <file>icons/fit-in-view.svg</file>
+        <file>icons/horizontal-flip.svg</file>
         <file>icons/zoom-original.svg</file>
+        <file>icons/object-rotate-left.svg</file>
         <file>icons/object-rotate-right.svg</file>
         <file>icons/view-background-checkerboard.svg</file>
         <file>icons/app-icon.svg</file>
-        <file>icons/window-close.svg</file>
         <file>icons/go-next.svg</file>
         <file>icons/go-previous.svg</file>
         <file>plain/translators.html</file>