I don't know what this commit does
Fuck this shit
used git correctly in order to merge changes without fucking everything up
merge settingIcons into master