Added circular class back, fixed icons