diff --git a/AUTHORS b/AUTHORS
index 46dc371498d..a2d97aa2c22 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -466,4 +466,5 @@ Zhu Lei
 Дмитрий Старцев
 
 GUI graphics courtesy of Tango Desktop Project:
-http://tango.freedesktop.org
+https://gitlab.freedesktop.org/tango/tango-icon-theme
+https://commons.wikimedia.org/wiki/File:Refresh_file.svg
diff --git a/gui/gui.qrc b/gui/gui.qrc
index c40e1ba7a1c..e53ce8ad7d4 100644
--- a/gui/gui.qrc
+++ b/gui/gui.qrc
@@ -2,31 +2,67 @@
     <qresource prefix="/">
         <file>cppcheck-gui.png</file>
         <file>images/dialog-error.png</file>
+        <file>images/dialog-error@2x.png</file>
+        <file>images/dialog-error@3x.png</file>
         <file>images/dialog-information.png</file>
+        <file>images/dialog-information@2x.png</file>
+        <file>images/dialog-information@3x.png</file>
         <file>images/dialog-warning.png</file>
+        <file>images/dialog-warning@2x.png</file>
+        <file>images/dialog-warning@3x.png</file>
         <file>images/edit-clear.png</file>
+        <file>images/edit-clear@2x.png</file>
+        <file>images/edit-clear@3x.png</file>
         <file>images/go-down.png</file>
+        <file>images/go-down@2x.png</file>
+        <file>images/go-down@3x.png</file>
         <file>images/help-browser.png</file>
+        <file>images/help-browser@2x.png</file>
+        <file>images/help-browser@3x.png</file>
         <file>images/media-floppy.png</file>
+        <file>images/media-floppy@2x.png</file>
+        <file>images/media-floppy@3x.png</file>
         <file>images/preferences-system.png</file>
+        <file>images/preferences-system@2x.png</file>
+        <file>images/preferences-system@3x.png</file>
         <file>images/process-stop.png</file>
+        <file>images/process-stop@2x.png</file>
+        <file>images/process-stop@3x.png</file>
         <file>images/text-x-generic.png</file>
+        <file>images/text-x-generic@2x.png</file>
+        <file>images/text-x-generic@3x.png</file>
         <file>images/view-recheck.png</file>
-        <file>images/view-refresh.png</file>
-        <file>images/showerrors.png</file>
-        <file>images/showstylewarnings.png</file>
-        <file>images/openproject.png</file>
-        <file>images/scratchpad.png</file>
-        <file>images/showwarnings.png</file>
-        <file>images/showperformance.png</file>
+        <file>images/view-recheck@2x.png</file>
+        <file>images/view-recheck@3x.png</file>
+        <file>images/refresh-file.png</file>
+        <file>images/refresh-file@2x.png</file>
+        <file>images/refresh-file@3x.png</file>
+        <file>images/folder.png</file>
+        <file>images/folder@2x.png</file>
+        <file>images/folder@3x.png</file>
+        <file>images/accessories-text-editor.png</file>
+        <file>images/accessories-text-editor@2x.png</file>
+        <file>images/accessories-text-editor@3x.png</file>
         <file>images/utilities-system-monitor.png</file>
+        <file>images/utilities-system-monitor@2x.png</file>
+        <file>images/utilities-system-monitor@3x.png</file>
         <file alias="COPYING">../COPYING</file>
         <file alias="AUTHORS">../AUTHORS</file>
         <file>images/go-home.png</file>
+        <file>images/go-home@2x.png</file>
+        <file>images/go-home@3x.png</file>
         <file>images/go-next.png</file>
+        <file>images/go-next@2x.png</file>
+        <file>images/go-next@3x.png</file>
         <file>images/go-previous.png</file>
+        <file>images/go-previous@2x.png</file>
+        <file>images/go-previous@3x.png</file>
         <file>images/applications-development.png</file>
+        <file>images/applications-development@2x.png</file>
+        <file>images/applications-development@3x.png</file>
         <file>images/applications-system.png</file>
+        <file>images/applications-system@2x.png</file>
+        <file>images/applications-system@3x.png</file>
         <file>images/llvm-dragon.png</file>
         <file>images/verify.svg</file>
     </qresource>
