move icon setting to where both button + removeal of text work