diff --git a/app/src/main/res/drawable-hdpi/nonfree-arte.png b/app/src/main/res/drawable-hdpi/nonfree_arte.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/nonfree-arte.png
rename to app/src/main/res/drawable-hdpi/nonfree_arte.png
diff --git a/app/src/main/res/drawable-hdpi/nonfree-badoo.png b/app/src/main/res/drawable-hdpi/nonfree_badoo.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/nonfree-badoo.png
rename to app/src/main/res/drawable-hdpi/nonfree_badoo.png
diff --git a/app/src/main/res/drawable-hdpi/nonfree-bouyguestelecom-espaceclient.png b/app/src/main/res/drawable-hdpi/nonfree_bouyguestelecom.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/nonfree-bouyguestelecom-espaceclient.png
rename to app/src/main/res/drawable-hdpi/nonfree_bouyguestelecom.png
diff --git a/app/src/main/res/drawable-hdpi/nonfree-creditdunord.png b/app/src/main/res/drawable-hdpi/nonfree_creditdunord.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/nonfree-creditdunord.png
rename to app/src/main/res/drawable-hdpi/nonfree_creditdunord.png
diff --git a/app/src/main/res/drawable-hdpi/nonfree-famileo.png b/app/src/main/res/drawable-hdpi/nonfree_famileo.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/nonfree-famileo.png
rename to app/src/main/res/drawable-hdpi/nonfree_famileo.png
diff --git a/app/src/main/res/drawable-hdpi/nonfree-fdj.png b/app/src/main/res/drawable-hdpi/nonfree_fdj.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/nonfree-fdj.png
rename to app/src/main/res/drawable-hdpi/nonfree_fdj.png
diff --git a/app/src/main/res/drawable-hdpi/nonfree-fip.png b/app/src/main/res/drawable-hdpi/nonfree_fip.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/nonfree-fip.png
rename to app/src/main/res/drawable-hdpi/nonfree_fip.png
diff --git a/app/src/main/res/drawable-hdpi/nonfree-gmail.png b/app/src/main/res/drawable-hdpi/nonfree_gmail.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/nonfree-gmail.png
rename to app/src/main/res/drawable-hdpi/nonfree_gmail.png
diff --git a/app/src/main/res/drawable-hdpi/nonfree-googlemaps.png b/app/src/main/res/drawable-hdpi/nonfree_googlemaps.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/nonfree-googlemaps.png
rename to app/src/main/res/drawable-hdpi/nonfree_googlemaps.png
diff --git a/app/src/main/res/drawable-hdpi/nonfree-googleplaystore.png b/app/src/main/res/drawable-hdpi/nonfree_googleplaystore.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/nonfree-googleplaystore.png
rename to app/src/main/res/drawable-hdpi/nonfree_googleplaystore.png
diff --git a/app/src/main/res/drawable-hdpi/nonfree-happn.png b/app/src/main/res/drawable-hdpi/nonfree_happn.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/nonfree-happn.png
rename to app/src/main/res/drawable-hdpi/nonfree_happn.png
diff --git a/app/src/main/res/drawable-hdpi/nonfree-ilevia.png b/app/src/main/res/drawable-hdpi/nonfree_ilevia.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/nonfree-ilevia.png
rename to app/src/main/res/drawable-hdpi/nonfree_ilevia.png
diff --git a/app/src/main/res/drawable-hdpi/nonfree-instagram.png b/app/src/main/res/drawable-hdpi/nonfree_instagram.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/nonfree-instagram.png
rename to app/src/main/res/drawable-hdpi/nonfree_instagram.png
diff --git a/app/src/main/res/drawable-hdpi/nonfree-lastfm.png b/app/src/main/res/drawable-hdpi/nonfree_lastfm.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/nonfree-lastfm.png
rename to app/src/main/res/drawable-hdpi/nonfree_lastfm.png
diff --git a/app/src/main/res/drawable-hdpi/nonfree-leboncoin.png b/app/src/main/res/drawable-hdpi/nonfree_leboncoin.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/nonfree-leboncoin.png
rename to app/src/main/res/drawable-hdpi/nonfree_leboncoin.png
diff --git a/app/src/main/res/drawable-hdpi/nonfree-petitbambou.png b/app/src/main/res/drawable-hdpi/nonfree_petitbambou.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/nonfree-petitbambou.png
rename to app/src/main/res/drawable-hdpi/nonfree_petitbambou.png
diff --git a/app/src/main/res/drawable-hdpi/nonfree-shazam.png b/app/src/main/res/drawable-hdpi/nonfree_shazam.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/nonfree-shazam.png
rename to app/src/main/res/drawable-hdpi/nonfree_shazam.png
diff --git a/app/src/main/res/drawable-hdpi/nonfree-skype.png b/app/src/main/res/drawable-hdpi/nonfree_skype.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/nonfree-skype.png
rename to app/src/main/res/drawable-hdpi/nonfree_skype.png
diff --git a/app/src/main/res/drawable-hdpi/nonfree-slack.png b/app/src/main/res/drawable-hdpi/nonfree_slack.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/nonfree-slack.png
rename to app/src/main/res/drawable-hdpi/nonfree_slack.png
diff --git a/app/src/main/res/drawable-hdpi/nonfree-spotify.png b/app/src/main/res/drawable-hdpi/nonfree_spotify.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/nonfree-spotify.png
rename to app/src/main/res/drawable-hdpi/nonfree_spotify.png
diff --git a/app/src/main/res/drawable-hdpi/nonfree-tinder.png b/app/src/main/res/drawable-hdpi/nonfree_tinder.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/nonfree-tinder.png
rename to app/src/main/res/drawable-hdpi/nonfree_tinder.png
diff --git a/app/src/main/res/drawable-hdpi/nonfree-twitter.png b/app/src/main/res/drawable-hdpi/nonfree_twitter.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/nonfree-twitter.png
rename to app/src/main/res/drawable-hdpi/nonfree_twitter.png
diff --git a/app/src/main/res/drawable-hdpi/nonfree-waze.png b/app/src/main/res/drawable-hdpi/nonfree_waze.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/nonfree-waze.png
rename to app/src/main/res/drawable-hdpi/nonfree_waze.png
diff --git a/app/src/main/res/drawable-hdpi/nonfree-whatsapp.png b/app/src/main/res/drawable-hdpi/nonfree_whatsapp.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/nonfree-whatsapp.png
rename to app/src/main/res/drawable-hdpi/nonfree_whatsapp.png
diff --git a/app/src/main/res/drawable-hdpi/nonfree-youtube.png b/app/src/main/res/drawable-hdpi/nonfree_youtube.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/nonfree-youtube.png
rename to app/src/main/res/drawable-hdpi/nonfree_youtube.png
diff --git a/app/src/main/res/drawable-mdpi/nonfree-arte.png b/app/src/main/res/drawable-mdpi/nonfree_arte.png
similarity index 100%
rename from app/src/main/res/drawable-mdpi/nonfree-arte.png
rename to app/src/main/res/drawable-mdpi/nonfree_arte.png
diff --git a/app/src/main/res/drawable-mdpi/nonfree-badoo.png b/app/src/main/res/drawable-mdpi/nonfree_badoo.png
similarity index 100%
rename from app/src/main/res/drawable-mdpi/nonfree-badoo.png
rename to app/src/main/res/drawable-mdpi/nonfree_badoo.png
diff --git a/app/src/main/res/drawable-mdpi/nonfree-bouyguestelecom-espaceclient.png b/app/src/main/res/drawable-mdpi/nonfree_bouyguestelecom.png
similarity index 100%
rename from app/src/main/res/drawable-mdpi/nonfree-bouyguestelecom-espaceclient.png
rename to app/src/main/res/drawable-mdpi/nonfree_bouyguestelecom.png
diff --git a/app/src/main/res/drawable-mdpi/nonfree-creditdunord.png b/app/src/main/res/drawable-mdpi/nonfree_creditdunord.png
similarity index 100%
rename from app/src/main/res/drawable-mdpi/nonfree-creditdunord.png
rename to app/src/main/res/drawable-mdpi/nonfree_creditdunord.png
diff --git a/app/src/main/res/drawable-mdpi/nonfree-famileo.png b/app/src/main/res/drawable-mdpi/nonfree_famileo.png
similarity index 100%
rename from app/src/main/res/drawable-mdpi/nonfree-famileo.png
rename to app/src/main/res/drawable-mdpi/nonfree_famileo.png
diff --git a/app/src/main/res/drawable-mdpi/nonfree-fdj.png b/app/src/main/res/drawable-mdpi/nonfree_fdj.png
similarity index 100%
rename from app/src/main/res/drawable-mdpi/nonfree-fdj.png
rename to app/src/main/res/drawable-mdpi/nonfree_fdj.png
diff --git a/app/src/main/res/drawable-mdpi/nonfree-fip.png b/app/src/main/res/drawable-mdpi/nonfree_fip.png
similarity index 100%
rename from app/src/main/res/drawable-mdpi/nonfree-fip.png
rename to app/src/main/res/drawable-mdpi/nonfree_fip.png
diff --git a/app/src/main/res/drawable-mdpi/nonfree-gmail.png b/app/src/main/res/drawable-mdpi/nonfree_gmail.png
similarity index 100%
rename from app/src/main/res/drawable-mdpi/nonfree-gmail.png
rename to app/src/main/res/drawable-mdpi/nonfree_gmail.png
diff --git a/app/src/main/res/drawable-mdpi/nonfree-googlemaps.png b/app/src/main/res/drawable-mdpi/nonfree_googlemaps.png
similarity index 100%
rename from app/src/main/res/drawable-mdpi/nonfree-googlemaps.png
rename to app/src/main/res/drawable-mdpi/nonfree_googlemaps.png
diff --git a/app/src/main/res/drawable-mdpi/nonfree-googleplaystore.png b/app/src/main/res/drawable-mdpi/nonfree_googleplaystore.png
similarity index 100%
rename from app/src/main/res/drawable-mdpi/nonfree-googleplaystore.png
rename to app/src/main/res/drawable-mdpi/nonfree_googleplaystore.png
diff --git a/app/src/main/res/drawable-mdpi/nonfree-happn.png b/app/src/main/res/drawable-mdpi/nonfree_happn.png
similarity index 100%
rename from app/src/main/res/drawable-mdpi/nonfree-happn.png
rename to app/src/main/res/drawable-mdpi/nonfree_happn.png
diff --git a/app/src/main/res/drawable-mdpi/nonfree-ilevia.png b/app/src/main/res/drawable-mdpi/nonfree_ilevia.png
similarity index 100%
rename from app/src/main/res/drawable-mdpi/nonfree-ilevia.png
rename to app/src/main/res/drawable-mdpi/nonfree_ilevia.png
diff --git a/app/src/main/res/drawable-mdpi/nonfree-instagram.png b/app/src/main/res/drawable-mdpi/nonfree_instagram.png
similarity index 100%
rename from app/src/main/res/drawable-mdpi/nonfree-instagram.png
rename to app/src/main/res/drawable-mdpi/nonfree_instagram.png
diff --git a/app/src/main/res/drawable-mdpi/nonfree-lastfm.png b/app/src/main/res/drawable-mdpi/nonfree_lastfm.png
similarity index 100%
rename from app/src/main/res/drawable-mdpi/nonfree-lastfm.png
rename to app/src/main/res/drawable-mdpi/nonfree_lastfm.png
diff --git a/app/src/main/res/drawable-mdpi/nonfree-leboncoin.png b/app/src/main/res/drawable-mdpi/nonfree_leboncoin.png
similarity index 100%
rename from app/src/main/res/drawable-mdpi/nonfree-leboncoin.png
rename to app/src/main/res/drawable-mdpi/nonfree_leboncoin.png
diff --git a/app/src/main/res/drawable-mdpi/nonfree-petitbambou.png b/app/src/main/res/drawable-mdpi/nonfree_petitbambou.png
similarity index 100%
rename from app/src/main/res/drawable-mdpi/nonfree-petitbambou.png
rename to app/src/main/res/drawable-mdpi/nonfree_petitbambou.png
diff --git a/app/src/main/res/drawable-mdpi/nonfree-shazam.png b/app/src/main/res/drawable-mdpi/nonfree_shazam.png
similarity index 100%
rename from app/src/main/res/drawable-mdpi/nonfree-shazam.png
rename to app/src/main/res/drawable-mdpi/nonfree_shazam.png
diff --git a/app/src/main/res/drawable-mdpi/nonfree-skype.png b/app/src/main/res/drawable-mdpi/nonfree_skype.png
similarity index 100%
rename from app/src/main/res/drawable-mdpi/nonfree-skype.png
rename to app/src/main/res/drawable-mdpi/nonfree_skype.png
diff --git a/app/src/main/res/drawable-mdpi/nonfree-slack.png b/app/src/main/res/drawable-mdpi/nonfree_slack.png
similarity index 100%
rename from app/src/main/res/drawable-mdpi/nonfree-slack.png
rename to app/src/main/res/drawable-mdpi/nonfree_slack.png
diff --git a/app/src/main/res/drawable-mdpi/nonfree-spotify.png b/app/src/main/res/drawable-mdpi/nonfree_spotify.png
similarity index 100%
rename from app/src/main/res/drawable-mdpi/nonfree-spotify.png
rename to app/src/main/res/drawable-mdpi/nonfree_spotify.png
diff --git a/app/src/main/res/drawable-mdpi/nonfree-tinder.png b/app/src/main/res/drawable-mdpi/nonfree_tinder.png
similarity index 100%
rename from app/src/main/res/drawable-mdpi/nonfree-tinder.png
rename to app/src/main/res/drawable-mdpi/nonfree_tinder.png
diff --git a/app/src/main/res/drawable-mdpi/nonfree-twitter.png b/app/src/main/res/drawable-mdpi/nonfree_twitter.png
similarity index 100%
rename from app/src/main/res/drawable-mdpi/nonfree-twitter.png
rename to app/src/main/res/drawable-mdpi/nonfree_twitter.png
diff --git a/app/src/main/res/drawable-mdpi/nonfree-waze.png b/app/src/main/res/drawable-mdpi/nonfree_waze.png
similarity index 100%
rename from app/src/main/res/drawable-mdpi/nonfree-waze.png
rename to app/src/main/res/drawable-mdpi/nonfree_waze.png
diff --git a/app/src/main/res/drawable-mdpi/nonfree-whatsapp.png b/app/src/main/res/drawable-mdpi/nonfree_whatsapp.png
similarity index 100%
rename from app/src/main/res/drawable-mdpi/nonfree-whatsapp.png
rename to app/src/main/res/drawable-mdpi/nonfree_whatsapp.png
diff --git a/app/src/main/res/drawable-mdpi/nonfree-youtube.png b/app/src/main/res/drawable-mdpi/nonfree_youtube.png
similarity index 100%
rename from app/src/main/res/drawable-mdpi/nonfree-youtube.png
rename to app/src/main/res/drawable-mdpi/nonfree_youtube.png
diff --git a/app/src/main/res/drawable-xhdpi/nonfree-arte.png b/app/src/main/res/drawable-xhdpi/nonfree_arte.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/nonfree-arte.png
rename to app/src/main/res/drawable-xhdpi/nonfree_arte.png
diff --git a/app/src/main/res/drawable-xhdpi/nonfree-badoo.png b/app/src/main/res/drawable-xhdpi/nonfree_badoo.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/nonfree-badoo.png
rename to app/src/main/res/drawable-xhdpi/nonfree_badoo.png
diff --git a/app/src/main/res/drawable-xhdpi/nonfree-bouyguestelecom-espaceclient.png b/app/src/main/res/drawable-xhdpi/nonfree_bouyguestelecom.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/nonfree-bouyguestelecom-espaceclient.png
rename to app/src/main/res/drawable-xhdpi/nonfree_bouyguestelecom.png
diff --git a/app/src/main/res/drawable-xhdpi/nonfree-creditdunord.png b/app/src/main/res/drawable-xhdpi/nonfree_creditdunord.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/nonfree-creditdunord.png
rename to app/src/main/res/drawable-xhdpi/nonfree_creditdunord.png
diff --git a/app/src/main/res/drawable-xhdpi/nonfree-famileo.png b/app/src/main/res/drawable-xhdpi/nonfree_famileo.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/nonfree-famileo.png
rename to app/src/main/res/drawable-xhdpi/nonfree_famileo.png
diff --git a/app/src/main/res/drawable-xhdpi/nonfree-fdj.png b/app/src/main/res/drawable-xhdpi/nonfree_fdj.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/nonfree-fdj.png
rename to app/src/main/res/drawable-xhdpi/nonfree_fdj.png
diff --git a/app/src/main/res/drawable-xhdpi/nonfree-fip.png b/app/src/main/res/drawable-xhdpi/nonfree_fip.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/nonfree-fip.png
rename to app/src/main/res/drawable-xhdpi/nonfree_fip.png
diff --git a/app/src/main/res/drawable-xhdpi/nonfree-gmail.png b/app/src/main/res/drawable-xhdpi/nonfree_gmail.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/nonfree-gmail.png
rename to app/src/main/res/drawable-xhdpi/nonfree_gmail.png
diff --git a/app/src/main/res/drawable-xhdpi/nonfree-googlemaps.png b/app/src/main/res/drawable-xhdpi/nonfree_googlemaps.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/nonfree-googlemaps.png
rename to app/src/main/res/drawable-xhdpi/nonfree_googlemaps.png
diff --git a/app/src/main/res/drawable-xhdpi/nonfree-googleplaystore.png b/app/src/main/res/drawable-xhdpi/nonfree_googleplaystore.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/nonfree-googleplaystore.png
rename to app/src/main/res/drawable-xhdpi/nonfree_googleplaystore.png
diff --git a/app/src/main/res/drawable-xhdpi/nonfree-happn.png b/app/src/main/res/drawable-xhdpi/nonfree_happn.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/nonfree-happn.png
rename to app/src/main/res/drawable-xhdpi/nonfree_happn.png
diff --git a/app/src/main/res/drawable-xhdpi/nonfree-ilevia.png b/app/src/main/res/drawable-xhdpi/nonfree_ilevia.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/nonfree-ilevia.png
rename to app/src/main/res/drawable-xhdpi/nonfree_ilevia.png
diff --git a/app/src/main/res/drawable-xhdpi/nonfree-instagram.png b/app/src/main/res/drawable-xhdpi/nonfree_instagram.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/nonfree-instagram.png
rename to app/src/main/res/drawable-xhdpi/nonfree_instagram.png
diff --git a/app/src/main/res/drawable-xhdpi/nonfree-lastfm.png b/app/src/main/res/drawable-xhdpi/nonfree_lastfm.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/nonfree-lastfm.png
rename to app/src/main/res/drawable-xhdpi/nonfree_lastfm.png
diff --git a/app/src/main/res/drawable-xhdpi/nonfree-leboncoin.png b/app/src/main/res/drawable-xhdpi/nonfree_leboncoin.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/nonfree-leboncoin.png
rename to app/src/main/res/drawable-xhdpi/nonfree_leboncoin.png
diff --git a/app/src/main/res/drawable-xhdpi/nonfree-petitbambou.png b/app/src/main/res/drawable-xhdpi/nonfree_petitbambou.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/nonfree-petitbambou.png
rename to app/src/main/res/drawable-xhdpi/nonfree_petitbambou.png
diff --git a/app/src/main/res/drawable-xhdpi/nonfree-shazam.png b/app/src/main/res/drawable-xhdpi/nonfree_shazam.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/nonfree-shazam.png
rename to app/src/main/res/drawable-xhdpi/nonfree_shazam.png
diff --git a/app/src/main/res/drawable-xhdpi/nonfree-skype.png b/app/src/main/res/drawable-xhdpi/nonfree_skype.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/nonfree-skype.png
rename to app/src/main/res/drawable-xhdpi/nonfree_skype.png
diff --git a/app/src/main/res/drawable-xhdpi/nonfree-slack.png b/app/src/main/res/drawable-xhdpi/nonfree_slack.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/nonfree-slack.png
rename to app/src/main/res/drawable-xhdpi/nonfree_slack.png
diff --git a/app/src/main/res/drawable-xhdpi/nonfree-spotify.png b/app/src/main/res/drawable-xhdpi/nonfree_spotify.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/nonfree-spotify.png
rename to app/src/main/res/drawable-xhdpi/nonfree_spotify.png
diff --git a/app/src/main/res/drawable-xhdpi/nonfree-tinder.png b/app/src/main/res/drawable-xhdpi/nonfree_tinder.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/nonfree-tinder.png
rename to app/src/main/res/drawable-xhdpi/nonfree_tinder.png
diff --git a/app/src/main/res/drawable-xhdpi/nonfree-twitter.png b/app/src/main/res/drawable-xhdpi/nonfree_twitter.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/nonfree-twitter.png
rename to app/src/main/res/drawable-xhdpi/nonfree_twitter.png
diff --git a/app/src/main/res/drawable-xhdpi/nonfree-waze.png b/app/src/main/res/drawable-xhdpi/nonfree_waze.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/nonfree-waze.png
rename to app/src/main/res/drawable-xhdpi/nonfree_waze.png
diff --git a/app/src/main/res/drawable-xhdpi/nonfree-whatsapp.png b/app/src/main/res/drawable-xhdpi/nonfree_whatsapp.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/nonfree-whatsapp.png
rename to app/src/main/res/drawable-xhdpi/nonfree_whatsapp.png
diff --git a/app/src/main/res/drawable-xhdpi/nonfree-youtube.png b/app/src/main/res/drawable-xhdpi/nonfree_youtube.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/nonfree-youtube.png
rename to app/src/main/res/drawable-xhdpi/nonfree_youtube.png
diff --git a/app/src/main/res/drawable-xxhdpi/nonfree-arte.png b/app/src/main/res/drawable-xxhdpi/nonfree_arte.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/nonfree-arte.png
rename to app/src/main/res/drawable-xxhdpi/nonfree_arte.png
diff --git a/app/src/main/res/drawable-xxhdpi/nonfree-badoo.png b/app/src/main/res/drawable-xxhdpi/nonfree_badoo.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/nonfree-badoo.png
rename to app/src/main/res/drawable-xxhdpi/nonfree_badoo.png
diff --git a/app/src/main/res/drawable-xxhdpi/nonfree-bouyguestelecom-espaceclient.png b/app/src/main/res/drawable-xxhdpi/nonfree_bouyguestelecom.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/nonfree-bouyguestelecom-espaceclient.png
rename to app/src/main/res/drawable-xxhdpi/nonfree_bouyguestelecom.png
diff --git a/app/src/main/res/drawable-xxhdpi/nonfree-creditdunord.png b/app/src/main/res/drawable-xxhdpi/nonfree_creditdunord.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/nonfree-creditdunord.png
rename to app/src/main/res/drawable-xxhdpi/nonfree_creditdunord.png
diff --git a/app/src/main/res/drawable-xxhdpi/nonfree-famileo.png b/app/src/main/res/drawable-xxhdpi/nonfree_famileo.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/nonfree-famileo.png
rename to app/src/main/res/drawable-xxhdpi/nonfree_famileo.png
diff --git a/app/src/main/res/drawable-xxhdpi/nonfree-fdj.png b/app/src/main/res/drawable-xxhdpi/nonfree_fdj.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/nonfree-fdj.png
rename to app/src/main/res/drawable-xxhdpi/nonfree_fdj.png
diff --git a/app/src/main/res/drawable-xxhdpi/nonfree-fip.png b/app/src/main/res/drawable-xxhdpi/nonfree_fip.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/nonfree-fip.png
rename to app/src/main/res/drawable-xxhdpi/nonfree_fip.png
diff --git a/app/src/main/res/drawable-xxhdpi/nonfree-gmail.png b/app/src/main/res/drawable-xxhdpi/nonfree_gmail.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/nonfree-gmail.png
rename to app/src/main/res/drawable-xxhdpi/nonfree_gmail.png
diff --git a/app/src/main/res/drawable-xxhdpi/nonfree-googlemaps.png b/app/src/main/res/drawable-xxhdpi/nonfree_googlemaps.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/nonfree-googlemaps.png
rename to app/src/main/res/drawable-xxhdpi/nonfree_googlemaps.png
diff --git a/app/src/main/res/drawable-xxhdpi/nonfree-googleplaystore.png b/app/src/main/res/drawable-xxhdpi/nonfree_googleplaystore.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/nonfree-googleplaystore.png
rename to app/src/main/res/drawable-xxhdpi/nonfree_googleplaystore.png
diff --git a/app/src/main/res/drawable-xxhdpi/nonfree-happn.png b/app/src/main/res/drawable-xxhdpi/nonfree_happn.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/nonfree-happn.png
rename to app/src/main/res/drawable-xxhdpi/nonfree_happn.png
diff --git a/app/src/main/res/drawable-xxhdpi/nonfree-ilevia.png b/app/src/main/res/drawable-xxhdpi/nonfree_ilevia.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/nonfree-ilevia.png
rename to app/src/main/res/drawable-xxhdpi/nonfree_ilevia.png
diff --git a/app/src/main/res/drawable-xxhdpi/nonfree-instagram.png b/app/src/main/res/drawable-xxhdpi/nonfree_instagram.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/nonfree-instagram.png
rename to app/src/main/res/drawable-xxhdpi/nonfree_instagram.png
diff --git a/app/src/main/res/drawable-xxhdpi/nonfree-lastfm.png b/app/src/main/res/drawable-xxhdpi/nonfree_lastfm.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/nonfree-lastfm.png
rename to app/src/main/res/drawable-xxhdpi/nonfree_lastfm.png
diff --git a/app/src/main/res/drawable-xxhdpi/nonfree-leboncoin.png b/app/src/main/res/drawable-xxhdpi/nonfree_leboncoin.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/nonfree-leboncoin.png
rename to app/src/main/res/drawable-xxhdpi/nonfree_leboncoin.png
diff --git a/app/src/main/res/drawable-xxhdpi/nonfree-petitbambou.png b/app/src/main/res/drawable-xxhdpi/nonfree_petitbambou.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/nonfree-petitbambou.png
rename to app/src/main/res/drawable-xxhdpi/nonfree_petitbambou.png
diff --git a/app/src/main/res/drawable-xxhdpi/nonfree-shazam.png b/app/src/main/res/drawable-xxhdpi/nonfree_shazam.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/nonfree-shazam.png
rename to app/src/main/res/drawable-xxhdpi/nonfree_shazam.png
diff --git a/app/src/main/res/drawable-xxhdpi/nonfree-skype.png b/app/src/main/res/drawable-xxhdpi/nonfree_skype.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/nonfree-skype.png
rename to app/src/main/res/drawable-xxhdpi/nonfree_skype.png
diff --git a/app/src/main/res/drawable-xxhdpi/nonfree-slack.png b/app/src/main/res/drawable-xxhdpi/nonfree_slack.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/nonfree-slack.png
rename to app/src/main/res/drawable-xxhdpi/nonfree_slack.png
diff --git a/app/src/main/res/drawable-xxhdpi/nonfree-spotify.png b/app/src/main/res/drawable-xxhdpi/nonfree_spotify.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/nonfree-spotify.png
rename to app/src/main/res/drawable-xxhdpi/nonfree_spotify.png
diff --git a/app/src/main/res/drawable-xxhdpi/nonfree-tinder.png b/app/src/main/res/drawable-xxhdpi/nonfree_tinder.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/nonfree-tinder.png
rename to app/src/main/res/drawable-xxhdpi/nonfree_tinder.png
diff --git a/app/src/main/res/drawable-xxhdpi/nonfree-twitter.png b/app/src/main/res/drawable-xxhdpi/nonfree_twitter.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/nonfree-twitter.png
rename to app/src/main/res/drawable-xxhdpi/nonfree_twitter.png
diff --git a/app/src/main/res/drawable-xxhdpi/nonfree-waze.png b/app/src/main/res/drawable-xxhdpi/nonfree_waze.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/nonfree-waze.png
rename to app/src/main/res/drawable-xxhdpi/nonfree_waze.png
diff --git a/app/src/main/res/drawable-xxhdpi/nonfree-whatsapp.png b/app/src/main/res/drawable-xxhdpi/nonfree_whatsapp.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/nonfree-whatsapp.png
rename to app/src/main/res/drawable-xxhdpi/nonfree_whatsapp.png
diff --git a/app/src/main/res/drawable-xxhdpi/nonfree-youtube.png b/app/src/main/res/drawable-xxhdpi/nonfree_youtube.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/nonfree-youtube.png
rename to app/src/main/res/drawable-xxhdpi/nonfree_youtube.png
diff --git a/app/src/main/res/drawable-xxxhdpi/nonfree-arte.png b/app/src/main/res/drawable-xxxhdpi/nonfree_arte.png
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/nonfree-arte.png
rename to app/src/main/res/drawable-xxxhdpi/nonfree_arte.png
diff --git a/app/src/main/res/drawable-xxxhdpi/nonfree-badoo.png b/app/src/main/res/drawable-xxxhdpi/nonfree_badoo.png
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/nonfree-badoo.png
rename to app/src/main/res/drawable-xxxhdpi/nonfree_badoo.png
diff --git a/app/src/main/res/drawable-xxxhdpi/nonfree-bouyguestelecom-espaceclient.png b/app/src/main/res/drawable-xxxhdpi/nonfree_bouyguestelecom.png
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/nonfree-bouyguestelecom-espaceclient.png
rename to app/src/main/res/drawable-xxxhdpi/nonfree_bouyguestelecom.png
diff --git a/app/src/main/res/drawable-xxxhdpi/nonfree-creditdunord.png b/app/src/main/res/drawable-xxxhdpi/nonfree_creditdunord.png
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/nonfree-creditdunord.png
rename to app/src/main/res/drawable-xxxhdpi/nonfree_creditdunord.png
diff --git a/app/src/main/res/drawable-xxxhdpi/nonfree-famileo.png b/app/src/main/res/drawable-xxxhdpi/nonfree_famileo.png
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/nonfree-famileo.png
rename to app/src/main/res/drawable-xxxhdpi/nonfree_famileo.png
diff --git a/app/src/main/res/drawable-xxxhdpi/nonfree-fdj.png b/app/src/main/res/drawable-xxxhdpi/nonfree_fdj.png
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/nonfree-fdj.png
rename to app/src/main/res/drawable-xxxhdpi/nonfree_fdj.png
diff --git a/app/src/main/res/drawable-xxxhdpi/nonfree-fip.png b/app/src/main/res/drawable-xxxhdpi/nonfree_fip.png
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/nonfree-fip.png
rename to app/src/main/res/drawable-xxxhdpi/nonfree_fip.png
diff --git a/app/src/main/res/drawable-xxxhdpi/nonfree-gmail.png b/app/src/main/res/drawable-xxxhdpi/nonfree_gmail.png
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/nonfree-gmail.png
rename to app/src/main/res/drawable-xxxhdpi/nonfree_gmail.png
diff --git a/app/src/main/res/drawable-xxxhdpi/nonfree-googlemaps.png b/app/src/main/res/drawable-xxxhdpi/nonfree_googlemaps.png
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/nonfree-googlemaps.png
rename to app/src/main/res/drawable-xxxhdpi/nonfree_googlemaps.png
diff --git a/app/src/main/res/drawable-xxxhdpi/nonfree-googleplaystore.png b/app/src/main/res/drawable-xxxhdpi/nonfree_googleplaystore.png
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/nonfree-googleplaystore.png
rename to app/src/main/res/drawable-xxxhdpi/nonfree_googleplaystore.png
diff --git a/app/src/main/res/drawable-xxxhdpi/nonfree-happn.png b/app/src/main/res/drawable-xxxhdpi/nonfree_happn.png
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/nonfree-happn.png
rename to app/src/main/res/drawable-xxxhdpi/nonfree_happn.png
diff --git a/app/src/main/res/drawable-xxxhdpi/nonfree-ilevia.png b/app/src/main/res/drawable-xxxhdpi/nonfree_ilevia.png
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/nonfree-ilevia.png
rename to app/src/main/res/drawable-xxxhdpi/nonfree_ilevia.png
diff --git a/app/src/main/res/drawable-xxxhdpi/nonfree-instagram.png b/app/src/main/res/drawable-xxxhdpi/nonfree_instagram.png
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/nonfree-instagram.png
rename to app/src/main/res/drawable-xxxhdpi/nonfree_instagram.png
diff --git a/app/src/main/res/drawable-xxxhdpi/nonfree-lastfm.png b/app/src/main/res/drawable-xxxhdpi/nonfree_lastfm.png
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/nonfree-lastfm.png
rename to app/src/main/res/drawable-xxxhdpi/nonfree_lastfm.png
diff --git a/app/src/main/res/drawable-xxxhdpi/nonfree-leboncoin.png b/app/src/main/res/drawable-xxxhdpi/nonfree_leboncoin.png
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/nonfree-leboncoin.png
rename to app/src/main/res/drawable-xxxhdpi/nonfree_leboncoin.png
diff --git a/app/src/main/res/drawable-xxxhdpi/nonfree-petitbambou.png b/app/src/main/res/drawable-xxxhdpi/nonfree_petitbambou.png
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/nonfree-petitbambou.png
rename to app/src/main/res/drawable-xxxhdpi/nonfree_petitbambou.png
diff --git a/app/src/main/res/drawable-xxxhdpi/nonfree-shazam.png b/app/src/main/res/drawable-xxxhdpi/nonfree_shazam.png
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/nonfree-shazam.png
rename to app/src/main/res/drawable-xxxhdpi/nonfree_shazam.png
diff --git a/app/src/main/res/drawable-xxxhdpi/nonfree-skype.png b/app/src/main/res/drawable-xxxhdpi/nonfree_skype.png
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/nonfree-skype.png
rename to app/src/main/res/drawable-xxxhdpi/nonfree_skype.png
diff --git a/app/src/main/res/drawable-xxxhdpi/nonfree-slack.png b/app/src/main/res/drawable-xxxhdpi/nonfree_slack.png
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/nonfree-slack.png
rename to app/src/main/res/drawable-xxxhdpi/nonfree_slack.png
diff --git a/app/src/main/res/drawable-xxxhdpi/nonfree-spotify.png b/app/src/main/res/drawable-xxxhdpi/nonfree_spotify.png
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/nonfree-spotify.png
rename to app/src/main/res/drawable-xxxhdpi/nonfree_spotify.png
diff --git a/app/src/main/res/drawable-xxxhdpi/nonfree-tinder.png b/app/src/main/res/drawable-xxxhdpi/nonfree_tinder.png
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/nonfree-tinder.png
rename to app/src/main/res/drawable-xxxhdpi/nonfree_tinder.png
diff --git a/app/src/main/res/drawable-xxxhdpi/nonfree-twitter.png b/app/src/main/res/drawable-xxxhdpi/nonfree_twitter.png
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/nonfree-twitter.png
rename to app/src/main/res/drawable-xxxhdpi/nonfree_twitter.png
diff --git a/app/src/main/res/drawable-xxxhdpi/nonfree-waze.png b/app/src/main/res/drawable-xxxhdpi/nonfree_waze.png
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/nonfree-waze.png
rename to app/src/main/res/drawable-xxxhdpi/nonfree_waze.png
diff --git a/app/src/main/res/drawable-xxxhdpi/nonfree-whatsapp.png b/app/src/main/res/drawable-xxxhdpi/nonfree_whatsapp.png
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/nonfree-whatsapp.png
rename to app/src/main/res/drawable-xxxhdpi/nonfree_whatsapp.png
diff --git a/app/src/main/res/drawable-xxxhdpi/nonfree-youtube.png b/app/src/main/res/drawable-xxxhdpi/nonfree_youtube.png
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/nonfree-youtube.png
rename to app/src/main/res/drawable-xxxhdpi/nonfree_youtube.png
diff --git a/app/src/main/res/values/iconpack.xml b/app/src/main/res/values/iconpack.xml
index c1a9148216d77558cad2e702e48233def56eebc4..678222fba014212a20976af087e06c88ac15556c 100644
--- a/app/src/main/res/values/iconpack.xml
+++ b/app/src/main/res/values/iconpack.xml
@@ -498,31 +498,31 @@
 <item>nlpconfig</item>
 <item>nocknock</item>
 <item>nomad</item>
