Merge "Update icon for more settings" into main