Including icon and small modifications.