-<item>nonfree-arte</item>
-<item>nonfree-badoo</item>
-<item>nonfree-bouyguestelecom-espaceclient</item>
-<item>nonfree-creditdunord</item>
-<item>nonfree-famileo</item>
-<item>nonfree-fdj</item>
-<item>nonfree-fip</item>
-<item>nonfree-gmail</item>
-<item>nonfree-googlemaps</item>
-<item>nonfree-googleplaystore</item>
-<item>nonfree-happn</item>
-<item>nonfree-ilevia</item>
-<item>nonfree-instagram</item>
-<item>nonfree-lastfm</item>
-<item>nonfree-leboncoin</item>
-<item>nonfree-petitbambou</item>
-<item>nonfree-shazam</item>
-<item>nonfree-skype</item>
-<item>nonfree-slack</item>
-<item>nonfree-spotify</item>
-<item>nonfree-tinder</item>
-<item>nonfree-twitter</item>
-<item>nonfree-waze</item>
-<item>nonfree-whatsapp</item>
-<item>nonfree-youtube</item>
+<item>nonfree_arte</item>
+<item>nonfree_badoo</item>
+<item>nonfree_bouyguestelecom</item>
+<item>nonfree_creditdunord</item>
+<item>nonfree_famileo</item>
+<item>nonfree_fdj</item>
+<item>nonfree_fip</item>
+<item>nonfree_gmail</item>
+<item>nonfree_googlemaps</item>
+<item>nonfree_googleplaystore</item>
+<item>nonfree_happn</item>
+<item>nonfree_ilevia</item>
+<item>nonfree_instagram</item>
+<item>nonfree_lastfm</item>
+<item>nonfree_leboncoin</item>
+<item>nonfree_petitbambou</item>
+<item>nonfree_shazam</item>
+<item>nonfree_skype</item>
+<item>nonfree_slack</item>
+<item>nonfree_spotify</item>
+<item>nonfree_tinder</item>
+<item>nonfree_twitter</item>
+<item>nonfree_waze</item>
+<item>nonfree_whatsapp</item>
+<item>nonfree_youtube</item>
 <item>nonsensenotepad</item>
 <item>nori</item>
 <item>nostrangersms</item>