diff --git a/gui/images/accessories-text-editor.png b/gui/images/accessories-text-editor.png
new file mode 100644
index 00000000000..c3d245dece9
Binary files /dev/null and b/gui/images/accessories-text-editor.png differ
diff --git a/gui/images/accessories-text-editor@2x.png b/gui/images/accessories-text-editor@2x.png
new file mode 100644
index 00000000000..4f98e727f4b
Binary files /dev/null and b/gui/images/accessories-text-editor@2x.png differ
diff --git a/gui/images/accessories-text-editor@3x.png b/gui/images/accessories-text-editor@3x.png
new file mode 100644
index 00000000000..a7ac91dbdca
Binary files /dev/null and b/gui/images/accessories-text-editor@3x.png differ
diff --git a/gui/images/applications-development@2x.png b/gui/images/applications-development@2x.png
new file mode 100644
index 00000000000..ffa971cf026
Binary files /dev/null and b/gui/images/applications-development@2x.png differ
diff --git a/gui/images/applications-development@3x.png b/gui/images/applications-development@3x.png
new file mode 100644
index 00000000000..c6af10a8c8c
Binary files /dev/null and b/gui/images/applications-development@3x.png differ
diff --git a/gui/images/applications-system@2x.png b/gui/images/applications-system@2x.png
new file mode 100644
index 00000000000..f4c85d6bf08
Binary files /dev/null and b/gui/images/applications-system@2x.png differ
diff --git a/gui/images/applications-system@3x.png b/gui/images/applications-system@3x.png
new file mode 100644
index 00000000000..d3e4bea5dd1
Binary files /dev/null and b/gui/images/applications-system@3x.png differ
diff --git a/gui/images/dialog-error@2x.png b/gui/images/dialog-error@2x.png
new file mode 100644
index 00000000000..7b35ae62b8f
Binary files /dev/null and b/gui/images/dialog-error@2x.png differ
diff --git a/gui/images/dialog-error@3x.png b/gui/images/dialog-error@3x.png
new file mode 100644
index 00000000000..bd56f682ca0
Binary files /dev/null and b/gui/images/dialog-error@3x.png differ
diff --git a/gui/images/dialog-information@2x.png b/gui/images/dialog-information@2x.png
new file mode 100644
index 00000000000..e5d60dfad0e
Binary files /dev/null and b/gui/images/dialog-information@2x.png differ
diff --git a/gui/images/dialog-information@3x.png b/gui/images/dialog-information@3x.png
new file mode 100644
index 00000000000..bd265a75c58
Binary files /dev/null and b/gui/images/dialog-information@3x.png differ
diff --git a/gui/images/dialog-warning@2x.png b/gui/images/dialog-warning@2x.png
new file mode 100644
index 00000000000..e4060e0d85f
Binary files /dev/null and b/gui/images/dialog-warning@2x.png differ
diff --git a/gui/images/dialog-warning@3x.png b/gui/images/dialog-warning@3x.png
new file mode 100644
index 00000000000..c9fb58eba39
Binary files /dev/null and b/gui/images/dialog-warning@3x.png differ
diff --git a/gui/images/edit-clear@2x.png b/gui/images/edit-clear@2x.png
new file mode 100644
index 00000000000..d3ac583ba79
Binary files /dev/null and b/gui/images/edit-clear@2x.png differ
diff --git a/gui/images/edit-clear@3x.png b/gui/images/edit-clear@3x.png
new file mode 100644
index 00000000000..0d9b8b928ca
Binary files /dev/null and b/gui/images/edit-clear@3x.png differ
diff --git a/gui/images/folder.png b/gui/images/folder.png
new file mode 100644
index 00000000000..01f45b82aa5
Binary files /dev/null and b/gui/images/folder.png differ
diff --git a/gui/images/folder@2x.png b/gui/images/folder@2x.png
new file mode 100644
index 00000000000..dc42da0508f
Binary files /dev/null and b/gui/images/folder@2x.png differ
diff --git a/gui/images/folder@3x.png b/gui/images/folder@3x.png
new file mode 100644
index 00000000000..0145b776055
Binary files /dev/null and b/gui/images/folder@3x.png differ
diff --git a/gui/images/go-down@2x.png b/gui/images/go-down@2x.png
new file mode 100644
index 00000000000..963fec7711e
Binary files /dev/null and b/gui/images/go-down@2x.png differ
diff --git a/gui/images/go-down@3x.png b/gui/images/go-down@3x.png
new file mode 100644
index 00000000000..7423b6ad889
Binary files /dev/null and b/gui/images/go-down@3x.png differ
diff --git a/gui/images/go-home@2x.png b/gui/images/go-home@2x.png
new file mode 100644
index 00000000000..4cb6b5e806d
Binary files /dev/null and b/gui/images/go-home@2x.png differ
diff --git a/gui/images/go-home@3x.png b/gui/images/go-home@3x.png
new file mode 100644
index 00000000000..0a3e9134507
Binary files /dev/null and b/gui/images/go-home@3x.png differ
diff --git a/gui/images/go-next@2x.png b/gui/images/go-next@2x.png
new file mode 100644
index 00000000000..2db28c810f1
Binary files /dev/null and b/gui/images/go-next@2x.png differ
diff --git a/gui/images/go-next@3x.png b/gui/images/go-next@3x.png
new file mode 100644
index 00000000000..5ab9353c318
Binary files /dev/null and b/gui/images/go-next@3x.png differ
diff --git a/gui/images/go-previous@2x.png b/gui/images/go-previous@2x.png
new file mode 100644
index 00000000000..d67aae9cb92
Binary files /dev/null and b/gui/images/go-previous@2x.png differ
diff --git a/gui/images/go-previous@3x.png b/gui/images/go-previous@3x.png
new file mode 100644
index 00000000000..1d2875d11b9
Binary files /dev/null and b/gui/images/go-previous@3x.png differ
diff --git a/gui/images/help-browser@2x.png b/gui/images/help-browser@2x.png
new file mode 100644
index 00000000000..3590ff11252
Binary files /dev/null and b/gui/images/help-browser@2x.png differ
diff --git a/gui/images/help-browser@3x.png b/gui/images/help-browser@3x.png
new file mode 100644
index 00000000000..9fd9898b829
Binary files /dev/null and b/gui/images/help-browser@3x.png differ
diff --git a/gui/images/media-floppy@2x.png b/gui/images/media-floppy@2x.png
new file mode 100644
index 00000000000..5222a17ecff
Binary files /dev/null and b/gui/images/media-floppy@2x.png differ
diff --git a/gui/images/media-floppy@3x.png b/gui/images/media-floppy@3x.png
new file mode 100644
index 00000000000..aaf5e1a03d2
Binary files /dev/null and b/gui/images/media-floppy@3x.png differ
diff --git a/gui/images/openproject.png b/gui/images/openproject.png
deleted file mode 100644
index 63df868d1e4..00000000000
Binary files a/gui/images/openproject.png and /dev/null differ
diff --git a/gui/images/preferences-system@2x.png b/gui/images/preferences-system@2x.png
new file mode 100644
index 00000000000..1903ab50f48
Binary files /dev/null and b/gui/images/preferences-system@2x.png differ
diff --git a/gui/images/preferences-system@3x.png b/gui/images/preferences-system@3x.png
new file mode 100644
index 00000000000..e9aa07dad70
Binary files /dev/null and b/gui/images/preferences-system@3x.png differ
diff --git a/gui/images/process-stop@2x.png b/gui/images/process-stop@2x.png
new file mode 100644
index 00000000000..2548cb73125
Binary files /dev/null and b/gui/images/process-stop@2x.png differ
diff --git a/gui/images/process-stop@3x.png b/gui/images/process-stop@3x.png
new file mode 100644
index 00000000000..9bc59b6af54
Binary files /dev/null and b/gui/images/process-stop@3x.png differ
diff --git a/gui/images/refresh-file.png b/gui/images/refresh-file.png
new file mode 100644
index 00000000000..ea2eae814dd
Binary files /dev/null and b/gui/images/refresh-file.png differ
diff --git a/gui/images/refresh-file@2x.png b/gui/images/refresh-file@2x.png
new file mode 100644
index 00000000000..48438c461e9
Binary files /dev/null and b/gui/images/refresh-file@2x.png differ
diff --git a/gui/images/refresh-file@3x.png b/gui/images/refresh-file@3x.png
new file mode 100644
index 00000000000..eed7540f6ae
Binary files /dev/null and b/gui/images/refresh-file@3x.png differ
diff --git a/gui/images/scratchpad.png b/gui/images/scratchpad.png
deleted file mode 100644
index 7495eca6479..00000000000
Binary files a/gui/images/scratchpad.png and /dev/null differ
diff --git a/gui/images/showerrors.png b/gui/images/showerrors.png
deleted file mode 100644
index 6bad55fbd4a..00000000000
Binary files a/gui/images/showerrors.png and /dev/null differ
diff --git a/gui/images/showperformance.png b/gui/images/showperformance.png
deleted file mode 100644
index ea9a1c8abce..00000000000
Binary files a/gui/images/showperformance.png and /dev/null differ
diff --git a/gui/images/showstylewarnings.png b/gui/images/showstylewarnings.png
deleted file mode 100644
index 70de0695f8c..00000000000
Binary files a/gui/images/showstylewarnings.png and /dev/null differ
diff --git a/gui/images/showwarnings.png b/gui/images/showwarnings.png
deleted file mode 100644
index 196884717cd..00000000000
Binary files a/gui/images/showwarnings.png and /dev/null differ
diff --git a/gui/images/text-x-generic@2x.png b/gui/images/text-x-generic@2x.png
new file mode 100644
index 00000000000..8d0bf4fb9c1
Binary files /dev/null and b/gui/images/text-x-generic@2x.png differ
diff --git a/gui/images/text-x-generic@3x.png b/gui/images/text-x-generic@3x.png
new file mode 100644
index 00000000000..fea2f3cd65b
Binary files /dev/null and b/gui/images/text-x-generic@3x.png differ
diff --git a/gui/images/utilities-system-monitor@2x.png b/gui/images/utilities-system-monitor@2x.png
new file mode 100644
index 00000000000..b0303db204c
Binary files /dev/null and b/gui/images/utilities-system-monitor@2x.png differ
diff --git a/gui/images/utilities-system-monitor@3x.png b/gui/images/utilities-system-monitor@3x.png
new file mode 100644
index 00000000000..bd1c41e011e
Binary files /dev/null and b/gui/images/utilities-system-monitor@3x.png differ
diff --git a/gui/images/view-recheck@2x.png b/gui/images/view-recheck@2x.png
new file mode 100644
index 00000000000..bcb08d91cac
Binary files /dev/null and b/gui/images/view-recheck@2x.png differ
diff --git a/gui/images/view-recheck@3x.png b/gui/images/view-recheck@3x.png
new file mode 100644
index 00000000000..6f1ac358f02
Binary files /dev/null and b/gui/images/view-recheck@3x.png differ
diff --git a/gui/images/view-refresh.png b/gui/images/view-refresh.png
deleted file mode 100644
index 5fadc405f86..00000000000
Binary files a/gui/images/view-refresh.png and /dev/null differ
diff --git a/gui/mainwindow.ui b/gui/mainwindow.ui
index 16577224874..33201f86c78 100644
--- a/gui/mainwindow.ui
+++ b/gui/mainwindow.ui
@@ -363,7 +363,7 @@
   <action name="mActionReanalyzeModified">
    <property name="icon">
     <iconset resource="gui.qrc">
