diff --git a/share/icons/16x16/checkbox-unchecked.png b/share/icons/16x16/checkbox-unchecked.png
deleted file mode 100644
index e5cf44c7a..000000000
Binary files a/share/icons/16x16/checkbox-unchecked.png and /dev/null differ
diff --git a/share/icons/32x32/checkbox-unchecked.png b/share/icons/32x32/checkbox-unchecked.png
deleted file mode 100644
index d6e327480..000000000
Binary files a/share/icons/32x32/checkbox-unchecked.png and /dev/null differ
diff --git a/src/mkvtoolnix-gui/merge/attachments.cpp b/src/mkvtoolnix-gui/merge/attachments.cpp
index b0b2d88ba..aedbc604c 100644
--- a/src/mkvtoolnix-gui/merge/attachments.cpp
+++ b/src/mkvtoolnix-gui/merge/attachments.cpp
@@ -62,10 +62,10 @@ Tab::setupAttachmentsControls() {
 
   Util::HeaderViewManager::create(*p.ui->attachedFiles, "Merge::AttachedFiles").setDefaultSizes({ { Q("name"), 180 }, { Q("mimeType"), 180 }, { Q("size"), 100 } });
 
-  p.enableSelectedAttachedFilesAction->setIcon(QIcon::fromTheme(Q("checkbox")));
-  p.disableSelectedAttachedFilesAction->setIcon(QIcon::fromTheme(Q("checkbox-unchecked")));
-  p.enableAllAttachedFilesAction->setIcon(QIcon::fromTheme(Q("checkbox")));
-  p.disableAllAttachedFilesAction->setIcon(QIcon::fromTheme(Q("checkbox-unchecked")));
+  p.enableSelectedAttachedFilesAction->setIcon(QIcon::fromTheme(Q("dialog-ok-apply")));
+  p.disableSelectedAttachedFilesAction->setIcon(QIcon::fromTheme(Q("dialog-cancel")));
+  p.enableAllAttachedFilesAction->setIcon(QIcon::fromTheme(Q("dialog-ok-apply")));
+  p.disableAllAttachedFilesAction->setIcon(QIcon::fromTheme(Q("dialog-cancel")));
 
   p.addAttachmentsAction->setIcon(QIcon::fromTheme(Q("list-add")));
   p.removeAttachmentsAction->setIcon(QIcon::fromTheme(Q("list-remove")));
diff --git a/src/mkvtoolnix-gui/merge/input.cpp b/src/mkvtoolnix-gui/merge/input.cpp
index ab791f41a..f21e6d978 100644
--- a/src/mkvtoolnix-gui/merge/input.cpp
+++ b/src/mkvtoolnix-gui/merge/input.cpp
@@ -312,8 +312,8 @@ Tab::setupInputControls() {
   p.selectTracksOfTypeMenu->addAction(p.selectAllSubtitlesTracksAction);
 
   p.selectAllTracksAction->setIcon(QIcon::fromTheme(Q("edit-select-all")));
-  p.enableAllTracksAction->setIcon(QIcon::fromTheme(Q("checkbox")));
-  p.disableAllTracksAction->setIcon(QIcon::fromTheme(Q("checkbox-unchecked")));
+  p.enableAllTracksAction->setIcon(QIcon::fromTheme(Q("dialog-ok-apply")));
+  p.disableAllTracksAction->setIcon(QIcon::fromTheme(Q("dialog-cancel")));
   p.openTracksInMediaInfoAction->setIcon(QIcon::fromTheme(Q("documentinfo")));
 
   p.selectAllVideoTracksAction->setIcon(QIcon::fromTheme(Q("tool-animator")));
diff --git a/src/mkvtoolnix-gui/qt_resources.qrc b/src/mkvtoolnix-gui/qt_resources.qrc
index b18d236a7..8f07baafb 100644
--- a/src/mkvtoolnix-gui/qt_resources.qrc
+++ b/src/mkvtoolnix-gui/qt_resources.qrc
@@ -14,8 +14,6 @@
   <file alias='icons/mkvtoolnix-gui/128x128@2/mkvpropedit@2x.png'>../../share/icons/256x256/mkvpropedit.png</file>
   <file alias='icons/mkvtoolnix-gui/128x128/mkvtoolnix-gui.png'>../../share/icons/128x128/mkvtoolnix-gui.png</file>
   <file alias='icons/mkvtoolnix-gui/128x128@2/mkvtoolnix-gui@2x.png'>../../share/icons/256x256/mkvtoolnix-gui.png</file>
-  <file alias='icons/mkvtoolnix-gui/16x16/checkbox-unchecked.png'>../../share/icons/16x16/checkbox-unchecked.png</file>
-  <file alias='icons/mkvtoolnix-gui/16x16@2/checkbox-unchecked@2x.png'>../../share/icons/32x32/checkbox-unchecked.png</file>
   <file alias='icons/mkvtoolnix-gui/16x16/mkvextract.png'>../../share/icons/16x16/mkvextract.png</file>
   <file alias='icons/mkvtoolnix-gui/16x16@2/mkvextract@2x.png'>../../share/icons/32x32/mkvextract.png</file>
   <file alias='icons/mkvtoolnix-gui/16x16/mkvinfo.png'>../../share/icons/16x16/mkvinfo.png</file>
@@ -26,8 +24,6 @@
   <file alias='icons/mkvtoolnix-gui/16x16@2/mkvpropedit@2x.png'>../../share/icons/32x32/mkvpropedit.png</file>
   <file alias='icons/mkvtoolnix-gui/16x16/mkvtoolnix-gui.png'>../../share/icons/16x16/mkvtoolnix-gui.png</file>
   <file alias='icons/mkvtoolnix-gui/16x16@2/mkvtoolnix-gui@2x.png'>../../share/icons/32x32/mkvtoolnix-gui.png</file>
-  <file alias='icons/mkvtoolnix-gui/16x16/sort_ascending.png'>../../share/icons/16x16/sort_ascending.png</file>
-  <file alias='icons/mkvtoolnix-gui/16x16/sort_descending.png'>../../share/icons/16x16/sort_descending.png</file>
   <file alias='icons/mkvtoolnix-gui/24x24/mkvextract.png'>../../share/icons/24x24/mkvextract.png</file>
   <file alias='icons/mkvtoolnix-gui/24x24@2/mkvextract@2x.png'>../../share/icons/48x48/mkvextract.png</file>
   <file alias='icons/mkvtoolnix-gui/24x24/mkvinfo.png'>../../share/icons/24x24/mkvinfo.png</file>
@@ -43,7 +39,6 @@
   <file alias='icons/mkvtoolnix-gui/256x256/mkvmerge.png'>../../share/icons/256x256/mkvmerge.png</file>
   <file alias='icons/mkvtoolnix-gui/256x256/mkvpropedit.png'>../../share/icons/256x256/mkvpropedit.png</file>
   <file alias='icons/mkvtoolnix-gui/256x256/mkvtoolnix-gui.png'>../../share/icons/256x256/mkvtoolnix-gui.png</file>
-  <file alias='icons/mkvtoolnix-gui/32x32/checkbox-unchecked.png'>../../share/icons/32x32/checkbox-unchecked.png</file>
   <file alias='icons/mkvtoolnix-gui/32x32/mkvextract.png'>../../share/icons/32x32/mkvextract.png</file>
   <file alias='icons/mkvtoolnix-gui/32x32@2/mkvextract@2x.png'>../../share/icons/64x64/mkvextract.png</file>
   <file alias='icons/mkvtoolnix-gui/32x32/mkvinfo.png'>../../share/icons/32x32/mkvinfo.png</file>