diff --git a/app/src/main/res/xml/appfilter.xml b/app/src/main/res/xml/appfilter.xml
index cfe47773f0df6c430328d99b71282fb5fc21849c..952d26bab0a90c2bd79d32ed805e0e4302b5a74e 100644
--- a/app/src/main/res/xml/appfilter.xml
+++ b/app/src/main/res/xml/appfilter.xml
@@ -4800,13 +4800,13 @@
     <!-- Google default apps icons -->
     <item
         component="ComponentInfo{com.google.android.apps.maps/com.google.android.maps.MapsActivity}"
-        drawable="nonfree-googlemaps" />
+        drawable="nonfree_googlemaps" />
     <item
         component="ComponentInfo{com.google.android.gm/com.google.android.gm.ConversationListActivityGmail}"
-        drawable="nonfree-gmail" />
+        drawable="nonfree_gmail" />
     <item
         component="ComponentInfo{com.google.android.youtube/com.google.android.youtube.app.honeycomb.Shell$HomeActivity}"
-        drawable="nonfree-youtube" />
+        drawable="nonfree_youtube" />
 
     <!-- Samsung default apps icons -->
     <item
@@ -4822,67 +4822,67 @@
     <!-- Misc non free icons -->
     <item
         component="ComponentInfo{tv.arte.plus7/tv.arte.plus7.presentation.LaunchActivity}"
