diff --git a/icons/cat_emulation_and_games.png b/icons/cat_emulation_and_games.png
new file mode 100755
index 0000000..bf65d69
Binary files /dev/null and b/icons/cat_emulation_and_games.png differ
diff --git a/icons/cat_media_players.png b/icons/cat_media_players.png
new file mode 100755
index 0000000..d93b9ec
Binary files /dev/null and b/icons/cat_media_players.png differ
diff --git a/icons/cat_misc_utility_images.png b/icons/cat_misc_utility_images.png
new file mode 100755
index 0000000..324bc27
Binary files /dev/null and b/icons/cat_misc_utility_images.png differ
diff --git a/icons/cat_other_general_purpose_operating_systems.png b/icons/cat_other_general_purpose_operating_systems.png
new file mode 100755
index 0000000..20804de
Binary files /dev/null and b/icons/cat_other_general_purpose_operating_systems.png differ
diff --git a/icons/cat_other_specific_purpose_operating_systems.png b/icons/cat_other_specific_purpose_operating_systems.png
new file mode 100755
index 0000000..c7576bb
Binary files /dev/null and b/icons/cat_other_specific_purpose_operating_systems.png differ
diff --git a/icons/cat_raspberry_pi_os.png b/icons/cat_raspberry_pi_os.png
new file mode 100755
index 0000000..8331159
Binary files /dev/null and b/icons/cat_raspberry_pi_os.png differ
diff --git a/icons/erase.png b/icons/erase.png
new file mode 100755
index 0000000..495dd73
Binary files /dev/null and b/icons/erase.png differ
diff --git a/icons/ic_build_40px.svg b/icons/ic_build_40px.svg
deleted file mode 100644
index e414923..0000000
--- a/icons/ic_build_40px.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="40pt" height="40pt" viewBox="0 0 40 40" version="1.1">
-<g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;" d="M 37.832031 31.582031 L 22.582031 16.332031 C 24.082031 12.5 23.25 7.917969 20.167969 4.832031 C 16.832031 1.5 11.832031 0.832031 7.832031 2.75 L 15.082031 10 L 10 15.082031 L 2.75 7.832031 C 0.832031 11.832031 1.5 16.832031 4.832031 20.167969 C 7.917969 23.25 12.5 24.082031 16.332031 22.582031 L 31.582031 37.832031 C 32.25 38.5 33.332031 38.5 33.917969 37.832031 L 37.832031 33.917969 C 38.5 33.332031 38.5 32.25 37.832031 31.582031 Z M 37.832031 31.582031 "/>
-</g>
-</svg>
diff --git a/icons/ic_computer_40px.svg b/icons/ic_computer_40px.svg
deleted file mode 100644
index e92b53c..0000000
--- a/icons/ic_computer_40px.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="40pt" height="40pt" viewBox="0 0 40 40" version="1.1">
-<g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;" d="M 33.332031 30 C 35.175781 30 36.648438 28.507812 36.648438 26.667969 L 36.667969 10 C 36.667969 8.160156 35.175781 6.667969 33.332031 6.667969 L 6.667969 6.667969 C 4.824219 6.667969 3.332031 8.160156 3.332031 10 L 3.332031 26.667969 C 3.332031 28.507812 4.824219 30 6.667969 30 L 0 30 L 0 33.332031 L 40 33.332031 L 40 30 Z M 6.667969 10 L 33.332031 10 L 33.332031 26.667969 L 6.667969 26.667969 Z M 6.667969 10 "/>
-</g>
-</svg>
diff --git a/icons/use_custom.png b/icons/use_custom.png
new file mode 100755
index 0000000..4141479
Binary files /dev/null and b/icons/use_custom.png differ
diff --git a/main.qml b/main.qml
index ba3980d..99e8f27 100644
--- a/main.qml
+++ b/main.qml
@@ -390,7 +390,7 @@ ApplicationWindow {
 
         ListElement {
             url: "internal://format"
-            icon: "icons/ic_delete_40px.svg"
+            icon: "icons/erase.png"
             extract_size: 0
             image_download_size: 0
             extract_sha256: ""
@@ -405,7 +405,7 @@ ApplicationWindow {
 
         ListElement {
             url: ""
-            icon: "icons/ic_computer_40px.svg"
+            icon: "icons/use_custom.png"
             name: qsTr("Use custom")
             description: qsTr("Select a custom .img from your computer")
         }
@@ -447,7 +447,7 @@ ApplicationWindow {
                     width: 64
 
                     Image {
-                        source: icon == "icons/ic_build_48px.svg" ? "icons/ic_build_40px.svg": icon
+                        source: icon == "icons/ic_build_48px.svg" ? "icons/cat_misc_utility_images.png": icon
                         verticalAlignment: Image.AlignVCenter
                         height: parent.parent.parent.height
                         fillMode: Image.Pad
diff --git a/qml.qrc b/qml.qrc
index bf966b5..2339a5b 100644
--- a/qml.qrc
+++ b/qml.qrc
@@ -8,14 +8,19 @@
         <file>fonts/Roboto-Light.ttf</file>
         <file>fonts/Roboto-Regular.ttf</file>
         <file>icons/rpi2-hires.png</file>
-        <file>icons/ic_build_40px.svg</file>
         <file>icons/ic_chevron_left_40px.svg</file>
         <file>icons/ic_chevron_right_40px.svg</file>
-        <file>icons/ic_computer_40px.svg</file>
-        <file>icons/ic_delete_40px.svg</file>
         <file>icons/ic_sd_storage_40px.svg</file>
         <file>icons/ic_storage_40px.svg</file>
         <file>icons/ic_usb_40px.svg</file>
         <file>MsgPopup.qml</file>
+        <file>icons/use_custom.png</file>
+        <file>icons/erase.png</file>
+        <file>icons/cat_raspberry_pi_os.png</file>
+        <file>icons/cat_other_specific_purpose_operating_systems.png</file>
+        <file>icons/cat_other_general_purpose_operating_systems.png</file>
+        <file>icons/cat_misc_utility_images.png</file>
+        <file>icons/cat_media_players.png</file>
+        <file>icons/cat_emulation_and_games.png</file>
     </qresource>
 </RCC>