Enhancement/162/adjust icon styles