-        drawable="nonfree-arte" />
+        drawable="nonfree_arte" />
     <item
         component="ComponentInfo{com.badoo.mobile/com.badoo.mobile.android.BadooActivity}"
-        drawable="nonfree-badoo" />
+        drawable="nonfree_badoo" />
     <item
         component="ComponentInfo{com.ocito.cdn.activity.creditdunord/com.societegenerale.templateoriginalcdn.OriginalCDNMainController}"
-        drawable="nonfree-creditdunord" />
+        drawable="nonfree_creditdunord" />
     <item
         component="ComponentInfo{fr.bouyguestelecom.ecm.android/fr.bouyguestelecom.ecm.android.ecm.modules.newlogin.activities.EcmSplashActivity}"
-        drawable="nonfree-bouyguestelecom-espaceclient" />
+        drawable="nonfree_bouyguestelecom" />
     <item
         component="ComponentInfo{com.entourage.famileo/com.entourage.famileo.activity.SplashActivity}"
-        drawable="nonfree-famileo" />
+        drawable="nonfree_famileo" />
     <item
         component="ComponentInfo{fr.fdj.apps.fdj/fr.fdj.apps.maitre.ui.activities.SplashScreenActivity}"
-        drawable="nonfree-fdj" />
+        drawable="nonfree_fdj" />
     <item
         component="ComponentInfo{com.radiofrance.radio.fip.android/com.radiofrance.fipandroid.screen.splashscreen.SplashActivity}"
