Icon Magic

UI looks decent now