flip icon and minor fixes