-        drawable="nonfree-fip" />
+        drawable="nonfree_fip" />
     <item
         component="ComponentInfo{com.ftw_and_co.happn/com.ftw_and_co.happn.ui.splash.SplashActivity}"
-        drawable="nonfree-happn" />
+        drawable="nonfree_happn" />
     <item
         component="ComponentInfo{com.transpole.mobi/com.kisiodigital.adm.MainActivity}"
-        drawable="nonfree-ilevia" />
+        drawable="nonfree_ilevia" />
     <item
         component="ComponentInfo{com.instagram.android/com.instagram.android.activity.MainTabActivity}"
-        drawable="nonfree-instagram" />
+        drawable="nonfree_instagram" />
     <item
         component="ComponentInfo{fm.last.android/fm.last.android.ui.activity.SplashScreen}"
-        drawable="nonfree-lastfm" />
+        drawable="nonfree_lastfm" />
     <item
         component="ComponentInfo{fr.leboncoin/fr.leboncoin.feature.splashscreen.ui.activities.SplashScreenActivity}"
-        drawable="nonfree-leboncoin" />
+        drawable="nonfree_leboncoin" />
     <item
         component="ComponentInfo{com.petitbambou/com.petitbambou.frontend.launcher.ActivityLauncherCustomizable}"