-     <normaloff>:/images/view-refresh.png</normaloff>:/images/view-refresh.png</iconset>
+     <normaloff>:/images/refresh-file.png</normaloff>:/images/refresh-file.png</iconset>
    </property>
    <property name="text">
     <string>&amp;Reanalyze modified files</string>
@@ -461,7 +461,7 @@
    </property>
    <property name="icon">
     <iconset resource="gui.qrc">
-     <normaloff>:/images/showerrors.png</normaloff>:/images/showerrors.png</iconset>
+     <normaloff>:/images/dialog-error.png</normaloff>:/images/dialog-error.png</iconset>
    </property>
    <property name="text">
     <string>E&amp;rrors</string>
@@ -539,7 +539,7 @@
   <action name="mActionOpenProjectFile">
    <property name="icon">
     <iconset resource="gui.qrc">
-     <normaloff>:/images/openproject.png</normaloff>:/images/openproject.png</iconset>
+     <normaloff>:/images/folder.png</normaloff>:/images/folder.png</iconset>
    </property>
    <property name="text">
     <string>Open P&amp;roject File...</string>
@@ -551,7 +551,7 @@
   <action name="mActionShowScratchpad">
    <property name="icon">
     <iconset resource="gui.qrc">
-     <normaloff>:/images/scratchpad.png</normaloff>:/images/scratchpad.png</iconset>
+     <normaloff>:/images/accessories-text-editor.png</normaloff>:/images/accessories-text-editor.png</iconset>
    </property>
    <property name="text">
     <string>Sh&amp;ow Scratchpad...</string>
@@ -607,7 +607,7 @@
    </property>
    <property name="icon">
     <iconset resource="gui.qrc">
-     <normaloff>:/images/showwarnings.png</normaloff>:/images/showwarnings.png</iconset>
+     <normaloff>:/images/dialog-warning.png</normaloff>:/images/dialog-warning.png</iconset>
    </property>
    <property name="text">
     <string>&amp;Warnings</string>
@@ -625,7 +625,7 @@
    </property>
    <property name="icon">
     <iconset resource="gui.qrc">
-     <normaloff>:/images/showperformance.png</normaloff>:/images/showperformance.png</iconset>
+     <normaloff>:/images/utilities-system-monitor.png</normaloff>:/images/utilities-system-monitor.png</iconset>
    </property>
    <property name="text">
     <string>Per&amp;formance warnings</string>