Improve workspace identification

We would like to have the Personal workspaces flagged differently from team/shared workspaces as, currently, it is not possible for us to identify what is a personal workspace or a team/shared workspace as both look the same on the UI.
This generates the following issues:

1. Add-ons -> Some are personal workspaces exclusive
2. Management -> If the account/workspace owner deactivate/delete his/her Atlassian account, his/her Bitbucket account will also be unavailable (while these changes do not affect shared/team workspaces)
3. Upgrade -> Since it is not possible to administrate another user persona workspace, we are not able to upgrade/downgrade it as needed.

eg.