diff --git a/apps/docs/content/examples/imports/_serviceaccount_role.mdx b/apps/docs/content/examples/imports/_serviceaccount_role.mdx
index 7c863926f..e67b0e42c 100644
--- a/apps/docs/content/examples/imports/_serviceaccount_role.mdx
+++ b/apps/docs/content/examples/imports/_serviceaccount_role.mdx
@@ -1,4 +1,4 @@
-In order to access this route, you must create the role `read:messages` in your ZITADEL project and also create an authorization for the service account you created by adding the role to the user. Follow these steps to do so:
+In order to access this route, you must create the role `read:messages` in your ZITADEL project and also assign a role to the service account you created by adding the role to the user. Follow these steps to do so:
1. Go to your project and select **Roles**. Click **New**.
@@ -12,7 +12,7 @@ In order to access this route, you must create the role `read:messages` in your

-4. To assign this role to a user, click on **Authorizations**.
+4. To assign this role to a user, click on **Role Assignments**.

@@ -20,7 +20,7 @@ In order to access this route, you must create the role `read:messages` in your

-6. Select the project where this authorization is applicable.
+6. Select the project where this role assignment is applicable.

7. Click **Continue**.
diff --git a/apps/docs/content/examples/login/nextjs-b2b.mdx b/apps/docs/content/examples/login/nextjs-b2b.mdx
index a3135ceea..0994ca474 100644
--- a/apps/docs/content/examples/login/nextjs-b2b.mdx
+++ b/apps/docs/content/examples/login/nextjs-b2b.mdx
@@ -167,7 +167,7 @@ Give `Alice Admin` the roles `reader` and `admin`.
You should be able to log in to the Demo Application with `Alice Admin` and see all granted projects.
-You can log out and log in with `Eric Employee` and you should only have access to the granted projects, but not to the Authorizations tab.
+You can log out and log in with `Eric Employee` and you should only have access to the granted projects, but not to the `Role Assignments` tab.
## What next
@@ -176,4 +176,4 @@ You could create another project (eg, `Data Cube`) and grant that project to the
You could also build out the code (PRs welcome :wink:) for this application, for example:
- Create a mock `datacube-web` application and show how SSO between the portal and the application works with ZITADEL.
-- Implement a feature in the Authorization tab to assign roles directly from the customer portal.
+- Implement a feature in the `Role Assignments` tab to assign roles directly from the customer portal.
diff --git a/apps/docs/content/examples/login/python-django.mdx b/apps/docs/content/examples/login/python-django.mdx
index 3cbe4af66..cab6b8f93 100644
--- a/apps/docs/content/examples/login/python-django.mdx
+++ b/apps/docs/content/examples/login/python-django.mdx
@@ -42,9 +42,9 @@ If none of the roles is provided as a user, the user in Django will not be creat

