diff --git a/dist/license.md b/dist/license.md
index bd3ffb4f19..b17979f048 100644
--- a/dist/license.md
+++ b/dist/license.md
@@ -7,23 +7,23 @@ qt_themes/default/icons/16x16/connected.png | CC BY-ND 3.0 | https://icons8.com
 qt_themes/default/icons/16x16/disconnected.png | CC BY-ND 3.0 | https://icons8.com
 qt_themes/default/icons/16x16/failed.png | Free for non-commercial use
 qt_themes/default/icons/16x16/lock.png | CC BY-ND 3.0 | https://icons8.com
-qt_themes/default/icons/256x256/plus_folder.png | CC0 1.0 | Designed by BreadFish64 from the Citra team
-qt_themes/default/icons/48x48/bad_folder.png | CC0 1.0 | Designed by BreadFish64 from the Citra team
-qt_themes/default/icons/48x48/chip.png | CC0 1.0 | Designed by BreadFish64 from the Citra team
-qt_themes/default/icons/48x48/folder.png | CC0 1.0 | Designed by BreadFish64 from the Citra team
-qt_themes/default/icons/48x48/plus.png | CC0 1.0 | Designed by BreadFish64 from the Citra team
-qt_themes/default/icons/48x48/sd_card.png | CC0 1.0 | Designed by BreadFish64 from the Citra team
+qt_themes/default/icons/256x256/plus_folder.png | CC BY-ND 3.0 | https://icons8.com
+qt_themes/default/icons/48x48/bad_folder.png | CC BY-ND 3.0 | https://icons8.com
+qt_themes/default/icons/48x48/chip.png | CC BY-ND 3.0 | https://icons8.com
+qt_themes/default/icons/48x48/folder.png | CC BY-ND 3.0 | https://icons8.com
+qt_themes/default/icons/48x48/plus.png | CC BY-ND 3.0 | https://icons8.com
+qt_themes/default/icons/48x48/sd_card.png | CC BY-ND 3.0 | https://icons8.com
 qt_themes/qdarkstyle/icons/16x16/checked.png | Free for non-commercial use
 qt_themes/qdarkstyle/icons/16x16/connected.png | CC BY-ND 3.0 | https://icons8.com
 qt_themes/qdarkstyle/icons/16x16/disconnected.png | CC BY-ND 3.0 | https://icons8.com
 qt_themes/qdarkstyle/icons/16x16/failed.png | Free for non-commercial use
 qt_themes/qdarkstyle/icons/16x16/lock.png | CC BY-ND 3.0 | https://icons8.com
-qt_themes/qdarkstyle/icons/256x256/plus_folder.png | CC0 1.0 | Designed by BreadFish64 from the Citra team
-qt_themes/qdarkstyle/icons/48x48/bad_folder.png | CC0 1.0 | Designed by BreadFish64 from the Citra team
-qt_themes/qdarkstyle/icons/48x48/chip.png | CC0 1.0 | Designed by BreadFish64 from the Citra team
-qt_themes/qdarkstyle/icons/48x48/folder.png | CC0 1.0 | Designed by BreadFish64 from the Citra team
-qt_themes/qdarkstyle/icons/48x48/plus.png | CC0 1.0 | Designed by BreadFish64 from the Citra team
-qt_themes/qdarkstyle/icons/48x48/sd_card.png | CC0 1.0 | Designed by BreadFish64 from the Citra team
+qt_themes/qdarkstyle/icons/256x256/plus_folder.png | CC BY-ND 3.0 | https://icons8.com
+qt_themes/qdarkstyle/icons/48x48/bad_folder.png | CC BY-ND 3.0 | https://icons8.com
+qt_themes/qdarkstyle/icons/48x48/chip.png | CC BY-ND 3.0 | https://icons8.com
+qt_themes/qdarkstyle/icons/48x48/folder.png | CC BY-ND 3.0 | https://icons8.com
+qt_themes/qdarkstyle/icons/48x48/plus.png | CC BY-ND 3.0 | https://icons8.com
+qt_themes/qdarkstyle/icons/48x48/sd_card.png | CC BY-ND 3.0 | https://icons8.com
 qt_themes/colorful/icons/16x16/connected.png | CC BY-ND 3.0 | https://icons8.com
 qt_themes/colorful/icons/16x16/disconnected.png | CC BY-ND 3.0 | https://icons8.com
 qt_themes/colorful/icons/16x16/lock.png | CC BY-ND 3.0 | https://icons8.com
