diff --git a/src/app/GUI/RenderWidgets/renderinstancewidget.cpp b/src/app/GUI/RenderWidgets/renderinstancewidget.cpp
index 611cd3a11..97b69a939 100644
--- a/src/app/GUI/RenderWidgets/renderinstancewidget.cpp
+++ b/src/app/GUI/RenderWidgets/renderinstancewidget.cpp
@@ -468,7 +468,7 @@ OutputProfilesListButton::OutputProfilesListButton(RenderInstanceWidget *parent)
     QPushButton(parent) {
     mParentWidget = parent;
     setText(tr("Profiles"));
-    setIcon(QIcon::fromTheme("file_movie"));
+    setIcon(QIcon::fromTheme("renderlayers"));
     setToolTip(tr("Select output profile"));
 }
 
diff --git a/src/app/GUI/Settings/pluginssettingswidget.cpp b/src/app/GUI/Settings/pluginssettingswidget.cpp
index a6325df03..b31c7f331 100644
--- a/src/app/GUI/Settings/pluginssettingswidget.cpp
+++ b/src/app/GUI/Settings/pluginssettingswidget.cpp
@@ -56,14 +56,14 @@ PluginsSettingsWidget::PluginsSettingsWidget(QWidget *parent)
     mShaderLabel->setToolTip(tr("This location will be scanned for shader plugins during startup."));
     mShaderPath = new QLineEdit(this);
     mShaderPath->setText(AppSupport::getAppShaderEffectsPath());