-Finally, we can assign the roles to users in the project's authorizations tab.
+Finally, we can assign the roles to users in the project's `Role Assignments` tab.
-
+
### Set up application and obtain secrets
@@ -198,7 +198,7 @@ Never store and commit secrets in the ".env" or settings.py file
### Authentication and authorization
-To check the authentication and authorization the views in the polls application are extended with decorators:
+To check the authentication and authorization, the views in the polls application are extended with decorators:
```python reference
https://github.com/zitadel/example-python-django-oidc/blob/main/mysite/views.py
diff --git a/apps/docs/content/examples/secure-api/go.mdx b/apps/docs/content/examples/secure-api/go.mdx
index 1928699ca..4b5e01474 100644
--- a/apps/docs/content/examples/secure-api/go.mdx
+++ b/apps/docs/content/examples/secure-api/go.mdx
@@ -62,7 +62,7 @@ Give the service account a name and a username. Select `Bearer` as *Access Token

-### Create service account and personal access token (PAT)
+### Create a service account and a personal access token (PAT)
Once done, from the left panel of the user management, click on Personal Access Token and create a new one.
@@ -205,11 +205,11 @@ Finally, create the role as shown below:

-After you have created the role, let's grant it the user, who requested the tasks.
-Click on `Authorization` in the navigation and create a new one by selecting the user and the `admin` role.
+After you have created the role, let's grant it to the user who requested the tasks.
+Click on `Role Assignments` in the navigation and create a new one by selecting the user and the `admin` role.
After successful creation, it should look like:
-
+
So you should now be able to add a new task:
diff --git a/apps/docs/content/examples/secure-api/java-spring.mdx b/apps/docs/content/examples/secure-api/java-spring.mdx
index e750d0f60..623c357e7 100644
--- a/apps/docs/content/examples/secure-api/java-spring.mdx
+++ b/apps/docs/content/examples/secure-api/java-spring.mdx
@@ -226,11 +226,11 @@ Finally, create the role as shown below:

-After you have created the role, let's grant it the user, who requested the tasks.
-Click on `Authorization` in the navigation and create a new one by selecting the user and the `admin` role.
+After you have created the role, let's grant it to the user who requested the tasks.
+Click on `Role Assignments` in the navigation and create a new one by selecting the user and the `admin` role.
After successful creation, it should look like:
-
+
So you should now be able to add a new task:
diff --git a/apps/docs/content/examples/secure-api/pylon.mdx b/apps/docs/content/examples/secure-api/pylon.mdx
index 6934b8dec..3857731f2 100644
--- a/apps/docs/content/examples/secure-api/pylon.mdx
+++ b/apps/docs/content/examples/secure-api/pylon.mdx
@@ -24,7 +24,7 @@ Before we can start building our application, we have to do a few setup steps in
-### Give Service Account an authorization
+### Assign a role to the Service Account
diff --git a/apps/docs/content/examples/secure-api/python-django.mdx b/apps/docs/content/examples/secure-api/python-django.mdx
index a2ab6d4e1..4bdba66c4 100644
--- a/apps/docs/content/examples/secure-api/python-django.mdx
+++ b/apps/docs/content/examples/secure-api/python-django.mdx
@@ -11,7 +11,7 @@ import SetupPython from '../imports/_setup_python.mdx';
This integration guide demonstrates the recommended way to incorporate ZITADEL into your Django Python application.
It explains how to check the token validity in the API and how to check for permissions.
-By the end of this guide, your application will have three different endpoint which are public, private(valid token) and private-scoped(valid token with specific role).
+By the end of this guide, your application will have three different endpoints that are public, private (valid token) and private-scoped (valid token with a specific role).
This documentation references our [example](https://github.com/zitadel/example-django-python-oauth) on GitHub.
@@ -19,7 +19,7 @@ This documentation references our [example](https://github.com/zitadel/example-d
## ZITADEL setup
-Before we can start building our application, we have to do a few setup steps in ZITADEL Management Console.
+Before we can start building our application, we have to do a few setup steps in the ZITADEL Management Console.
### Create application
@@ -29,7 +29,7 @@ Before we can start building our application, we have to do a few setup steps in
-### Give Service Account an authorization
+### Assign a role to the Service Account
diff --git a/apps/docs/content/examples/secure-api/python-flask.mdx b/apps/docs/content/examples/secure-api/python-flask.mdx
index 9ab0f76b8..cf9f66b7c 100644
--- a/apps/docs/content/examples/secure-api/python-flask.mdx
+++ b/apps/docs/content/examples/secure-api/python-flask.mdx
@@ -187,7 +187,7 @@ CLIENT_SECRET = "NVAp70IqiGmJldbS...."

1. Create a service account and a Personal Access Token (PAT) for that user by following [this guide](/guides/integrate/service-accounts/personal-access-token#create-a-service-account-with-a-pat).
-2. To enable authorization, follow [this guide](/guides/manage/console/roles) to create a role `read:messages` on your project.
+2. To assign roles, follow [this guide](/guides/manage/console/roles) to create a role `read:messages` on your project.
3. Next, add the role `read:messages` to the service account you created. Follow this [guide](/guides/manage/console/roles#role-assignments) for more information on creating a role assignment.
### Run the API
diff --git a/apps/docs/content/guides/integrate/onboarding/b2b.mdx b/apps/docs/content/guides/integrate/onboarding/b2b.mdx
index ae85d03ef..9897a56ac 100644
--- a/apps/docs/content/guides/integrate/onboarding/b2b.mdx
+++ b/apps/docs/content/guides/integrate/onboarding/b2b.mdx
@@ -31,16 +31,10 @@ Make sure that your admins have a [Administrator role](/guides/manage/console/ad
### Create a customer
-You do have two different options to create a new Organization.
-1. If you are on a specific organization, click the dropdown in the header and press click "+ New Organization"
+1. Create a new Organization. Click the dropdown in the header and click "+ New Organization" to be redirected to the create organization screen.
-2. If you are on the instance level, go to the Organization tab and click the "+ New" button above the Organization list.
-
-
-
-No matter which option you choose you will be redirected to the create organization screen.
If the setting "Use your personal account as organization owner" is enabled, your user will automatically get the role "ORG_OWNER" in the organization.
Give the organization a name and create it.
diff --git a/apps/docs/public/img/examples/secure-api/app-jwt/1.png b/apps/docs/public/img/examples/secure-api/app-jwt/1.png
index 1025eb869..4e4a825b1 100644
Binary files a/apps/docs/public/img/examples/secure-api/app-jwt/1.png and b/apps/docs/public/img/examples/secure-api/app-jwt/1.png differ
diff --git a/apps/docs/public/img/examples/secure-api/app-jwt/10.png b/apps/docs/public/img/examples/secure-api/app-jwt/10.png
index 05c58384b..6eed9cade 100644
Binary files a/apps/docs/public/img/examples/secure-api/app-jwt/10.png and b/apps/docs/public/img/examples/secure-api/app-jwt/10.png differ
diff --git a/apps/docs/public/img/examples/secure-api/app-jwt/11.png b/apps/docs/public/img/examples/secure-api/app-jwt/11.png
index c3b984383..02dfb0af0 100644
Binary files a/apps/docs/public/img/examples/secure-api/app-jwt/11.png and b/apps/docs/public/img/examples/secure-api/app-jwt/11.png differ
diff --git a/apps/docs/public/img/examples/secure-api/app-jwt/2.png b/apps/docs/public/img/examples/secure-api/app-jwt/2.png
index 1bb592763..b4f622ff9 100644
Binary files a/apps/docs/public/img/examples/secure-api/app-jwt/2.png and b/apps/docs/public/img/examples/secure-api/app-jwt/2.png differ
diff --git a/apps/docs/public/img/examples/secure-api/app-jwt/3.png b/apps/docs/public/img/examples/secure-api/app-jwt/3.png
index d4deeb6e9..932a91417 100644
Binary files a/apps/docs/public/img/examples/secure-api/app-jwt/3.png and b/apps/docs/public/img/examples/secure-api/app-jwt/3.png differ
diff --git a/apps/docs/public/img/examples/secure-api/app-jwt/4.png b/apps/docs/public/img/examples/secure-api/app-jwt/4.png
index 7063c251e..43d4961f8 100644
Binary files a/apps/docs/public/img/examples/secure-api/app-jwt/4.png and b/apps/docs/public/img/examples/secure-api/app-jwt/4.png differ
diff --git a/apps/docs/public/img/examples/secure-api/app-jwt/5.png b/apps/docs/public/img/examples/secure-api/app-jwt/5.png
index 9f5bddb7d..0c580b6df 100644
Binary files a/apps/docs/public/img/examples/secure-api/app-jwt/5.png and b/apps/docs/public/img/examples/secure-api/app-jwt/5.png differ
diff --git a/apps/docs/public/img/examples/secure-api/app-jwt/6.png b/apps/docs/public/img/examples/secure-api/app-jwt/6.png
index d213eaee9..e122b0254 100644
Binary files a/apps/docs/public/img/examples/secure-api/app-jwt/6.png and b/apps/docs/public/img/examples/secure-api/app-jwt/6.png differ
diff --git a/apps/docs/public/img/examples/secure-api/app-jwt/7.png b/apps/docs/public/img/examples/secure-api/app-jwt/7.png
index d783c92cd..7fd3f1cc6 100644
Binary files a/apps/docs/public/img/examples/secure-api/app-jwt/7.png and b/apps/docs/public/img/examples/secure-api/app-jwt/7.png differ
diff --git a/apps/docs/public/img/examples/secure-api/app-jwt/8.png b/apps/docs/public/img/examples/secure-api/app-jwt/8.png
index 47299c092..aa22559a9 100644
Binary files a/apps/docs/public/img/examples/secure-api/app-jwt/8.png and b/apps/docs/public/img/examples/secure-api/app-jwt/8.png differ
diff --git a/apps/docs/public/img/examples/secure-api/app-jwt/9.png b/apps/docs/public/img/examples/secure-api/app-jwt/9.png
index e20a66449..91f2c46c4 100644
Binary files a/apps/docs/public/img/examples/secure-api/app-jwt/9.png and b/apps/docs/public/img/examples/secure-api/app-jwt/9.png differ
diff --git a/apps/docs/public/img/examples/secure-api/service-account-jwt/1.png b/apps/docs/public/img/examples/secure-api/service-account-jwt/1.png
index b0e017221..d7d645149 100644
Binary files a/apps/docs/public/img/examples/secure-api/service-account-jwt/1.png and b/apps/docs/public/img/examples/secure-api/service-account-jwt/1.png differ
diff --git a/apps/docs/public/img/examples/secure-api/service-account-jwt/2.png b/apps/docs/public/img/examples/secure-api/service-account-jwt/2.png
index 85696c011..0e98803bc 100644
Binary files a/apps/docs/public/img/examples/secure-api/service-account-jwt/2.png and b/apps/docs/public/img/examples/secure-api/service-account-jwt/2.png differ
diff --git a/apps/docs/public/img/examples/secure-api/service-account-jwt/3.png b/apps/docs/public/img/examples/secure-api/service-account-jwt/3.png
index 1931398d1..462332df0 100644
Binary files a/apps/docs/public/img/examples/secure-api/service-account-jwt/3.png and b/apps/docs/public/img/examples/secure-api/service-account-jwt/3.png differ
diff --git a/apps/docs/public/img/examples/secure-api/service-account-jwt/4.png b/apps/docs/public/img/examples/secure-api/service-account-jwt/4.png
index bd5db4ad4..db8995eb5 100644
Binary files a/apps/docs/public/img/examples/secure-api/service-account-jwt/4.png and b/apps/docs/public/img/examples/secure-api/service-account-jwt/4.png differ
diff --git a/apps/docs/public/img/examples/secure-api/service-account-jwt/5.png b/apps/docs/public/img/examples/secure-api/service-account-jwt/5.png
index f64fb35f4..342590b84 100644
Binary files a/apps/docs/public/img/examples/secure-api/service-account-jwt/5.png and b/apps/docs/public/img/examples/secure-api/service-account-jwt/5.png differ
diff --git a/apps/docs/public/img/examples/secure-api/service-account-jwt/6.png b/apps/docs/public/img/examples/secure-api/service-account-jwt/6.png
index 31da88803..d8afe06e0 100644
Binary files a/apps/docs/public/img/examples/secure-api/service-account-jwt/6.png and b/apps/docs/public/img/examples/secure-api/service-account-jwt/6.png differ
diff --git a/apps/docs/public/img/examples/secure-api/service-account-jwt/7.png b/apps/docs/public/img/examples/secure-api/service-account-jwt/7.png
index bd4ebb0a0..0c2c1e488 100644
Binary files a/apps/docs/public/img/examples/secure-api/service-account-jwt/7.png and b/apps/docs/public/img/examples/secure-api/service-account-jwt/7.png differ
diff --git a/apps/docs/public/img/examples/secure-api/service-account-jwt/8.png b/apps/docs/public/img/examples/secure-api/service-account-jwt/8.png
index bceac1034..45285d378 100644
Binary files a/apps/docs/public/img/examples/secure-api/service-account-jwt/8.png and b/apps/docs/public/img/examples/secure-api/service-account-jwt/8.png differ
diff --git a/apps/docs/public/img/examples/secure-api/service-account-jwt/scopes/1.png b/apps/docs/public/img/examples/secure-api/service-account-jwt/scopes/1.png
index d0cd03e5d..baae758f2 100644
Binary files a/apps/docs/public/img/examples/secure-api/service-account-jwt/scopes/1.png and b/apps/docs/public/img/examples/secure-api/service-account-jwt/scopes/1.png differ
diff --git a/apps/docs/public/img/examples/secure-api/service-account-jwt/scopes/2.png b/apps/docs/public/img/examples/secure-api/service-account-jwt/scopes/2.png
index 68895310f..e6e07c8ec 100644
Binary files a/apps/docs/public/img/examples/secure-api/service-account-jwt/scopes/2.png and b/apps/docs/public/img/examples/secure-api/service-account-jwt/scopes/2.png differ
diff --git a/apps/docs/public/img/examples/secure-api/service-account-jwt/scopes/3.png b/apps/docs/public/img/examples/secure-api/service-account-jwt/scopes/3.png
index bd6821807..44e11aa79 100644
Binary files a/apps/docs/public/img/examples/secure-api/service-account-jwt/scopes/3.png and b/apps/docs/public/img/examples/secure-api/service-account-jwt/scopes/3.png differ
diff --git a/apps/docs/public/img/examples/secure-api/service-account-jwt/scopes/4.png b/apps/docs/public/img/examples/secure-api/service-account-jwt/scopes/4.png
index 77df97174..883e2d2d2 100644
Binary files a/apps/docs/public/img/examples/secure-api/service-account-jwt/scopes/4.png and b/apps/docs/public/img/examples/secure-api/service-account-jwt/scopes/4.png differ
diff --git a/apps/docs/public/img/examples/secure-api/service-account-jwt/scopes/5.png b/apps/docs/public/img/examples/secure-api/service-account-jwt/scopes/5.png
index 9d67e1739..93d48864f 100644
Binary files a/apps/docs/public/img/examples/secure-api/service-account-jwt/scopes/5.png and b/apps/docs/public/img/examples/secure-api/service-account-jwt/scopes/5.png differ
diff --git a/apps/docs/public/img/examples/secure-api/service-account-jwt/scopes/6.png b/apps/docs/public/img/examples/secure-api/service-account-jwt/scopes/6.png
index 983f19cee..0792dcffd 100644
Binary files a/apps/docs/public/img/examples/secure-api/service-account-jwt/scopes/6.png and b/apps/docs/public/img/examples/secure-api/service-account-jwt/scopes/6.png differ
diff --git a/apps/docs/public/img/examples/secure-api/service-account-jwt/scopes/7.png b/apps/docs/public/img/examples/secure-api/service-account-jwt/scopes/7.png
index 2516e8b04..97db9b930 100644
Binary files a/apps/docs/public/img/examples/secure-api/service-account-jwt/scopes/7.png and b/apps/docs/public/img/examples/secure-api/service-account-jwt/scopes/7.png differ
diff --git a/apps/docs/public/img/examples/secure-api/service-account-jwt/scopes/8.png b/apps/docs/public/img/examples/secure-api/service-account-jwt/scopes/8.png
index 1b110124d..e596c5544 100644
Binary files a/apps/docs/public/img/examples/secure-api/service-account-jwt/scopes/8.png and b/apps/docs/public/img/examples/secure-api/service-account-jwt/scopes/8.png differ
diff --git a/apps/docs/public/img/examples/secure-api/service-account-jwt/scopes/9.png b/apps/docs/public/img/examples/secure-api/service-account-jwt/scopes/9.png
index deef3052a..0b0a8a742 100644
Binary files a/apps/docs/public/img/examples/secure-api/service-account-jwt/scopes/9.png and b/apps/docs/public/img/examples/secure-api/service-account-jwt/scopes/9.png differ
diff --git a/apps/docs/public/img/go/api-create_application.png b/apps/docs/public/img/go/api-create_application.png
index c074d0687..0a6b48932 100644
Binary files a/apps/docs/public/img/go/api-create_application.png and b/apps/docs/public/img/go/api-create_application.png differ
diff --git a/apps/docs/public/img/go/api-project-auth.png b/apps/docs/public/img/go/api-project-auth.png
index 741c08a55..ec03461d6 100644
Binary files a/apps/docs/public/img/go/api-project-auth.png and b/apps/docs/public/img/go/api-project-auth.png differ
diff --git a/apps/docs/public/img/go/api-service_user_panel.png b/apps/docs/public/img/go/api-service_user_panel.png
index d4e9b5bef..f48fd0094 100644
Binary files a/apps/docs/public/img/go/api-service_user_panel.png and b/apps/docs/public/img/go/api-service_user_panel.png differ
diff --git a/apps/docs/public/img/guides/console/myprofile.png b/apps/docs/public/img/guides/console/myprofile.png
index 9d1d6a759..0a93714fa 100644
Binary files a/apps/docs/public/img/guides/console/myprofile.png and b/apps/docs/public/img/guides/console/myprofile.png differ
diff --git a/apps/docs/public/img/guides/quickstart/create_project_react.png b/apps/docs/public/img/guides/quickstart/create_project_react.png
index 059dd7a8a..efff2fbfb 100644
Binary files a/apps/docs/public/img/guides/quickstart/create_project_react.png and b/apps/docs/public/img/guides/quickstart/create_project_react.png differ
diff --git a/apps/docs/public/img/guides/quickstart/project_client_id.png b/apps/docs/public/img/guides/quickstart/project_client_id.png
index 7c2529da2..5244b34b1 100644
Binary files a/apps/docs/public/img/guides/quickstart/project_client_id.png and b/apps/docs/public/img/guides/quickstart/project_client_id.png differ
diff --git a/apps/docs/public/img/guides/quickstart/project_config_overview_react.png b/apps/docs/public/img/guides/quickstart/project_config_overview_react.png
index b3f33206c..ea657da49 100644
Binary files a/apps/docs/public/img/guides/quickstart/project_config_overview_react.png and b/apps/docs/public/img/guides/quickstart/project_config_overview_react.png differ
diff --git a/apps/docs/public/img/guides/quickstart/project_urls.png b/apps/docs/public/img/guides/quickstart/project_urls.png
index 4ce39f287..a22ba0f77 100644
Binary files a/apps/docs/public/img/guides/quickstart/project_urls.png and b/apps/docs/public/img/guides/quickstart/project_urls.png differ
diff --git a/apps/docs/public/img/guides/solution-scenarios/create-org-dropdown.png b/apps/docs/public/img/guides/solution-scenarios/create-org-dropdown.png
index 017d38a01..8126d5703 100644
Binary files a/apps/docs/public/img/guides/solution-scenarios/create-org-dropdown.png and b/apps/docs/public/img/guides/solution-scenarios/create-org-dropdown.png differ
diff --git a/apps/docs/public/img/guides/solution-scenarios/create-organization.png b/apps/docs/public/img/guides/solution-scenarios/create-organization.png
index 75dd917b3..13a711046 100644
Binary files a/apps/docs/public/img/guides/solution-scenarios/create-organization.png and b/apps/docs/public/img/guides/solution-scenarios/create-organization.png differ
diff --git a/apps/docs/public/img/guides/solution-scenarios/default-organization.png b/apps/docs/public/img/guides/solution-scenarios/default-organization.png
index 3767f038c..90ef05593 100644
Binary files a/apps/docs/public/img/guides/solution-scenarios/default-organization.png and b/apps/docs/public/img/guides/solution-scenarios/default-organization.png differ
diff --git a/apps/docs/public/img/guides/solution-scenarios/frontend-calling-backend-API_1.png b/apps/docs/public/img/guides/solution-scenarios/frontend-calling-backend-API_1.png
index 6dab2b6b5..b99bfddf3 100644
Binary files a/apps/docs/public/img/guides/solution-scenarios/frontend-calling-backend-API_1.png and b/apps/docs/public/img/guides/solution-scenarios/frontend-calling-backend-API_1.png differ
diff --git a/apps/docs/public/img/guides/solution-scenarios/org-list-add-new.png b/apps/docs/public/img/guides/solution-scenarios/org-list-add-new.png
deleted file mode 100644
index d454120be..000000000
Binary files a/apps/docs/public/img/guides/solution-scenarios/org-list-add-new.png and /dev/null differ
diff --git a/apps/docs/public/img/java-spring/api-project-auth.png b/apps/docs/public/img/java-spring/api-project-auth.png
index 741c08a55..ec03461d6 100644
Binary files a/apps/docs/public/img/java-spring/api-project-auth.png and b/apps/docs/public/img/java-spring/api-project-auth.png differ