Merge "Update the icon/style to make it align with the design"