diff --git a/gtk-3.0/assets/checkbox-checked-dark.png b/gtk-3.0/assets/checkbox-checked-dark.png
index 8d3df52..2b495bc 100644
Binary files a/gtk-3.0/assets/checkbox-checked-dark.png and b/gtk-3.0/assets/checkbox-checked-dark.png differ
diff --git a/gtk-3.0/assets/checkbox-checked-dark.svg b/gtk-3.0/assets/checkbox-checked-dark.svg
deleted file mode 100644
index 2aaeaa6..0000000
--- a/gtk-3.0/assets/checkbox-checked-dark.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/gtk-3.0/assets/checkbox-checked-insensitive-dark.png b/gtk-3.0/assets/checkbox-checked-insensitive-dark.png
index bd03ec9..553a6de 100644
Binary files a/gtk-3.0/assets/checkbox-checked-insensitive-dark.png and b/gtk-3.0/assets/checkbox-checked-insensitive-dark.png differ
diff --git a/gtk-3.0/assets/checkbox-checked-insensitive-dark.svg b/gtk-3.0/assets/checkbox-checked-insensitive-dark.svg
deleted file mode 100644
index c3219e2..0000000
--- a/gtk-3.0/assets/checkbox-checked-insensitive-dark.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-
diff --git a/gtk-3.0/assets/checkbox-checked-insensitive.png b/gtk-3.0/assets/checkbox-checked-insensitive.png
index e73b148..6efccce 100644
Binary files a/gtk-3.0/assets/checkbox-checked-insensitive.png and b/gtk-3.0/assets/checkbox-checked-insensitive.png differ
diff --git a/gtk-3.0/assets/checkbox-checked-insensitive.svg b/gtk-3.0/assets/checkbox-checked-insensitive.svg
deleted file mode 100644
index 4dbe967..0000000
--- a/gtk-3.0/assets/checkbox-checked-insensitive.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-
diff --git a/gtk-3.0/assets/checkbox-checked.png b/gtk-3.0/assets/checkbox-checked.png
index 8d3df52..2ee27cf 100644
Binary files a/gtk-3.0/assets/checkbox-checked.png and b/gtk-3.0/assets/checkbox-checked.png differ
diff --git a/gtk-3.0/assets/checkbox-checked.svg b/gtk-3.0/assets/checkbox-checked.svg
deleted file mode 100644
index 0a5e5a5..0000000
--- a/gtk-3.0/assets/checkbox-checked.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/gtk-3.0/assets/checkbox-mixed-dark.png b/gtk-3.0/assets/checkbox-mixed-dark.png
index 080fdfa..4d0f44b 100644
Binary files a/gtk-3.0/assets/checkbox-mixed-dark.png and b/gtk-3.0/assets/checkbox-mixed-dark.png differ
diff --git a/gtk-3.0/assets/checkbox-mixed-dark.svg b/gtk-3.0/assets/checkbox-mixed-dark.svg
deleted file mode 100644
index 5765056..0000000
--- a/gtk-3.0/assets/checkbox-mixed-dark.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/gtk-3.0/assets/checkbox-mixed-insensitive-dark.png b/gtk-3.0/assets/checkbox-mixed-insensitive-dark.png
index 3646c7d..7a4c582 100644
Binary files a/gtk-3.0/assets/checkbox-mixed-insensitive-dark.png and b/gtk-3.0/assets/checkbox-mixed-insensitive-dark.png differ
diff --git a/gtk-3.0/assets/checkbox-mixed-insensitive-dark.svg b/gtk-3.0/assets/checkbox-mixed-insensitive-dark.svg
deleted file mode 100644
index 27e0ef1..0000000
--- a/gtk-3.0/assets/checkbox-mixed-insensitive-dark.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-
diff --git a/gtk-3.0/assets/checkbox-mixed-insensitive.png b/gtk-3.0/assets/checkbox-mixed-insensitive.png
index f6ef803..507c631 100644
Binary files a/gtk-3.0/assets/checkbox-mixed-insensitive.png and b/gtk-3.0/assets/checkbox-mixed-insensitive.png differ
diff --git a/gtk-3.0/assets/checkbox-mixed-insensitive.svg b/gtk-3.0/assets/checkbox-mixed-insensitive.svg
deleted file mode 100644
index d408465..0000000
--- a/gtk-3.0/assets/checkbox-mixed-insensitive.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-
diff --git a/gtk-3.0/assets/checkbox-mixed.png b/gtk-3.0/assets/checkbox-mixed.png
index 080fdfa..5402f14 100644
Binary files a/gtk-3.0/assets/checkbox-mixed.png and b/gtk-3.0/assets/checkbox-mixed.png differ
diff --git a/gtk-3.0/assets/checkbox-mixed.svg b/gtk-3.0/assets/checkbox-mixed.svg
deleted file mode 100644
index 414f2f2..0000000
--- a/gtk-3.0/assets/checkbox-mixed.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/gtk-3.0/assets/checkbox-radiobox-assets.svg b/gtk-3.0/assets/checkbox-radiobox-assets.svg
new file mode 100644
index 0000000..49fa651
--- /dev/null
+++ b/gtk-3.0/assets/checkbox-radiobox-assets.svg
@@ -0,0 +1,736 @@
+
+
+
+
diff --git a/gtk-3.0/assets/checkbox-unchecked-dark.png b/gtk-3.0/assets/checkbox-unchecked-dark.png
index 439d96e..3a9ca2d 100644
Binary files a/gtk-3.0/assets/checkbox-unchecked-dark.png and b/gtk-3.0/assets/checkbox-unchecked-dark.png differ
diff --git a/gtk-3.0/assets/checkbox-unchecked-dark.svg b/gtk-3.0/assets/checkbox-unchecked-dark.svg
deleted file mode 100644
index 36eeb4d..0000000
--- a/gtk-3.0/assets/checkbox-unchecked-dark.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
diff --git a/gtk-3.0/assets/checkbox-unchecked-insensitive-dark.png b/gtk-3.0/assets/checkbox-unchecked-insensitive-dark.png
index 123b3c1..f8bc044 100644
Binary files a/gtk-3.0/assets/checkbox-unchecked-insensitive-dark.png and b/gtk-3.0/assets/checkbox-unchecked-insensitive-dark.png differ
diff --git a/gtk-3.0/assets/checkbox-unchecked-insensitive-dark.svg b/gtk-3.0/assets/checkbox-unchecked-insensitive-dark.svg
deleted file mode 100644
index 3488e66..0000000
--- a/gtk-3.0/assets/checkbox-unchecked-insensitive-dark.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
diff --git a/gtk-3.0/assets/checkbox-unchecked-insensitive.png b/gtk-3.0/assets/checkbox-unchecked-insensitive.png
index b3f42cf..3699617 100644
Binary files a/gtk-3.0/assets/checkbox-unchecked-insensitive.png and b/gtk-3.0/assets/checkbox-unchecked-insensitive.png differ
diff --git a/gtk-3.0/assets/checkbox-unchecked-insensitive.svg b/gtk-3.0/assets/checkbox-unchecked-insensitive.svg
deleted file mode 100644
index f90aa4c..0000000
--- a/gtk-3.0/assets/checkbox-unchecked-insensitive.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
diff --git a/gtk-3.0/assets/checkbox-unchecked.png b/gtk-3.0/assets/checkbox-unchecked.png
index 6a03e25..2fafec2 100644
Binary files a/gtk-3.0/assets/checkbox-unchecked.png and b/gtk-3.0/assets/checkbox-unchecked.png differ
diff --git a/gtk-3.0/assets/checkbox-unchecked.svg b/gtk-3.0/assets/checkbox-unchecked.svg
deleted file mode 100644
index 06176e3..0000000
--- a/gtk-3.0/assets/checkbox-unchecked.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
diff --git a/gtk-3.0/assets/generate-assets.sh b/gtk-3.0/assets/generate-assets.sh
new file mode 100755
index 0000000..9069115
--- /dev/null
+++ b/gtk-3.0/assets/generate-assets.sh
@@ -0,0 +1,79 @@
+#!/bin/bash
+
+RED=$(tput setaf 1)
+GREEN=$(tput setaf 2)
+BOLD=$(tput bold)
+NORMAL=$(tput sgr0)
+
+echo -en ${NORMAL}
+
+function export_asset {
+ case "$1" in
+ checkbox-*.png|radio-*.png)
+ # Available in checkbox-radiobox-assets.svg
+
+ target="$1"
+ layer="${target%.*}"
+
+ echo -en "Generating ${BOLD}$target${NORMAL}..."
+
+ inkscape checkbox-radiobox-assets.svg -i "$layer" -j -C --export-png="$target" &> /dev/null
+
+ if [ $? -ne 0 ]; then
+ # tput hpa $(( $(tput cols) - 8 ))
+ tput hpa 70
+ echo -e "${RED}${BOLD}[failed]${NORMAL}"
+ return 1
+ else
+ tput hpa 70
+ echo -e "${GREEN}${BOLD}[ done ]${NORMAL}"
+ return 0
+ fi
+ ;;
+
+ menuitem-*|grid-selection-*)
+ # These are not yet available as SVG.
+
+ echo -en "Generating ${BOLD}$target${NORMAL}..."
+ tput hpa 70
+ echo -e "${BOLD}[ skip ]${NORMAL}"
+ return 0
+ ;;
+
+ *)
+ echo -en "Generating ${BOLD}$target${NORMAL}..."
+ tput hpa 70
+ echo -e "${RED}${BOLD}[failed]${NORMAL}"
+ return 1
+ ;;
+ esac
+}
+
+case "$1" in
+ all)
+ exitcode=0
+
+ for target in *.png; do
+ export_asset "$target"
+ exitcode=$(( $exitcode || $? ))
+ done
+
+ exit $exitcode
+ ;;
+
+ "")
+ echo "Usage: generate-assets.sh all | asset.png [ asset2.png ... ]"
+ exit 1
+ ;;
+
+ *)
+ exitcode=0
+
+ for target in "$@"; do
+ export_asset "$target"
+ exitcode=$(( $exitcode || $? ))
+ done
+
+ exit $exitcode
+ ;;
+esac
diff --git a/gtk-3.0/assets/grid-selection-checked-dark.svg b/gtk-3.0/assets/grid-selection-checked-dark.svg
deleted file mode 100644
index c1d5486..0000000
--- a/gtk-3.0/assets/grid-selection-checked-dark.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/gtk-3.0/assets/grid-selection-checked.svg b/gtk-3.0/assets/grid-selection-checked.svg
deleted file mode 100644
index a660356..0000000
--- a/gtk-3.0/assets/grid-selection-checked.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/gtk-3.0/assets/grid-selection-unchecked-dark.svg b/gtk-3.0/assets/grid-selection-unchecked-dark.svg
deleted file mode 100644
index f925043..0000000
--- a/gtk-3.0/assets/grid-selection-unchecked-dark.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
diff --git a/gtk-3.0/assets/grid-selection-unchecked.svg b/gtk-3.0/assets/grid-selection-unchecked.svg
deleted file mode 100644
index 689da2d..0000000
--- a/gtk-3.0/assets/grid-selection-unchecked.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
diff --git a/gtk-3.0/assets/menuitem-checkbox-checked-hover.svg b/gtk-3.0/assets/menuitem-checkbox-checked-hover.svg
deleted file mode 100644
index 8ab7153..0000000
--- a/gtk-3.0/assets/menuitem-checkbox-checked-hover.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-
diff --git a/gtk-3.0/assets/menuitem-checkbox-checked-insensitive.svg b/gtk-3.0/assets/menuitem-checkbox-checked-insensitive.svg
deleted file mode 100644
index f570a1c..0000000
--- a/gtk-3.0/assets/menuitem-checkbox-checked-insensitive.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-
diff --git a/gtk-3.0/assets/menuitem-checkbox-checked.svg b/gtk-3.0/assets/menuitem-checkbox-checked.svg
deleted file mode 100644
index 6fbfb3e..0000000
--- a/gtk-3.0/assets/menuitem-checkbox-checked.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-
diff --git a/gtk-3.0/assets/menuitem-checkbox-mixed-hover.svg b/gtk-3.0/assets/menuitem-checkbox-mixed-hover.svg
deleted file mode 100644
index d150f8f..0000000
--- a/gtk-3.0/assets/menuitem-checkbox-mixed-hover.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-
diff --git a/gtk-3.0/assets/menuitem-checkbox-mixed-insensitive.svg b/gtk-3.0/assets/menuitem-checkbox-mixed-insensitive.svg
deleted file mode 100644
index fd8b0d4..0000000
--- a/gtk-3.0/assets/menuitem-checkbox-mixed-insensitive.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-
diff --git a/gtk-3.0/assets/menuitem-checkbox-mixed-selected.svg b/gtk-3.0/assets/menuitem-checkbox-mixed-selected.svg
deleted file mode 100644
index d150f8f..0000000
--- a/gtk-3.0/assets/menuitem-checkbox-mixed-selected.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-
diff --git a/gtk-3.0/assets/menuitem-checkbox-mixed.svg b/gtk-3.0/assets/menuitem-checkbox-mixed.svg
deleted file mode 100644
index a82b2c0..0000000
--- a/gtk-3.0/assets/menuitem-checkbox-mixed.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-
diff --git a/gtk-3.0/assets/menuitem-radio-checked-hover.svg b/gtk-3.0/assets/menuitem-radio-checked-hover.svg
deleted file mode 100644
index afb9db2..0000000
--- a/gtk-3.0/assets/menuitem-radio-checked-hover.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-
diff --git a/gtk-3.0/assets/menuitem-radio-checked-insensitive.svg b/gtk-3.0/assets/menuitem-radio-checked-insensitive.svg
deleted file mode 100644
index 0bc947f..0000000
--- a/gtk-3.0/assets/menuitem-radio-checked-insensitive.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-
diff --git a/gtk-3.0/assets/menuitem-radio-checked.svg b/gtk-3.0/assets/menuitem-radio-checked.svg
deleted file mode 100644
index 61f0626..0000000
--- a/gtk-3.0/assets/menuitem-radio-checked.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-
diff --git a/gtk-3.0/assets/radio-checked-dark.png b/gtk-3.0/assets/radio-checked-dark.png
index 36c150d..87956ad 100644
Binary files a/gtk-3.0/assets/radio-checked-dark.png and b/gtk-3.0/assets/radio-checked-dark.png differ
diff --git a/gtk-3.0/assets/radio-checked-insensitive-dark.png b/gtk-3.0/assets/radio-checked-insensitive-dark.png
index b893739..84d5769 100644
Binary files a/gtk-3.0/assets/radio-checked-insensitive-dark.png and b/gtk-3.0/assets/radio-checked-insensitive-dark.png differ
diff --git a/gtk-3.0/assets/radio-checked-insensitive.png b/gtk-3.0/assets/radio-checked-insensitive.png
index f95b5f5..dfe33af 100644
Binary files a/gtk-3.0/assets/radio-checked-insensitive.png and b/gtk-3.0/assets/radio-checked-insensitive.png differ
diff --git a/gtk-3.0/assets/radio-checked.png b/gtk-3.0/assets/radio-checked.png
index 36c150d..9443f0d 100644
Binary files a/gtk-3.0/assets/radio-checked.png and b/gtk-3.0/assets/radio-checked.png differ
diff --git a/gtk-3.0/assets/radio-mixed-dark.png b/gtk-3.0/assets/radio-mixed-dark.png
index 044085f..7568f53 100644
Binary files a/gtk-3.0/assets/radio-mixed-dark.png and b/gtk-3.0/assets/radio-mixed-dark.png differ
diff --git a/gtk-3.0/assets/radio-mixed-dark.svg b/gtk-3.0/assets/radio-mixed-dark.svg
deleted file mode 100644
index b6b0d76..0000000
--- a/gtk-3.0/assets/radio-mixed-dark.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/gtk-3.0/assets/radio-mixed-insensitive-dark.png b/gtk-3.0/assets/radio-mixed-insensitive-dark.png
index ff19d99..851939f 100644
Binary files a/gtk-3.0/assets/radio-mixed-insensitive-dark.png and b/gtk-3.0/assets/radio-mixed-insensitive-dark.png differ
diff --git a/gtk-3.0/assets/radio-mixed-insensitive-dark.svg b/gtk-3.0/assets/radio-mixed-insensitive-dark.svg
deleted file mode 100644
index 6b93fc4..0000000
--- a/gtk-3.0/assets/radio-mixed-insensitive-dark.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-
diff --git a/gtk-3.0/assets/radio-mixed-insensitive.png b/gtk-3.0/assets/radio-mixed-insensitive.png
index 7ab9561..6a72733 100644
Binary files a/gtk-3.0/assets/radio-mixed-insensitive.png and b/gtk-3.0/assets/radio-mixed-insensitive.png differ
diff --git a/gtk-3.0/assets/radio-mixed-insensitive.svg b/gtk-3.0/assets/radio-mixed-insensitive.svg
deleted file mode 100644
index 9fa3659..0000000
--- a/gtk-3.0/assets/radio-mixed-insensitive.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-
diff --git a/gtk-3.0/assets/radio-mixed.png b/gtk-3.0/assets/radio-mixed.png
index 044085f..42ace77 100644
Binary files a/gtk-3.0/assets/radio-mixed.png and b/gtk-3.0/assets/radio-mixed.png differ
diff --git a/gtk-3.0/assets/radio-mixed.svg b/gtk-3.0/assets/radio-mixed.svg
deleted file mode 100644
index a85a7ac..0000000
--- a/gtk-3.0/assets/radio-mixed.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/gtk-3.0/assets/radio-selected-dark.svg b/gtk-3.0/assets/radio-selected-dark.svg
deleted file mode 100644
index 28da8de..0000000
--- a/gtk-3.0/assets/radio-selected-dark.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/gtk-3.0/assets/radio-selected-insensitive-dark.svg b/gtk-3.0/assets/radio-selected-insensitive-dark.svg
deleted file mode 100644
index f5cfbe0..0000000
--- a/gtk-3.0/assets/radio-selected-insensitive-dark.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-
diff --git a/gtk-3.0/assets/radio-selected-insensitive.svg b/gtk-3.0/assets/radio-selected-insensitive.svg
deleted file mode 100644
index e782ba6..0000000
--- a/gtk-3.0/assets/radio-selected-insensitive.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-
diff --git a/gtk-3.0/assets/radio-selected.svg b/gtk-3.0/assets/radio-selected.svg
deleted file mode 100644
index 91cafc1..0000000
--- a/gtk-3.0/assets/radio-selected.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/gtk-3.0/assets/radio-unchecked-dark.png b/gtk-3.0/assets/radio-unchecked-dark.png
index 84bcdbe..980b98b 100644
Binary files a/gtk-3.0/assets/radio-unchecked-dark.png and b/gtk-3.0/assets/radio-unchecked-dark.png differ
diff --git a/gtk-3.0/assets/radio-unchecked-insensitive-dark.png b/gtk-3.0/assets/radio-unchecked-insensitive-dark.png
index b3bcec8..a4e1687 100644
Binary files a/gtk-3.0/assets/radio-unchecked-insensitive-dark.png and b/gtk-3.0/assets/radio-unchecked-insensitive-dark.png differ
diff --git a/gtk-3.0/assets/radio-unchecked-insensitive.png b/gtk-3.0/assets/radio-unchecked-insensitive.png
index 4ea0649..e096bd0 100644
Binary files a/gtk-3.0/assets/radio-unchecked-insensitive.png and b/gtk-3.0/assets/radio-unchecked-insensitive.png differ
diff --git a/gtk-3.0/assets/radio-unchecked.png b/gtk-3.0/assets/radio-unchecked.png
index 896e45f..e825caa 100644
Binary files a/gtk-3.0/assets/radio-unchecked.png and b/gtk-3.0/assets/radio-unchecked.png differ
diff --git a/gtk-3.0/assets/radio-unselected-dark.svg b/gtk-3.0/assets/radio-unselected-dark.svg
deleted file mode 100644
index 214ed94..0000000
--- a/gtk-3.0/assets/radio-unselected-dark.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
diff --git a/gtk-3.0/assets/radio-unselected-insensitive-dark.svg b/gtk-3.0/assets/radio-unselected-insensitive-dark.svg
deleted file mode 100644
index 0fdfaf4..0000000
--- a/gtk-3.0/assets/radio-unselected-insensitive-dark.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
diff --git a/gtk-3.0/assets/radio-unselected-insensitive.svg b/gtk-3.0/assets/radio-unselected-insensitive.svg
deleted file mode 100644
index a0f2168..0000000
--- a/gtk-3.0/assets/radio-unselected-insensitive.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
diff --git a/gtk-3.0/assets/radio-unselected.svg b/gtk-3.0/assets/radio-unselected.svg
deleted file mode 100644
index 2f05a0d..0000000
--- a/gtk-3.0/assets/radio-unselected.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-