diff --git a/data/icons/hicolor_apps_16x16_gnome-control-center.png b/data/icons/hicolor/16x16/apps/gnome-control-center.png
similarity index 100%
rename from data/icons/hicolor_apps_16x16_gnome-control-center.png
rename to data/icons/hicolor/16x16/apps/gnome-control-center.png
diff --git a/data/icons/hicolor_apps_24x24_gnome-control-center.png b/data/icons/hicolor/24x24/apps/gnome-control-center.png
similarity index 100%
rename from data/icons/hicolor_apps_24x24_gnome-control-center.png
rename to data/icons/hicolor/24x24/apps/gnome-control-center.png
diff --git a/data/icons/hicolor_apps_32x32_gnome-control-center.png b/data/icons/hicolor/32x32/apps/gnome-control-center.png
similarity index 100%
rename from data/icons/hicolor_apps_32x32_gnome-control-center.png
rename to data/icons/hicolor/32x32/apps/gnome-control-center.png
diff --git a/data/icons/hicolor_apps_48x48_gnome-control-center.png b/data/icons/hicolor/48x48/apps/gnome-control-center.png
similarity index 100%
rename from data/icons/hicolor_apps_48x48_gnome-control-center.png
rename to data/icons/hicolor/48x48/apps/gnome-control-center.png
diff --git a/data/icons/hicolor/512x512/apps/gnome-control-center.png b/data/icons/hicolor/512x512/apps/gnome-control-center.png
new file mode 100644
index 0000000000000000000000000000000000000000..efb14df0b703206ada9e6e2dd6016d7cc390f66f
Binary files /dev/null and b/data/icons/hicolor/512x512/apps/gnome-control-center.png differ
diff --git a/data/icons/hicolor_apps_symbolic_gnome-control-center-symbolic.svg b/data/icons/hicolor/symbolic/apps/gnome-control-center-symbolic.svg
similarity index 100%
rename from data/icons/hicolor_apps_symbolic_gnome-control-center-symbolic.svg
rename to data/icons/hicolor/symbolic/apps/gnome-control-center-symbolic.svg
diff --git a/data/icons/hicolor_apps_512x512_gnome-control-center.png b/data/icons/hicolor_apps_512x512_gnome-control-center.png
deleted file mode 100644
index 4294e45020324c6deeedb756dfc67eb07df5452a..0000000000000000000000000000000000000000
Binary files a/data/icons/hicolor_apps_512x512_gnome-control-center.png and /dev/null differ
diff --git a/data/icons/meson.build b/data/icons/meson.build
index 56fa96791ff3c33e344495e20521f8cfc7a37116..0f9a7eb54ff708dda3f087b6f7e807f2e367b6b2 100644
--- a/data/icons/meson.build
+++ b/data/icons/meson.build
@@ -1,19 +1,4 @@
-icon_sizes = [
-  '16x16',
-  '24x24',
-  '32x32',
-  '48x48',
-  '512x512'
-]
-
-foreach icon_size: icon_sizes
-  install_data(
-    '_'.join(['hicolor', 'apps', icon_size, 'gnome-control-center.png']),
-    install_dir: join_paths(control_center_icondir, 'hicolor', icon_size, 'apps')
-  )
-endforeach
-
-install_data(
-  'hicolor_apps_symbolic_gnome-control-center-symbolic.svg',
-  install_dir: join_paths(control_center_icondir, 'hicolor', 'symbolic', 'apps')
+install_subdir(
+  'hicolor',
+  install_dir: control_center_icondir
 )
diff --git a/data/icons/gnome-control-center-src.svg b/data/icons/src/gnome-control-center-src.svg
similarity index 100%
rename from data/icons/gnome-control-center-src.svg
rename to data/icons/src/gnome-control-center-src.svg