diff --git a/dist/qt_themes/default/icons/256x256/plus_folder.png b/dist/qt_themes/default/icons/256x256/plus_folder.png
index 5822f34c59..ae4afccc76 100644
Binary files a/dist/qt_themes/default/icons/256x256/plus_folder.png and b/dist/qt_themes/default/icons/256x256/plus_folder.png differ
diff --git a/dist/qt_themes/default/icons/48x48/bad_folder.png b/dist/qt_themes/default/icons/48x48/bad_folder.png
index 32e5bffc22..2527c13185 100644
Binary files a/dist/qt_themes/default/icons/48x48/bad_folder.png and b/dist/qt_themes/default/icons/48x48/bad_folder.png differ
diff --git a/dist/qt_themes/default/icons/48x48/chip.png b/dist/qt_themes/default/icons/48x48/chip.png
index d07a85aca4..3efdf301eb 100644
Binary files a/dist/qt_themes/default/icons/48x48/chip.png and b/dist/qt_themes/default/icons/48x48/chip.png differ
diff --git a/dist/qt_themes/default/icons/48x48/folder.png b/dist/qt_themes/default/icons/48x48/folder.png
index 3fb82f3ae3..2e67d8b38f 100644
Binary files a/dist/qt_themes/default/icons/48x48/folder.png and b/dist/qt_themes/default/icons/48x48/folder.png differ
diff --git a/dist/qt_themes/default/icons/48x48/sd_card.png b/dist/qt_themes/default/icons/48x48/sd_card.png
index 3226347e27..edacaeeb56 100644
Binary files a/dist/qt_themes/default/icons/48x48/sd_card.png and b/dist/qt_themes/default/icons/48x48/sd_card.png differ
diff --git a/dist/qt_themes/qdarkstyle/icons/256x256/plus_folder.png b/dist/qt_themes/qdarkstyle/icons/256x256/plus_folder.png
index d26c08d6b8..303f9a3218 100644
Binary files a/dist/qt_themes/qdarkstyle/icons/256x256/plus_folder.png and b/dist/qt_themes/qdarkstyle/icons/256x256/plus_folder.png differ
diff --git a/dist/qt_themes/qdarkstyle/icons/48x48/bad_folder.png b/dist/qt_themes/qdarkstyle/icons/48x48/bad_folder.png
index f7f3830898..4a97096234 100644
Binary files a/dist/qt_themes/qdarkstyle/icons/48x48/bad_folder.png and b/dist/qt_themes/qdarkstyle/icons/48x48/bad_folder.png differ
diff --git a/dist/qt_themes/qdarkstyle/icons/48x48/chip.png b/dist/qt_themes/qdarkstyle/icons/48x48/chip.png
index f1fa5020a3..973fabd052 100644
Binary files a/dist/qt_themes/qdarkstyle/icons/48x48/chip.png and b/dist/qt_themes/qdarkstyle/icons/48x48/chip.png differ
diff --git a/dist/qt_themes/qdarkstyle/icons/48x48/folder.png b/dist/qt_themes/qdarkstyle/icons/48x48/folder.png
index dee3078d55..0f1e987d6a 100644
Binary files a/dist/qt_themes/qdarkstyle/icons/48x48/folder.png and b/dist/qt_themes/qdarkstyle/icons/48x48/folder.png differ
diff --git a/dist/qt_themes/qdarkstyle/icons/48x48/sd_card.png b/dist/qt_themes/qdarkstyle/icons/48x48/sd_card.png
index 9052ae794e..0291c6542d 100644
Binary files a/dist/qt_themes/qdarkstyle/icons/48x48/sd_card.png and b/dist/qt_themes/qdarkstyle/icons/48x48/sd_card.png differ
diff --git a/license.txt b/license.txt
index c23f25863c..aa07490b9a 100644
--- a/license.txt
+++ b/license.txt
@@ -341,26 +341,16 @@ Public License instead of this License.
 
 The icons used in this project have the following licenses:
 
-Icon Name (Themes they are used in)         | License       | Origin/Author
----                                         | ---           | ---
-checked.png                                 | Free for non-commercial use
-connected.png                               | CC BY-ND 3.0  | https://icons8.com
-disconnected.png                            | CC BY-ND 3.0  | https://icons8.com
-failed.png                                  | Free for non-commercial use
-lock.png                                    | CC BY-ND 3.0  | https://icons8.com
-plus_folder.png (Default, Dark)             | CC0 1.0       | Designed by BreadFish64 from the Citra team
-bad_folder.png (Default, Dark)              | CC0 1.0       | Designed by BreadFish64 from the Citra team
-chip.png (Default, Dark)                    | CC0 1.0       | Designed by BreadFish64 from the Citra team
-folder.png (Default, Dark)                  | CC0 1.0       | Designed by BreadFish64 from the Citra team
-plus.png (Default, Dark)                    | CC0 1.0       | Designed by BreadFish64 from the Citra team
-sd_card.png (Default, Dark)                 | CC0 1.0       | Designed by BreadFish64 from the Citra team
-plus_folder.png (Colorful, Colorful Dark)   | CC BY-ND 3.0  | https://icons8.com
-bad_folder.png (Colorful, Colorful Dark)    | CC BY-ND 3.0  | https://icons8.com
-chip.png (Colorful, Colorful Dark)          | CC BY-ND 3.0  | https://icons8.com
-folder.png (Colorful, Colorful Dark)        | CC BY-ND 3.0  | https://icons8.com
-plus.png (Colorful, Colorful Dark)          | CC BY-ND 3.0  | https://icons8.com
-sd_card.png (Colorful, Colorful Dark)       | CC BY-ND 3.0  | https://icons8.com
-
-Note:
-Some icons are different in different themes, and they are separately listed
-only when they have different licenses/origins.
+Icon Name         | License       | Origin/Author
+---               | ---           | ---
+checked.png       | Free for non-commercial use
+connected.png     | CC BY-ND 3.0  | https://icons8.com
+disconnected.png  | CC BY-ND 3.0  | https://icons8.com
+failed.png        | Free for non-commercial use
+lock.png          | CC BY-ND 3.0  | https://icons8.com
+plus_folder.png   | CC BY-ND 3.0  | https://icons8.com
+bad_folder.png    | CC BY-ND 3.0  | https://icons8.com
+chip.png          | CC BY-ND 3.0  | https://icons8.com
+folder.png        | CC BY-ND 3.0  | https://icons8.com
+plus.png          | CC BY-ND 3.0  | https://icons8.com
+sd_card.png       | CC BY-ND 3.0  | https://icons8.com