Improve icon alignment and only color text (not the background)