diff --git a/icons/firebase-iid-128.png b/icons/firebase-iid_128x128.png
similarity index 100%
rename from icons/firebase-iid-128.png
rename to icons/firebase-iid_128x128.png
diff --git a/icons/firebase-iid-512.png b/icons/firebase-iid_512x512.png
similarity index 100%
rename from icons/firebase-iid-512.png
rename to icons/firebase-iid_512x512.png
diff --git a/icons/firebase-invites-128.png b/icons/firebase-invites_128x128.png
similarity index 100%
rename from icons/firebase-invites-128.png
rename to icons/firebase-invites_128x128.png
diff --git a/icons/firebase-invites-512.png b/icons/firebase-invites_512x512.png
similarity index 100%
rename from icons/firebase-invites-512.png
rename to icons/firebase-invites_512x512.png
diff --git a/icons/firebase-messaging-128.png b/icons/firebase-messaging_128x128.png
similarity index 100%
rename from icons/firebase-messaging-128.png
rename to icons/firebase-messaging_128x128.png
diff --git a/icons/firebase-messaging-512.png b/icons/firebase-messaging_512x512.png
similarity index 100%
rename from icons/firebase-messaging-512.png
rename to icons/firebase-messaging_512x512.png
diff --git a/icons/firebase-storage-128.png b/icons/firebase-storage-common_128x128.png
similarity index 100%
rename from icons/firebase-storage-128.png
rename to icons/firebase-storage-common_128x128.png
diff --git a/icons/firebase-storage-512.png b/icons/firebase-storage-common_512x512.png
similarity index 100%
rename from icons/firebase-storage-512.png
rename to icons/firebase-storage-common_512x512.png
diff --git a/icons/firebase-storage-common-128.png b/icons/firebase-storage_128x128.png
similarity index 100%
rename from icons/firebase-storage-common-128.png
rename to icons/firebase-storage_128x128.png
diff --git a/icons/firebase-storage-common-512.png b/icons/firebase-storage_512x512.png
similarity index 100%
rename from icons/firebase-storage-common-512.png
rename to icons/firebase-storage_512x512.png
diff --git a/icons/play-services-ads-128.png b/icons/play-services-ads-lite_128x128.png
similarity index 100%
rename from icons/play-services-ads-128.png
rename to icons/play-services-ads-lite_128x128.png
diff --git a/icons/play-services-ads-512.png b/icons/play-services-ads-lite_512x512.png
similarity index 100%
rename from icons/play-services-ads-512.png
rename to icons/play-services-ads-lite_512x512.png
diff --git a/icons/play-services-ads-lite-128.png b/icons/play-services-ads_128x128.png
similarity index 100%
rename from icons/play-services-ads-lite-128.png
rename to icons/play-services-ads_128x128.png
diff --git a/icons/play-services-ads-lite-512.png b/icons/play-services-ads_512x512.png
similarity index 100%
rename from icons/play-services-ads-lite-512.png
rename to icons/play-services-ads_512x512.png
diff --git a/icons/play-services-analytics-128.png b/icons/play-services-analytics-impl_128x128.png
similarity index 100%
rename from icons/play-services-analytics-128.png
rename to icons/play-services-analytics-impl_128x128.png
diff --git a/icons/play-services-analytics-512.png b/icons/play-services-analytics-impl_512x512.png
similarity index 100%
rename from icons/play-services-analytics-512.png
rename to icons/play-services-analytics-impl_512x512.png
diff --git a/icons/play-services-analytics-impl-128.png b/icons/play-services-analytics_128x128.png
similarity index 100%
rename from icons/play-services-analytics-impl-128.png
rename to icons/play-services-analytics_128x128.png
diff --git a/icons/play-services-analytics-impl-512.png b/icons/play-services-analytics_512x512.png
similarity index 100%
rename from icons/play-services-analytics-impl-512.png
rename to icons/play-services-analytics_512x512.png
diff --git a/icons/play-services-appindexing-128.png b/icons/play-services-appindexing_128x128.png
similarity index 100%
rename from icons/play-services-appindexing-128.png
rename to icons/play-services-appindexing_128x128.png
diff --git a/icons/play-services-appindexing-512.png b/icons/play-services-appindexing_512x512.png
similarity index 100%
rename from icons/play-services-appindexing-512.png
rename to icons/play-services-appindexing_512x512.png
diff --git a/icons/play-services-appinvite-128.png b/icons/play-services-appinvite_128x128.png
similarity index 100%
rename from icons/play-services-appinvite-128.png
rename to icons/play-services-appinvite_128x128.png
diff --git a/icons/play-services-appinvite-512.png b/icons/play-services-appinvite_512x512.png
similarity index 100%
rename from icons/play-services-appinvite-512.png
rename to icons/play-services-appinvite_512x512.png
diff --git a/icons/play-services-auth-128.png b/icons/play-services-auth-base_128x128.png
similarity index 100%
rename from icons/play-services-auth-128.png
rename to icons/play-services-auth-base_128x128.png
diff --git a/icons/play-services-auth-512.png b/icons/play-services-auth-base_512x512.png
similarity index 100%
rename from icons/play-services-auth-512.png
rename to icons/play-services-auth-base_512x512.png
diff --git a/icons/play-services-auth-base-128.png b/icons/play-services-auth_128x128.png
similarity index 100%
rename from icons/play-services-auth-base-128.png
rename to icons/play-services-auth_128x128.png
diff --git a/icons/play-services-auth-base-512.png b/icons/play-services-auth_512x512.png
similarity index 100%
rename from icons/play-services-auth-base-512.png
rename to icons/play-services-auth_512x512.png
diff --git a/icons/play-services-128.png b/icons/play-services-base_128x128.png
similarity index 100%
rename from icons/play-services-128.png
rename to icons/play-services-base_128x128.png
diff --git a/icons/play-services-512.png b/icons/play-services-base_512x512.png
similarity index 100%
rename from icons/play-services-512.png
rename to icons/play-services-base_512x512.png
diff --git a/icons/play-services-base-128.png b/icons/play-services-basement_128x128.png
similarity index 100%
rename from icons/play-services-base-128.png
rename to icons/play-services-basement_128x128.png
diff --git a/icons/play-services-base-512.png b/icons/play-services-basement_512x512.png
similarity index 100%
rename from icons/play-services-base-512.png
rename to icons/play-services-basement_512x512.png
diff --git a/icons/play-services-cast-128.png b/icons/play-services-cast-framework_128x128.png
similarity index 100%
rename from icons/play-services-cast-128.png
rename to icons/play-services-cast-framework_128x128.png
diff --git a/icons/play-services-cast-512.png b/icons/play-services-cast-framework_512x512.png
similarity index 100%
rename from icons/play-services-cast-512.png
rename to icons/play-services-cast-framework_512x512.png
diff --git a/icons/play-services-cast-framework-128.png b/icons/play-services-cast_128x128.png
similarity index 100%
rename from icons/play-services-cast-framework-128.png
rename to icons/play-services-cast_128x128.png
diff --git a/icons/play-services-cast-framework-512.png b/icons/play-services-cast_512x512.png
similarity index 100%
rename from icons/play-services-cast-framework-512.png
rename to icons/play-services-cast_512x512.png
diff --git a/icons/play-services-basement-128.png b/icons/play-services-clearcut_128x128.png
similarity index 100%
rename from icons/play-services-basement-128.png
rename to icons/play-services-clearcut_128x128.png
diff --git a/icons/play-services-basement-512.png b/icons/play-services-clearcut_512x512.png
similarity index 100%
rename from icons/play-services-basement-512.png
rename to icons/play-services-clearcut_512x512.png
diff --git a/icons/play-services-contextmanager-128.png b/icons/play-services-contextmanager_128x128.png
similarity index 100%
rename from icons/play-services-contextmanager-128.png
rename to icons/play-services-contextmanager_128x128.png
diff --git a/icons/play-services-contextmanager-512.png b/icons/play-services-contextmanager_512x512.png
similarity index 100%
rename from icons/play-services-contextmanager-512.png
rename to icons/play-services-contextmanager_512x512.png
diff --git a/icons/play-services-drive-128.png b/icons/play-services-drive_128x128.png
similarity index 100%
rename from icons/play-services-drive-128.png
rename to icons/play-services-drive_128x128.png
diff --git a/icons/play-services-drive-512.png b/icons/play-services-drive_512x512.png
similarity index 100%
rename from icons/play-services-drive-512.png
rename to icons/play-services-drive_512x512.png
diff --git a/icons/play-services-fitness-128.png b/icons/play-services-fitness_128x128.png
similarity index 100%
rename from icons/play-services-fitness-128.png
rename to icons/play-services-fitness_128x128.png
diff --git a/icons/play-services-fitness-512.png b/icons/play-services-fitness_512x512.png
similarity index 100%
rename from icons/play-services-fitness-512.png
rename to icons/play-services-fitness_512x512.png
diff --git a/icons/play-services-games-128.png b/icons/play-services-games_128x128.png
similarity index 100%
rename from icons/play-services-games-128.png
rename to icons/play-services-games_128x128.png
diff --git a/icons/play-services-games-512.png b/icons/play-services-games_512x512.png
similarity index 100%
rename from icons/play-services-games-512.png
rename to icons/play-services-games_512x512.png
diff --git a/icons/play-services-gcm-128.png b/icons/play-services-gcm_128x128.png
similarity index 100%
rename from icons/play-services-gcm-128.png
rename to icons/play-services-gcm_128x128.png
diff --git a/icons/play-services-gcm-512.png b/icons/play-services-gcm_512x512.png
similarity index 100%
rename from icons/play-services-gcm-512.png
rename to icons/play-services-gcm_512x512.png
diff --git a/icons/play-services-identity-128.png b/icons/play-services-identity_128x128.png
similarity index 100%
rename from icons/play-services-identity-128.png
rename to icons/play-services-identity_128x128.png
diff --git a/icons/play-services-identity-512.png b/icons/play-services-identity_512x512.png
similarity index 100%
rename from icons/play-services-identity-512.png
rename to icons/play-services-identity_512x512.png
diff --git a/icons/play-services-iid-128.png b/icons/play-services-iid_128x128.png
similarity index 100%
rename from icons/play-services-iid-128.png
rename to icons/play-services-iid_128x128.png
diff --git a/icons/play-services-iid-512.png b/icons/play-services-iid_512x512.png
similarity index 100%
rename from icons/play-services-iid-512.png
rename to icons/play-services-iid_512x512.png
diff --git a/icons/play-services-location-128.png b/icons/play-services-location_128x128.png
similarity index 100%
rename from icons/play-services-location-128.png
rename to icons/play-services-location_128x128.png
diff --git a/icons/play-services-location-512.png b/icons/play-services-location_512x512.png
similarity index 100%
rename from icons/play-services-location-512.png
rename to icons/play-services-location_512x512.png
diff --git a/icons/play-services-maps-128.png b/icons/play-services-maps_128x128.png
similarity index 100%
rename from icons/play-services-maps-128.png
rename to icons/play-services-maps_128x128.png
diff --git a/icons/play-services-maps-512.png b/icons/play-services-maps_512x512.png
similarity index 100%
rename from icons/play-services-maps-512.png
rename to icons/play-services-maps_512x512.png
diff --git a/icons/play-services-nearby-128.png b/icons/play-services-nearby_128x128.png
similarity index 100%
rename from icons/play-services-nearby-128.png
rename to icons/play-services-nearby_128x128.png
diff --git a/icons/play-services-nearby-512.png b/icons/play-services-nearby_512x512.png
similarity index 100%
rename from icons/play-services-nearby-512.png
rename to icons/play-services-nearby_512x512.png
diff --git a/icons/play-services-panorama-128.png b/icons/play-services-panorama_128x128.png
similarity index 100%
rename from icons/play-services-panorama-128.png
rename to icons/play-services-panorama_128x128.png
diff --git a/icons/play-services-panorama-512.png b/icons/play-services-panorama_512x512.png
similarity index 100%
rename from icons/play-services-panorama-512.png
rename to icons/play-services-panorama_512x512.png
diff --git a/icons/play-services-places-128.png b/icons/play-services-places_128x128.png
similarity index 100%
rename from icons/play-services-places-128.png
rename to icons/play-services-places_128x128.png
diff --git a/icons/play-services-places-512.png b/icons/play-services-places_512x512.png
similarity index 100%
rename from icons/play-services-places-512.png
rename to icons/play-services-places_512x512.png
diff --git a/icons/play-services-plus-128.png b/icons/play-services-plus_128x128.png
similarity index 100%
rename from icons/play-services-plus-128.png
rename to icons/play-services-plus_128x128.png
diff --git a/icons/play-services-plus-512.png b/icons/play-services-plus_512x512.png
similarity index 100%
rename from icons/play-services-plus-512.png
rename to icons/play-services-plus_512x512.png
diff --git a/icons/play-services-safetynet-128.png b/icons/play-services-safetynet_128x128.png
similarity index 100%
rename from icons/play-services-safetynet-128.png
rename to icons/play-services-safetynet_128x128.png
diff --git a/icons/play-services-safetynet-512.png b/icons/play-services-safetynet_512x512.png
similarity index 100%
rename from icons/play-services-safetynet-512.png
rename to icons/play-services-safetynet_512x512.png
diff --git a/icons/play-services-support-wearable-128.png b/icons/play-services-support-wearable_128x128.png
similarity index 100%
rename from icons/play-services-support-wearable-128.png
rename to icons/play-services-support-wearable_128x128.png
diff --git a/icons/play-services-support-wearable-512.png b/icons/play-services-support-wearable_512x512.png
similarity index 100%
rename from icons/play-services-support-wearable-512.png
rename to icons/play-services-support-wearable_512x512.png
diff --git a/icons/play-services-clearcut-128.png b/icons/play-services-tasks_128x128.png
similarity index 100%
rename from icons/play-services-clearcut-128.png
rename to icons/play-services-tasks_128x128.png
diff --git a/icons/play-services-clearcut-512.png b/icons/play-services-tasks_512x512.png
similarity index 100%
rename from icons/play-services-clearcut-512.png
rename to icons/play-services-tasks_512x512.png
diff --git a/icons/play-services-vision-128.png b/icons/play-services-vision_128x128.png
similarity index 100%
rename from icons/play-services-vision-128.png
rename to icons/play-services-vision_128x128.png
diff --git a/icons/play-services-vision-512.png b/icons/play-services-vision_512x512.png
similarity index 100%
rename from icons/play-services-vision-512.png
rename to icons/play-services-vision_512x512.png
diff --git a/icons/play-services-wallet-128.png b/icons/play-services-wallet_128x128.png
similarity index 100%
rename from icons/play-services-wallet-128.png
rename to icons/play-services-wallet_128x128.png
diff --git a/icons/play-services-wallet-512.png b/icons/play-services-wallet_512x512.png
similarity index 100%
rename from icons/play-services-wallet-512.png
rename to icons/play-services-wallet_512x512.png
diff --git a/icons/play-services-wearable-128.png b/icons/play-services-wearable_128x128.png
similarity index 100%
rename from icons/play-services-wearable-128.png
rename to icons/play-services-wearable_128x128.png
diff --git a/icons/play-services-wearable-512.png b/icons/play-services-wearable_512x512.png
similarity index 100%
rename from icons/play-services-wearable-512.png
rename to icons/play-services-wearable_512x512.png
diff --git a/icons/play-services-tasks-128.png b/icons/play-services_128x128.png
similarity index 100%
rename from icons/play-services-tasks-128.png
rename to icons/play-services_128x128.png
diff --git a/icons/play-services-tasks-512.png b/icons/play-services_512x512.png
similarity index 100%
rename from icons/play-services-tasks-512.png
rename to icons/play-services_512x512.png