diff --git a/rpcs3/Icons/copy_blue.png b/rpcs3/Icons/copy_blue.png
deleted file mode 100644
index 102e2a556..000000000
Binary files a/rpcs3/Icons/copy_blue.png and /dev/null differ
diff --git a/rpcs3/Icons/copy_gray.png b/rpcs3/Icons/copy_gray.png
deleted file mode 100644
index d772a9219..000000000
Binary files a/rpcs3/Icons/copy_gray.png and /dev/null differ
diff --git a/rpcs3/Icons/data_blue.png b/rpcs3/Icons/data_blue.png
new file mode 100644
index 000000000..2f5a3cc6c
Binary files /dev/null and b/rpcs3/Icons/data_blue.png differ
diff --git a/rpcs3/Icons/data_gray.png b/rpcs3/Icons/data_gray.png
new file mode 100644
index 000000000..7ebfc5dbd
Binary files /dev/null and b/rpcs3/Icons/data_gray.png differ
diff --git a/rpcs3/Icons/disc_blue.png b/rpcs3/Icons/disc_blue.png
index ad24df1f1..52ecc0295 100644
Binary files a/rpcs3/Icons/disc_blue.png and b/rpcs3/Icons/disc_blue.png differ
diff --git a/rpcs3/Icons/disc_gray.png b/rpcs3/Icons/disc_gray.png
index d7b4158fd..928b46583 100644
Binary files a/rpcs3/Icons/disc_gray.png and b/rpcs3/Icons/disc_gray.png differ
diff --git a/rpcs3/Icons/grid_blue.png b/rpcs3/Icons/grid_blue.png
index 45a000ff9..7de38e176 100644
Binary files a/rpcs3/Icons/grid_blue.png and b/rpcs3/Icons/grid_blue.png differ
diff --git a/rpcs3/Icons/grid_gray.png b/rpcs3/Icons/grid_gray.png
index ebbf6a73c..c0521933c 100644
Binary files a/rpcs3/Icons/grid_gray.png and b/rpcs3/Icons/grid_gray.png differ
diff --git a/rpcs3/Icons/harddisk_blue.png b/rpcs3/Icons/harddisk_blue.png
deleted file mode 100644
index 60a6d4158..000000000
Binary files a/rpcs3/Icons/harddisk_blue.png and /dev/null differ
diff --git a/rpcs3/Icons/harddisk_gray.png b/rpcs3/Icons/harddisk_gray.png
deleted file mode 100644
index 52ec3cea1..000000000
Binary files a/rpcs3/Icons/harddisk_gray.png and /dev/null differ
diff --git a/rpcs3/Icons/hdd_blue.png b/rpcs3/Icons/hdd_blue.png
new file mode 100644
index 000000000..b260f7bd1
Binary files /dev/null and b/rpcs3/Icons/hdd_blue.png differ
diff --git a/rpcs3/Icons/hdd_gray.png b/rpcs3/Icons/hdd_gray.png
new file mode 100644
index 000000000..8bef5dfbf
Binary files /dev/null and b/rpcs3/Icons/hdd_gray.png differ
diff --git a/rpcs3/Icons/home_blue.png b/rpcs3/Icons/home_blue.png
index 2d36a10d7..aaf8ffb1d 100644
Binary files a/rpcs3/Icons/home_blue.png and b/rpcs3/Icons/home_blue.png differ
diff --git a/rpcs3/Icons/home_gray.png b/rpcs3/Icons/home_gray.png
index b4986d97e..6ec78bc2e 100644
Binary files a/rpcs3/Icons/home_gray.png and b/rpcs3/Icons/home_gray.png differ
diff --git a/rpcs3/Icons/info_blue.png b/rpcs3/Icons/info_blue.png
deleted file mode 100644
index f69d308fd..000000000
Binary files a/rpcs3/Icons/info_blue.png and /dev/null differ
diff --git a/rpcs3/Icons/info_gray.png b/rpcs3/Icons/info_gray.png
deleted file mode 100644
index 7e8afc3d4..000000000
Binary files a/rpcs3/Icons/info_gray.png and /dev/null differ
diff --git a/rpcs3/Icons/list_blue.png b/rpcs3/Icons/list_blue.png
index f0ea40b13..994efaf5e 100644
Binary files a/rpcs3/Icons/list_blue.png and b/rpcs3/Icons/list_blue.png differ
diff --git a/rpcs3/Icons/list_gray.png b/rpcs3/Icons/list_gray.png
index 7e17b4fc4..10de9c9e9 100644
Binary files a/rpcs3/Icons/list_gray.png and b/rpcs3/Icons/list_gray.png differ
diff --git a/rpcs3/Icons/media_blue.png b/rpcs3/Icons/media_blue.png
index 7b64e4e97..ade4ead89 100644
Binary files a/rpcs3/Icons/media_blue.png and b/rpcs3/Icons/media_blue.png differ
diff --git a/rpcs3/Icons/media_gray.png b/rpcs3/Icons/media_gray.png
index 6ee3aed90..d3068d272 100644
Binary files a/rpcs3/Icons/media_gray.png and b/rpcs3/Icons/media_gray.png differ
diff --git a/rpcs3/Icons/unknown_blue.png b/rpcs3/Icons/unknown_blue.png
new file mode 100644
index 000000000..b39a47f32
Binary files /dev/null and b/rpcs3/Icons/unknown_blue.png differ
diff --git a/rpcs3/Icons/unknown_gray.png b/rpcs3/Icons/unknown_gray.png
new file mode 100644
index 000000000..e76819f5c
Binary files /dev/null and b/rpcs3/Icons/unknown_gray.png differ
diff --git a/rpcs3/resources.qrc b/rpcs3/resources.qrc
index 03214a22d..99d1d76dd 100644
--- a/rpcs3/resources.qrc
+++ b/rpcs3/resources.qrc
@@ -5,21 +5,21 @@
         <file>Icons/restart.png</file>
         <file>Icons/stop.png</file>
         <file>rpcs3.ico</file>