-        drawable="nonfree-petitbambou" />
+        drawable="nonfree_petitbambou" />
     <item
         component="ComponentInfo{com.shazam.android/com.shazam.android.activities.SplashActivity}"
-        drawable="nonfree-shazam" />
+        drawable="nonfree_shazam" />
     <item
         component="ComponentInfo{com.skype.raider/com.skype.raider.Main}"
-        drawable="nonfree-skype" />
+        drawable="nonfree_skype" />
     <item
         component="ComponentInfo{com.Slack/com.Slack.ui.HomeActivity}"
-        drawable="nonfree-slack" />
+        drawable="nonfree_slack" />
     <item
         component="ComponentInfo{com.spotify.music/com.spotify.music.MainActivity}"
-        drawable="nonfree-spotify" />
+        drawable="nonfree_spotify" />
     <item
         component="ComponentInfo{com.tinder/com.tinder.activities.LoginActivity}"
-        drawable="nonfree-tinder" />
+        drawable="nonfree_tinder" />
     <item
         component="ComponentInfo{com.twitter.android/com.twitter.android.StartActivity}"
-        drawable="nonfree-twitter" />
+        drawable="nonfree_twitter" />
     <item
         component="ComponentInfo{com.waze/com.waze.FreeMapAppActivity}"
-        drawable="nonfree-waze" />
+        drawable="nonfree_waze" />
     <item
         component="ComponentInfo{com.whatsapp/com.whatsapp.Main}"
