icons revamped
merge conflict from floor to master