-    const auto mShaderPathButton = new QPushButton(QIcon::fromTheme("dots"),
+    const auto mShaderPathButton = new QPushButton(QIcon::fromTheme("file_folder"),
                                                    QString(),
                                                    this);
-    mShaderPathButton->setObjectName("FlatButton");
     mShaderPathButton->setFocusPolicy(Qt::NoFocus);
 
     eSizesUI::widget.add(mShaderPathButton, [mShaderPathButton](const int size) {
-        mShaderPathButton->setFixedSize(size, size);
+        Q_UNUSED(size)
+        mShaderPathButton->setFixedSize(eSizesUI::button, eSizesUI::button);
     });
 
     mShaderLayout->addWidget(mShaderLabel);
diff --git a/src/app/GUI/keysview.cpp b/src/app/GUI/keysview.cpp
index 6e39e91bf..4efecac98 100644
--- a/src/app/GUI/keysview.cpp
+++ b/src/app/GUI/keysview.cpp
@@ -343,8 +343,8 @@ void KeysView::mousePressEvent(QMouseEvent *e) {
                 QMenu menu;
                 const QString editStr = tr("Edit duration");
                 const QString splitStr = tr("Split Clip");
-                menu.addAction(editStr);
-                menu.addAction(splitStr);
+                menu.addAction(QIcon::fromTheme("sequence"), editStr);
+                menu.addAction(QIcon::fromTheme("image-missing"), splitStr);
                 const auto selectedAction = menu.exec(e->globalPos());
                 if (selectedAction) {
                     if (selectedAction->text() == editStr) {
diff --git a/src/app/GUI/mainwindow.cpp b/src/app/GUI/mainwindow.cpp
index 6cd05780d..d286645d2 100644
--- a/src/app/GUI/mainwindow.cpp
+++ b/src/app/GUI/mainwindow.cpp
@@ -665,6 +665,7 @@ void MainWindow::setupMenuBar()
     {
         const auto qAct = new NoShortcutAction(tr("Duplicate", "MenuBar_Edit"));
         mEditMenu->addAction(qAct);
+        qAct->setIcon(QIcon::fromTheme("duplicate"));
         qAct->setShortcut(Qt::CTRL + Qt::Key_D);
         mActions.duplicateAction->connect(qAct);
         cmdAddAction(qAct);
@@ -729,14 +730,16 @@ void MainWindow::setupMenuBar()
 
     mEditMenu->addSeparator();
 
-    const auto clearCacheAct = mEditMenu->addAction(tr("Clear Cache", "MenuBar_Edit"), [this]() {
+    const auto clearCacheAct = mEditMenu->addAction(QIcon::fromTheme("trash"),
+                                                    tr("Clear Cache", "MenuBar_Edit"), [this]() {
         const auto m = MemoryHandler::sInstance;
         m->clearMemory();
         mTimeline->update();
     }, QKeySequence(tr("Ctrl+R")));
     cmdAddAction(clearCacheAct);
 
-    const auto clearRecentAct = mEditMenu->addAction(tr("Clear Recent Files"), [this]() {
+    const auto clearRecentAct = mEditMenu->addAction(QIcon::fromTheme("trash"),
+                                                     tr("Clear Recent Files"), [this]() {
         mRecentFiles.clear();
         writeRecentFiles();
         updateRecentMenu();
@@ -1006,8 +1009,7 @@ void MainWindow::setupMenuBar()
         mToolbar->addWidget(sceneToolBtn);
     }
 
-    const auto zoomMenu = mViewMenu->addMenu(
-                tr("Zoom","MenuBar_View"));
+    const auto zoomMenu = mViewMenu->addMenu(QIcon::fromTheme("zoom"), tr("Zoom","MenuBar_View"));
 
     mZoomInAction = zoomMenu->addAction(tr("Zoom In", "MenuBar_View_Zoom"));
     mZoomInAction->setShortcut(QKeySequence("Ctrl+Shift++"));
@@ -1290,6 +1292,7 @@ void MainWindow::setupMenuBar()
         QMessageBox::aboutQt(this, tr("About Qt"));
     });
 
+    help->addSeparator();
     help->addAction(QIcon::fromTheme("cmd"),
                     tr("Command Palette"), this, [this]() {
         CommandPalette dialog(mDocument, this);
diff --git a/src/ui/widgets/framescrollbar.cpp b/src/ui/widgets/framescrollbar.cpp
index 160ab65bb..51b335156 100644
--- a/src/ui/widgets/framescrollbar.cpp
+++ b/src/ui/widgets/framescrollbar.cpp
@@ -318,24 +318,32 @@ void FrameScrollBar::mousePressEvent(QMouseEvent *event)
 
         //menu.addSeparator();
 
-        QAction *timeAction = new QAction(tr("Display Timecodes"), this);
+        QAction *timeAction = new QAction(QIcon::fromTheme("visible"),
+                                          tr("Display Timecodes"), this);
         timeAction->setCheckable(true);
         timeAction->setChecked(mDisplayTime);
         menu.addAction(timeAction);
 
-        QAction *framesAction = new QAction(tr("Display Frames"), this);
+        QAction *framesAction = new QAction(QIcon::fromTheme("visible"),
+                                            tr("Display Frames"), this);
         framesAction->setCheckable(true);
         framesAction->setChecked(!mDisplayTime);
         menu.addAction(framesAction);
 
         bool hasMarker = mCurrentCanvas ? mCurrentCanvas->hasMarker(mCurrentCanvas->getCurrentFrame()) : false;
 
-        const auto setFrameInAct = new QAction(tr("Set Frame In"), this);
-        const auto setFrameOutAct = new QAction(tr("Set Frame Out"), this);
-        const auto clearFrameOutAct = new QAction(tr("Clear Frame In/Out"), this);
-        const auto setMarkerAct = new QAction(tr(hasMarker ? "Remove Marker" : "Add Marker"), this);
-        const auto clearMarkersAct = new QAction(tr("Clear Markers"), this);
-        const auto splitDurationAct = new QAction(tr("Split Clip"), this);
+        const auto setFrameInAct = new QAction(QIcon::fromTheme("sequence"),
+                                               tr("Set In"), this);
+        const auto setFrameOutAct = new QAction(QIcon::fromTheme("sequence"),
+                                                tr("Set Out"), this);
+        const auto clearFrameOutAct = new QAction(QIcon::fromTheme("trash"),
+                                                  tr("Clear In/Out"), this);
+        const auto setMarkerAct = new QAction(QIcon::fromTheme("dialog-information"),
+                                              tr(hasMarker ? "Remove Marker" : "Add Marker"), this);
+        const auto clearMarkersAct = new QAction(QIcon::fromTheme("trash"),
+                                                 tr("Clear Markers"), this);
+        const auto splitDurationAct = new QAction(QIcon::fromTheme("image-missing"),
+                                                  tr("Split Clip"), this);
 
         menu.addSeparator();
         menu.addAction(setFrameInAct);
diff --git a/src/ui/widgets/performancesettingswidget.cpp b/src/ui/widgets/performancesettingswidget.cpp
index 4d245329a..73d76f9a6 100644
--- a/src/ui/widgets/performancesettingswidget.cpp
+++ b/src/ui/widgets/performancesettingswidget.cpp
@@ -149,6 +149,7 @@ PerformanceSettingsWidget::PerformanceSettingsWidget(QWidget *parent)
         mCpuThreadsCapCheck->setFixedHeight(size);
         mRamMBCapCheck->setFixedHeight(size);
         mPathGpuAccCheck->setFixedHeight(size);
+        mAudioDevicesCombo->setFixedHeight(eSizesUI::button);
     });
 
     QTimer::singleShot(250, this,