make spacing for icon class's consistent

complete redo of pr 4372.