Redid Icon and incorporated non-rectangle buttons