Merge "Add qs icon and fix status icon UI"