-        <file>Icons/copy_blue.png</file>
+        <file>Icons/data_blue.png</file>
+        <file>Icons/data_gray.png</file>
         <file>Icons/disc_blue.png</file>
-        <file>Icons/grid_blue.png</file>
-        <file>Icons/harddisk_blue.png</file>
-        <file>Icons/home_blue.png</file>
-        <file>Icons/info_blue.png</file>
-        <file>Icons/list_blue.png</file>
-        <file>Icons/media_blue.png</file>
-        <file>Icons/copy_gray.png</file>
         <file>Icons/disc_gray.png</file>
+        <file>Icons/grid_blue.png</file>
         <file>Icons/grid_gray.png</file>
-        <file>Icons/harddisk_gray.png</file>
+        <file>Icons/hdd_blue.png</file>
+        <file>Icons/hdd_gray.png</file>
+        <file>Icons/home_blue.png</file>
         <file>Icons/home_gray.png</file>
-        <file>Icons/info_gray.png</file>
+        <file>Icons/list_blue.png</file>
         <file>Icons/list_gray.png</file>
+        <file>Icons/media_blue.png</file>
         <file>Icons/media_gray.png</file>
+        <file>Icons/unknown_blue.png</file>
+        <file>Icons/unknown_gray.png</file>
     </qresource>
 </RCC>
diff --git a/rpcs3/rpcs3qt/game_list_frame.cpp b/rpcs3/rpcs3qt/game_list_frame.cpp
index 6c1f81fce..1d48476fb 100644
--- a/rpcs3/rpcs3qt/game_list_frame.cpp
+++ b/rpcs3/rpcs3qt/game_list_frame.cpp
@@ -58,9 +58,10 @@ game_list_frame::game_list_frame(std::shared_ptr<gui_settings> settings, Render_
 	m_Tool_Bar = new QToolBar(m_Game_Dock);
 	m_Tool_Bar->setMovable(false);
 	m_Tool_Bar->setVisible(m_showToolBar);
+	m_Tool_Bar->setContextMenuPolicy(Qt::PreventContextMenu);
 
 	// ToolBar Actions
-	m_catActHDD = { new QAction(""), QIcon(":/Icons/harddisk_blue.png"), QIcon(":/Icons/harddisk_gray.png") };
+	m_catActHDD = { new QAction(""), QIcon(":/Icons/hdd_blue.png"), QIcon(":/Icons/hdd_gray.png") };
 	m_catActHDD.action->setIcon(xgui_settings->GetValue(GUI::cat_hdd_game).toBool() ? m_catActHDD.colored : m_catActHDD.gray);
 	m_catActHDD.action->setToolTip(tr("Show HDD Category"));
 
@@ -76,11 +77,11 @@ game_list_frame::game_list_frame(std::shared_ptr<gui_settings> settings, Render_
 	m_catActAudioVideo.action->setIcon(xgui_settings->GetValue(GUI::cat_audio_video).toBool() ? m_catActAudioVideo.colored : m_catActAudioVideo.gray);
 	m_catActAudioVideo.action->setToolTip(tr("Show Audio/Video Category"));
 
-	m_catActGameData = { new QAction(""), QIcon(":/Icons/copy_blue.png"), QIcon(":/Icons/copy_gray.png") };
+	m_catActGameData = { new QAction(""), QIcon(":/Icons/data_blue.png"), QIcon(":/Icons/data_gray.png") };
 	m_catActGameData.action->setIcon(xgui_settings->GetValue(GUI::cat_game_data).toBool() ? m_catActGameData.colored : m_catActGameData.gray);
 	m_catActGameData.action->setToolTip(tr("Show GameData Category"));
 
-	m_catActUnknown = { new QAction(""), QIcon(":/Icons/info_blue.png"), QIcon(":/Icons/info_gray.png") };
+	m_catActUnknown = { new QAction(""), QIcon(":/Icons/unknown_blue.png"), QIcon(":/Icons/unknown_gray.png") };
 	m_catActUnknown.action->setIcon(xgui_settings->GetValue(GUI::cat_unknown).toBool() ? m_catActUnknown.colored : m_catActUnknown.gray);
 	m_catActUnknown.action->setToolTip(tr("Show Unknown Category"));