-        drawable="nonfree-whatsapp" />
+        drawable="nonfree_whatsapp" />
 
     <!-- end of non free icons -->
 
diff --git a/app/src/main/res/xml/drawable.xml b/app/src/main/res/xml/drawable.xml
index dd3894ffc76297f7b611ff9e9eaf9928186c9049..9d63a1920fdd8ca0d38bff304a679ac929b1756d 100644
--- a/app/src/main/res/xml/drawable.xml
+++ b/app/src/main/res/xml/drawable.xml
@@ -498,31 +498,31 @@
 <item drawable="nlpconfig" />
 <item drawable="nocknock" />
 <item drawable="nomad" />
-<item drawable="nonfree-arte" />
-<item drawable="nonfree-badoo" />
-<item drawable="nonfree-bouyguestelecom-espaceclient" />
-<item drawable="nonfree-creditdunord" />
-<item drawable="nonfree-famileo" />
-<item drawable="nonfree-fdj" />
-<item drawable="nonfree-fip" />
-<item drawable="nonfree-gmail" />
-<item drawable="nonfree-googlemaps" />
-<item drawable="nonfree-googleplaystore" />
-<item drawable="nonfree-happn" />
-<item drawable="nonfree-ilevia" />
-<item drawable="nonfree-instagram" />
-<item drawable="nonfree-lastfm" />
-<item drawable="nonfree-leboncoin" />
-<item drawable="nonfree-petitbambou" />
-<item drawable="nonfree-shazam" />
-<item drawable="nonfree-skype" />
-<item drawable="nonfree-slack" />
-<item drawable="nonfree-spotify" />
-<item drawable="nonfree-tinder" />
-<item drawable="nonfree-twitter" />
-<item drawable="nonfree-waze" />
-<item drawable="nonfree-whatsapp" />
-<item drawable="nonfree-youtube" />
+<item drawable="nonfree_arte" />
+<item drawable="nonfree_badoo" />
+<item drawable="nonfree_bouyguestelecom" />
+<item drawable="nonfree_creditdunord" />
+<item drawable="nonfree_famileo" />
+<item drawable="nonfree_fdj" />
+<item drawable="nonfree_fip" />
+<item drawable="nonfree_gmail" />
+<item drawable="nonfree_googlemaps" />
+<item drawable="nonfree_googleplaystore" />
+<item drawable="nonfree_happn" />
+<item drawable="nonfree_ilevia" />
+<item drawable="nonfree_instagram" />
+<item drawable="nonfree_lastfm" />
+<item drawable="nonfree_leboncoin" />
+<item drawable="nonfree_petitbambou" />
+<item drawable="nonfree_shazam" />
+<item drawable="nonfree_skype" />
+<item drawable="nonfree_slack" />
+<item drawable="nonfree_spotify" />
+<item drawable="nonfree_tinder" />
+<item drawable="nonfree_twitter" />
+<item drawable="nonfree_waze" />
+<item drawable="nonfree_whatsapp" />
+<item drawable="nonfree_youtube" />
 <item drawable="nonsensenotepad" />
 <item drawable="nori" />
 <item drawable="nostrangersms" />
