Changed names of icons for good practice
Tweaks