Lots of changes
Move icons