diff --git a/icons/nonfree-arte.svg b/icons/nonfree_arte.svg
similarity index 100%
rename from icons/nonfree-arte.svg
rename to icons/nonfree_arte.svg
diff --git a/icons/nonfree-badoo.svg b/icons/nonfree_badoo.svg
similarity index 100%
rename from icons/nonfree-badoo.svg
rename to icons/nonfree_badoo.svg
diff --git a/icons/nonfree-bouyguestelecom-espaceclient.svg b/icons/nonfree_bouyguestelecom.svg
similarity index 100%
rename from icons/nonfree-bouyguestelecom-espaceclient.svg
rename to icons/nonfree_bouyguestelecom.svg
diff --git a/icons/nonfree-creditdunord.svg b/icons/nonfree_creditdunord.svg
similarity index 100%
rename from icons/nonfree-creditdunord.svg
rename to icons/nonfree_creditdunord.svg
diff --git a/icons/nonfree-famileo.svg b/icons/nonfree_famileo.svg
similarity index 100%
rename from icons/nonfree-famileo.svg
rename to icons/nonfree_famileo.svg
diff --git a/icons/nonfree-fdj.svg b/icons/nonfree_fdj.svg
similarity index 100%
rename from icons/nonfree-fdj.svg
rename to icons/nonfree_fdj.svg
diff --git a/icons/nonfree-fip.svg b/icons/nonfree_fip.svg
similarity index 100%
rename from icons/nonfree-fip.svg
rename to icons/nonfree_fip.svg
diff --git a/icons/nonfree-gmail.svg b/icons/nonfree_gmail.svg
similarity index 100%
rename from icons/nonfree-gmail.svg
rename to icons/nonfree_gmail.svg
diff --git a/icons/nonfree-googlemaps.svg b/icons/nonfree_googlemaps.svg
similarity index 100%
rename from icons/nonfree-googlemaps.svg
rename to icons/nonfree_googlemaps.svg
diff --git a/icons/nonfree-googleplaystore.svg b/icons/nonfree_googleplaystore.svg
similarity index 100%
rename from icons/nonfree-googleplaystore.svg
rename to icons/nonfree_googleplaystore.svg
diff --git a/icons/nonfree-happn.svg b/icons/nonfree_happn.svg
similarity index 100%
rename from icons/nonfree-happn.svg
rename to icons/nonfree_happn.svg
diff --git a/icons/nonfree-ilevia.svg b/icons/nonfree_ilevia.svg
similarity index 100%
rename from icons/nonfree-ilevia.svg
rename to icons/nonfree_ilevia.svg
diff --git a/icons/nonfree-instagram.svg b/icons/nonfree_instagram.svg
similarity index 100%
rename from icons/nonfree-instagram.svg
rename to icons/nonfree_instagram.svg
diff --git a/icons/nonfree-lastfm.svg b/icons/nonfree_lastfm.svg
similarity index 100%
rename from icons/nonfree-lastfm.svg
rename to icons/nonfree_lastfm.svg
diff --git a/icons/nonfree-leboncoin.svg b/icons/nonfree_leboncoin.svg
similarity index 100%
rename from icons/nonfree-leboncoin.svg
rename to icons/nonfree_leboncoin.svg
diff --git a/icons/nonfree-petitbambou.svg b/icons/nonfree_petitbambou.svg
similarity index 100%
rename from icons/nonfree-petitbambou.svg
rename to icons/nonfree_petitbambou.svg
diff --git a/icons/nonfree-shazam.svg b/icons/nonfree_shazam.svg
similarity index 100%
rename from icons/nonfree-shazam.svg
rename to icons/nonfree_shazam.svg
diff --git a/icons/nonfree-skype.svg b/icons/nonfree_skype.svg
similarity index 100%
rename from icons/nonfree-skype.svg
rename to icons/nonfree_skype.svg
diff --git a/icons/nonfree-slack.svg b/icons/nonfree_slack.svg
similarity index 100%
rename from icons/nonfree-slack.svg
rename to icons/nonfree_slack.svg
diff --git a/icons/nonfree-spotify.svg b/icons/nonfree_spotify.svg
similarity index 100%
rename from icons/nonfree-spotify.svg
rename to icons/nonfree_spotify.svg
diff --git a/icons/nonfree-tinder.svg b/icons/nonfree_tinder.svg
similarity index 100%
rename from icons/nonfree-tinder.svg
rename to icons/nonfree_tinder.svg
diff --git a/icons/nonfree-twitter.svg b/icons/nonfree_twitter.svg
similarity index 100%
rename from icons/nonfree-twitter.svg
rename to icons/nonfree_twitter.svg
diff --git a/icons/nonfree-waze.svg b/icons/nonfree_waze.svg
similarity index 100%
rename from icons/nonfree-waze.svg
rename to icons/nonfree_waze.svg
diff --git a/icons/nonfree-whatsapp.svg b/icons/nonfree_whatsapp.svg
similarity index 100%
rename from icons/nonfree-whatsapp.svg
rename to icons/nonfree_whatsapp.svg
diff --git a/icons/nonfree-youtube.svg b/icons/nonfree_youtube.svg
similarity index 100%
rename from icons/nonfree-youtube.svg
rename to icons/nonfree_youtube.svg