Button icon improvements