Remove un-necessary class; fix icon maybe please?