diff --git a/doc/content/api/concepts/auth/_index.md b/doc/content/api/concepts/auth/_index.md
index af1f7a9419..0ff0af2060 100644
--- a/doc/content/api/concepts/auth/_index.md
+++ b/doc/content/api/concepts/auth/_index.md
@@ -58,10 +58,9 @@ In this section we explain how to create a _user API key_, which can be used to
 
 {{< tabs/tab "Console" >}}
 
-In the users dropdown on the right side, select the **Personal API Keys** option and select **+Add API Key**.
+In the **User settings** dropdown on the left-hand sidebar, select the **API Keys** option and select **+ Add API Key**.
 
 {{< figure src="personal-api-keys.png" alt="Personal API key" >}}
-{{< figure src="add-api-key-button.png" alt="Add API key" >}}
 
 Choose an optional expiry date and choose the required rights.
 {{< figure src="application-rights.png" alt="Selectable rights" >}}
diff --git a/doc/content/api/concepts/auth/add-api-key-button.png b/doc/content/api/concepts/auth/add-api-key-button.png
deleted file mode 100644
index c9c9d3b396..0000000000
Binary files a/doc/content/api/concepts/auth/add-api-key-button.png and /dev/null differ
diff --git a/doc/content/api/concepts/auth/application-rights.png b/doc/content/api/concepts/auth/application-rights.png
index 156a1c5d5a..7471c849df 100644
Binary files a/doc/content/api/concepts/auth/application-rights.png and b/doc/content/api/concepts/auth/application-rights.png differ
diff --git a/doc/content/api/concepts/auth/copy-api-key.png b/doc/content/api/concepts/auth/copy-api-key.png
index 07888e3b49..3ffa23dd8c 100644
Binary files a/doc/content/api/concepts/auth/copy-api-key.png and b/doc/content/api/concepts/auth/copy-api-key.png differ
diff --git a/doc/content/api/concepts/auth/oauth-access-tokens/_index.md b/doc/content/api/concepts/auth/oauth-access-tokens/_index.md
index 229f767cb3..6c29ea2536 100644
--- a/doc/content/api/concepts/auth/oauth-access-tokens/_index.md
+++ b/doc/content/api/concepts/auth/oauth-access-tokens/_index.md
@@ -22,7 +22,9 @@ To register OAuth client you can use {{% tts %}} [Console]({{< ref "/the-things-
 
 {{< tabs/tab "Console" >}}
 
-To register an OAuth client using the Console, first navigate to `https://<HOSTNAME>/oauth` in your web browser to log into your Account App. When logged in, switch to the **OAuth Clients** tab on the top menu and click the **Add OAuth Client** button.
+To register an OAuth client using the Console, click the **User settings** dropdown in the left-hand sidebar and select **OAuth clients**. Then click **+ Add OAuth client** in the top-right.
+
+{{< figure src="oauth-client.png" alt="OAuth client" >}}
 
 Enter the **OAuth Client ID**, **Name** and **Description** for your OAuth client. You can also add the **Redirect URLs** against which authorization requests will be checked, and **Logout redirect URLs** agains which client initiated requests are checked.
 
diff --git a/doc/content/api/concepts/auth/oauth-access-tokens/create-oauth-client.png b/doc/content/api/concepts/auth/oauth-access-tokens/create-oauth-client.png
index d67b87bddc..88ef9785ff 100644
Binary files a/doc/content/api/concepts/auth/oauth-access-tokens/create-oauth-client.png and b/doc/content/api/concepts/auth/oauth-access-tokens/create-oauth-client.png differ
diff --git a/doc/content/api/concepts/auth/oauth-access-tokens/grant-rights-for-oauth-client.png b/doc/content/api/concepts/auth/oauth-access-tokens/grant-rights-for-oauth-client.png
index b5fe3a9b55..e2188ddb8e 100644
Binary files a/doc/content/api/concepts/auth/oauth-access-tokens/grant-rights-for-oauth-client.png and b/doc/content/api/concepts/auth/oauth-access-tokens/grant-rights-for-oauth-client.png differ
diff --git a/doc/content/api/concepts/auth/oauth-access-tokens/oauth-client.png b/doc/content/api/concepts/auth/oauth-access-tokens/oauth-client.png
new file mode 100644
index 0000000000..84856c8f31
Binary files /dev/null and b/doc/content/api/concepts/auth/oauth-access-tokens/oauth-client.png differ
diff --git a/doc/content/api/concepts/auth/personal-api-keys.png b/doc/content/api/concepts/auth/personal-api-keys.png
index dc52643f19..3ae0ca3155 100644
Binary files a/doc/content/api/concepts/auth/personal-api-keys.png and b/doc/content/api/concepts/auth/personal-api-keys.png differ
diff --git a/doc/content/api/concepts/auth/rights-all.png b/doc/content/api/concepts/auth/rights-all.png
index cdd8bb17b1..1959cad9ce 100644
Binary files a/doc/content/api/concepts/auth/rights-all.png and b/doc/content/api/concepts/auth/rights-all.png differ
diff --git a/doc/content/devices/adding-devices/_index.md b/doc/content/devices/adding-devices/_index.md
index c765674f4c..d20825e9d6 100644
--- a/doc/content/devices/adding-devices/_index.md
+++ b/doc/content/devices/adding-devices/_index.md
@@ -21,7 +21,7 @@ This guide assumes that your device is in the [LoRaWAN® Device Repository](http
 
 To create a device, first open the application you wish to add the device in. Go to **End devices** in the left menu and click on **+Register end device** to reach the end device registration page.
 
-{{< figure src="application-overview.png" alt="Application overview" >}}
+{{< figure src="application-end-devices.png" alt="Application overview" >}}
 
 You will be presented with options to easily onboard your device using its QR code (if you have it), and to register your end device from the [LoRaWAN® Device Repository](https://github.com/TheThingsNetwork/lorawan-devices/) or manually.
 
@@ -83,7 +83,7 @@ For LoRaWAN version 1.0.x devices, you will see an **AppKey** field, and for LoR
 
 {{< /tabs/container >}}
 
-Finally, the console pre-fills **End device ID** in the format `eui-{Device EUI}` by default. You can edit this field and give the device a unique identifier. See [ID and EUI constraints]({{< ref "reference/id-eui-constraints" >}}) for guidelines about choosing a unique ID.
+Finally, enter an **End device ID**. Advisable is doing it in the format `eui-{Device EUI}`. You can edit this field and give the device a unique identifier. See [ID and EUI constraints]({{< ref "reference/id-eui-constraints" >}}) for guidelines about choosing a unique ID.
 
 Now verify that all the fields are filled and click the **Register end device** button to create the end device.
 
diff --git a/doc/content/devices/adding-devices/adding-devices-in-bulk/import-end-devices.png b/doc/content/devices/adding-devices/adding-devices-in-bulk/import-end-devices.png
index eee8dca8ec..633d5dd76a 100644
Binary files a/doc/content/devices/adding-devices/adding-devices-in-bulk/import-end-devices.png and b/doc/content/devices/adding-devices/adding-devices-in-bulk/import-end-devices.png differ
diff --git a/doc/content/devices/adding-devices/adding-devices-in-bulk/operation-finished.png b/doc/content/devices/adding-devices/adding-devices-in-bulk/operation-finished.png
index 22a6a923b6..a27ab6f5fe 100644
Binary files a/doc/content/devices/adding-devices/adding-devices-in-bulk/operation-finished.png and b/doc/content/devices/adding-devices/adding-devices-in-bulk/operation-finished.png differ
diff --git a/doc/content/devices/adding-devices/adding-devices-in-bulk/successful-import copy.png b/doc/content/devices/adding-devices/adding-devices-in-bulk/successful-import copy.png
deleted file mode 100644
index 31f81ff7a6..0000000000
Binary files a/doc/content/devices/adding-devices/adding-devices-in-bulk/successful-import copy.png and /dev/null differ
diff --git a/doc/content/devices/adding-devices/adding-devices-in-bulk/successful-import.png b/doc/content/devices/adding-devices/adding-devices-in-bulk/successful-import.png
index 4b14bc504f..53c58bbc3f 100644
Binary files a/doc/content/devices/adding-devices/adding-devices-in-bulk/successful-import.png and b/doc/content/devices/adding-devices/adding-devices-in-bulk/successful-import.png differ
diff --git a/doc/content/devices/adding-devices/adding-devices-in-bulk/upload-file.png b/doc/content/devices/adding-devices/adding-devices-in-bulk/upload-file.png
index 6dd3e33204..b819dc5267 100644
Binary files a/doc/content/devices/adding-devices/adding-devices-in-bulk/upload-file.png and b/doc/content/devices/adding-devices/adding-devices-in-bulk/upload-file.png differ
diff --git a/doc/content/devices/adding-devices/application-end-devices.png b/doc/content/devices/adding-devices/application-end-devices.png
new file mode 100644
index 0000000000..22cb9328c4
Binary files /dev/null and b/doc/content/devices/adding-devices/application-end-devices.png differ
diff --git a/doc/content/devices/adding-devices/application-overview.png b/doc/content/devices/adding-devices/application-overview.png
deleted file mode 100644
index 0edf055368..0000000000
Binary files a/doc/content/devices/adding-devices/application-overview.png and /dev/null differ
diff --git a/doc/content/devices/adding-devices/device-id.png b/doc/content/devices/adding-devices/device-id.png
deleted file mode 100644
index 3522178d61..0000000000
Binary files a/doc/content/devices/adding-devices/device-id.png and /dev/null differ
diff --git a/doc/content/devices/adding-devices/device-repo-settings.png b/doc/content/devices/adding-devices/device-repo-settings.png
deleted file mode 100644
index 7137f8d675..0000000000
Binary files a/doc/content/devices/adding-devices/device-repo-settings.png and /dev/null differ
diff --git a/doc/content/devices/adding-devices/device-repo.png b/doc/content/devices/adding-devices/device-repo.png
index f194b69c84..2f68e7683e 100644
Binary files a/doc/content/devices/adding-devices/device-repo.png and b/doc/content/devices/adding-devices/device-repo.png differ
diff --git a/doc/content/devices/adding-devices/fp-non-qr.png b/doc/content/devices/adding-devices/fp-non-qr.png
index f6d33816cb..19ff065af2 100644
Binary files a/doc/content/devices/adding-devices/fp-non-qr.png and b/doc/content/devices/adding-devices/fp-non-qr.png differ
diff --git a/doc/content/devices/adding-devices/fp.png b/doc/content/devices/adding-devices/fp.png
index d69d641753..67d658665b 100644
Binary files a/doc/content/devices/adding-devices/fp.png and b/doc/content/devices/adding-devices/fp.png differ
diff --git a/doc/content/devices/adding-devices/manual/_index.md b/doc/content/devices/adding-devices/manual/_index.md
index da06f4178d..1678066356 100644
--- a/doc/content/devices/adding-devices/manual/_index.md
+++ b/doc/content/devices/adding-devices/manual/_index.md
@@ -26,4 +26,4 @@ Choosing the incorrect LoRaWAN version can lead to complex errors. Activation ma
 
 {{< figure src="device-input-method.png" alt="ABP input method" >}}
 
-The above fields are common for both OTAA and ABP devices. Now, based on the device you are trying to add, choose the speficic guide for OTAA or ABP below.
+The above fields are common for both OTAA and ABP devices. Now, based on the device you are trying to add, choose the specific guide for OTAA or ABP below.
diff --git a/doc/content/devices/adding-devices/manual/abp/abp-fields-set.png b/doc/content/devices/adding-devices/manual/abp/abp-fields-set.png
index 094235c349..481bee52e5 100644
Binary files a/doc/content/devices/adding-devices/manual/abp/abp-fields-set.png and b/doc/content/devices/adding-devices/manual/abp/abp-fields-set.png differ
diff --git a/doc/content/devices/adding-devices/manual/abp/abp-network-defaults.png b/doc/content/devices/adding-devices/manual/abp/abp-network-defaults.png
index ddbf694990..cedbd36a6e 100644
Binary files a/doc/content/devices/adding-devices/manual/abp/abp-network-defaults.png and b/doc/content/devices/adding-devices/manual/abp/abp-network-defaults.png differ
diff --git a/doc/content/devices/adding-devices/manual/abp/abp-provisioning.png b/doc/content/devices/adding-devices/manual/abp/abp-provisioning.png
deleted file mode 100644
index e4e7b93b64..0000000000
Binary files a/doc/content/devices/adding-devices/manual/abp/abp-provisioning.png and /dev/null differ
diff --git a/doc/content/devices/adding-devices/manual/abp/manual-network-settings-abp.png b/doc/content/devices/adding-devices/manual/abp/manual-network-settings-abp.png
deleted file mode 100644
index 2238ca1813..0000000000
Binary files a/doc/content/devices/adding-devices/manual/abp/manual-network-settings-abp.png and /dev/null differ
diff --git a/doc/content/devices/adding-devices/manual/device-input-method.png b/doc/content/devices/adding-devices/manual/device-input-method.png
index d2d457f22c..6eb7086652 100644
Binary files a/doc/content/devices/adding-devices/manual/device-input-method.png and b/doc/content/devices/adding-devices/manual/device-input-method.png differ
diff --git a/doc/content/devices/adding-devices/manual/manual.png b/doc/content/devices/adding-devices/manual/manual.png
deleted file mode 100644
index 06e45750b8..0000000000
Binary files a/doc/content/devices/adding-devices/manual/manual.png and /dev/null differ
diff --git a/doc/content/devices/adding-devices/manual/otaa/manual-network-settings-otaa.png b/doc/content/devices/adding-devices/manual/otaa/manual-network-settings-otaa.png
index 2a11f30ee0..dcca847744 100644
Binary files a/doc/content/devices/adding-devices/manual/otaa/manual-network-settings-otaa.png and b/doc/content/devices/adding-devices/manual/otaa/manual-network-settings-otaa.png differ
diff --git a/doc/content/devices/adding-devices/non-qr-all-set.png b/doc/content/devices/adding-devices/non-qr-all-set.png
index d59120e427..2233c58011 100644
Binary files a/doc/content/devices/adding-devices/non-qr-all-set.png and b/doc/content/devices/adding-devices/non-qr-all-set.png differ
diff --git a/doc/content/devices/adding-devices/non-qr-join-eui.png b/doc/content/devices/adding-devices/non-qr-join-eui.png
index f81de45f26..d9a0c9aaf3 100644
Binary files a/doc/content/devices/adding-devices/non-qr-join-eui.png and b/doc/content/devices/adding-devices/non-qr-join-eui.png differ
diff --git a/doc/content/devices/adding-devices/pre-filled-eui-data.png b/doc/content/devices/adding-devices/pre-filled-eui-data.png
deleted file mode 100644
index 2725253b00..0000000000
Binary files a/doc/content/devices/adding-devices/pre-filled-eui-data.png and /dev/null differ
diff --git a/doc/content/devices/adding-devices/qr-data-found.png b/doc/content/devices/adding-devices/qr-data-found.png
index e204ec7826..e97f458eaf 100644
Binary files a/doc/content/devices/adding-devices/qr-data-found.png and b/doc/content/devices/adding-devices/qr-data-found.png differ
diff --git a/doc/content/devices/adding-devices/register-devices-option.png b/doc/content/devices/adding-devices/register-devices-option.png
index 30ab8a6540..a2b0fc6534 100644
Binary files a/doc/content/devices/adding-devices/register-devices-option.png and b/doc/content/devices/adding-devices/register-devices-option.png differ
diff --git a/doc/content/devices/adding-devices/select-dr-non-qr.png b/doc/content/devices/adding-devices/select-dr-non-qr.png
index dae92964a8..d3a78e9106 100644
Binary files a/doc/content/devices/adding-devices/select-dr-non-qr.png and b/doc/content/devices/adding-devices/select-dr-non-qr.png differ
diff --git a/doc/content/devices/configuring-devices/device-location/_index.md b/doc/content/devices/configuring-devices/device-location/_index.md
index bc89f429bf..2baf1a00d5 100644
--- a/doc/content/devices/configuring-devices/device-location/_index.md
+++ b/doc/content/devices/configuring-devices/device-location/_index.md
@@ -19,6 +19,8 @@ The end device location can be manually set in two ways.
 1. Pinning the location on the map widget.
 2. Entering the **Latitude**, **Longitude** and **Altitude** values.
 
+Make sure you select **Save Changes** at the bottom of the page.
+
 {{< figure src="device-location.png" alt="Gateway location" >}}
 
 {{< /tabs/tab >}}
diff --git a/doc/content/devices/configuring-devices/device-location/device-location.png b/doc/content/devices/configuring-devices/device-location/device-location.png
index 0214fd460e..a1191451ec 100644
Binary files a/doc/content/devices/configuring-devices/device-location/device-location.png and b/doc/content/devices/configuring-devices/device-location/device-location.png differ
diff --git a/doc/content/gateways/concepts/adding-gateways/_index.md b/doc/content/gateways/concepts/adding-gateways/_index.md
index ba13655b02..4485b26824 100644
--- a/doc/content/gateways/concepts/adding-gateways/_index.md
+++ b/doc/content/gateways/concepts/adding-gateways/_index.md
@@ -222,9 +222,9 @@ curl -H "Content-Type: application/json" -H "Authorization: Bearer $API_KEY" \
 
 {{< tabs/tab "Console" >}}
 
-Once you have added your gateway to {{% tts %}}, you can also set its location to be displayed on a map widget by clicking **Change location settings**.
+Once you have added your gateway to {{% tts %}}, you can also set its location to be displayed on a map widget by clicking **Location** in the left-hand menu.
 
-If you do not mind your gateway's location to be publicly displayed, check the **Publish location** box.
+If you do not mind your gateway's location to be publicly displayed, check the **Share location within network** box.
 
 The gateway location can be manually set by entering the **Latitude**, **Longitude** and **Altitude** values.
 
diff --git a/doc/content/gateways/concepts/adding-gateways/gateway-add.png b/doc/content/gateways/concepts/adding-gateways/gateway-add.png
index 6f516f4c70..dc347415ae 100644
Binary files a/doc/content/gateways/concepts/adding-gateways/gateway-add.png and b/doc/content/gateways/concepts/adding-gateways/gateway-add.png differ
diff --git a/doc/content/gateways/concepts/adding-gateways/gateway-api-key-created.png b/doc/content/gateways/concepts/adding-gateways/gateway-api-key-created.png
index 313c19a0c2..f907de9b7f 100644
Binary files a/doc/content/gateways/concepts/adding-gateways/gateway-api-key-created.png and b/doc/content/gateways/concepts/adding-gateways/gateway-api-key-created.png differ
diff --git a/doc/content/gateways/concepts/adding-gateways/gateway-api-key-creation.png b/doc/content/gateways/concepts/adding-gateways/gateway-api-key-creation.png
index 574b824539..60793a6fd7 100644
Binary files a/doc/content/gateways/concepts/adding-gateways/gateway-api-key-creation.png and b/doc/content/gateways/concepts/adding-gateways/gateway-api-key-creation.png differ
diff --git a/doc/content/gateways/concepts/adding-gateways/gateway-claim.png b/doc/content/gateways/concepts/adding-gateways/gateway-claim.png
index 2bca130581..d27d0083b1 100644
Binary files a/doc/content/gateways/concepts/adding-gateways/gateway-claim.png and b/doc/content/gateways/concepts/adding-gateways/gateway-claim.png differ
diff --git a/doc/content/gateways/concepts/adding-gateways/gateway-creation.png b/doc/content/gateways/concepts/adding-gateways/gateway-creation.png
index 47c8283649..6d579883d5 100644
Binary files a/doc/content/gateways/concepts/adding-gateways/gateway-creation.png and b/doc/content/gateways/concepts/adding-gateways/gateway-creation.png differ
diff --git a/doc/content/gateways/concepts/adding-gateways/gateway-location.png b/doc/content/gateways/concepts/adding-gateways/gateway-location.png
index 98e4f18923..eac0fe7edd 100644
Binary files a/doc/content/gateways/concepts/adding-gateways/gateway-location.png and b/doc/content/gateways/concepts/adding-gateways/gateway-location.png differ
diff --git a/doc/content/gateways/concepts/adding-gateways/gateway-overview.png b/doc/content/gateways/concepts/adding-gateways/gateway-overview.png
index 62f8426697..3d2704957c 100644
Binary files a/doc/content/gateways/concepts/adding-gateways/gateway-overview.png and b/doc/content/gateways/concepts/adding-gateways/gateway-overview.png differ
diff --git a/doc/content/gateways/concepts/adding-gateways/pb-forwarding.png b/doc/content/gateways/concepts/adding-gateways/pb-forwarding.png
index a55a5f1ce4..b31bd539df 100644
Binary files a/doc/content/gateways/concepts/adding-gateways/pb-forwarding.png and b/doc/content/gateways/concepts/adding-gateways/pb-forwarding.png differ
diff --git a/doc/content/gateways/concepts/lora-basics-station/change-lns-key-and-gs-addr.png b/doc/content/gateways/concepts/lora-basics-station/change-lns-key-and-gs-addr.png
index 7aafd3ae81..d4c8b61fc3 100644
Binary files a/doc/content/gateways/concepts/lora-basics-station/change-lns-key-and-gs-addr.png and b/doc/content/gateways/concepts/lora-basics-station/change-lns-key-and-gs-addr.png differ
diff --git a/doc/content/gateways/concepts/lora-basics-station/lns-key.png b/doc/content/gateways/concepts/lora-basics-station/lns-key.png
index ad44e60a97..29c9db0adb 100644
Binary files a/doc/content/gateways/concepts/lora-basics-station/lns-key.png and b/doc/content/gateways/concepts/lora-basics-station/lns-key.png differ
diff --git a/doc/content/gateways/concepts/lora-basics-station/target-instance-registration.png b/doc/content/gateways/concepts/lora-basics-station/target-instance-registration.png
index 6ba84fdb81..10a93f0b4d 100644
Binary files a/doc/content/gateways/concepts/lora-basics-station/target-instance-registration.png and b/doc/content/gateways/concepts/lora-basics-station/target-instance-registration.png differ
diff --git a/doc/content/gateways/concepts/udp/_index.md b/doc/content/gateways/concepts/udp/_index.md
index 744aa7b744..1faf9085d7 100644
--- a/doc/content/gateways/concepts/udp/_index.md
+++ b/doc/content/gateways/concepts/udp/_index.md
@@ -25,7 +25,7 @@ An example `global_conf.json` is available in the [{{% udp-pf %}} Github reposit
 
 ## Download Configuration in the Console {#download-configuration-in-the-console}
 
-To download a `global_conf.json` file for your gateway, open the Gateway overview page in the console. Click the **Download global_conf.json** button to download the file.
+To download a `global_conf.json` file for your gateway, open the Gateway overview page in the console. Click the **Hamburger menu** in the top-right and then click **Download global_conf.json** to download the file.
 
 {{< figure src="conf.png" alt="Download global_conf.json" >}}
 
diff --git a/doc/content/gateways/concepts/udp/conf.png b/doc/content/gateways/concepts/udp/conf.png
index 776f6b04ee..ec1d405976 100644
Binary files a/doc/content/gateways/concepts/udp/conf.png and b/doc/content/gateways/concepts/udp/conf.png differ
diff --git a/doc/content/getting-started/setup-first-network/ttsc-console.png b/doc/content/getting-started/setup-first-network/ttsc-console.png
index f8397c68e2..a79b80158f 100644
Binary files a/doc/content/getting-started/setup-first-network/ttsc-console.png and b/doc/content/getting-started/setup-first-network/ttsc-console.png differ
diff --git a/doc/content/integrations/adding-applications/api-key-created.png b/doc/content/integrations/adding-applications/api-key-created.png
deleted file mode 100644
index 269e31a9f6..0000000000
Binary files a/doc/content/integrations/adding-applications/api-key-created.png and /dev/null differ
diff --git a/doc/content/integrations/adding-applications/api-key-creation.png b/doc/content/integrations/adding-applications/api-key-creation.png
deleted file mode 100644
index 5dedfaed60..0000000000
Binary files a/doc/content/integrations/adding-applications/api-key-creation.png and /dev/null differ
diff --git a/doc/content/integrations/adding-applications/application-api-key-created.png b/doc/content/integrations/adding-applications/application-api-key-created.png
index 8c5ee2a03c..472dcdbbfd 100644
Binary files a/doc/content/integrations/adding-applications/application-api-key-created.png and b/doc/content/integrations/adding-applications/application-api-key-created.png differ
diff --git a/doc/content/integrations/adding-applications/application-api-key-creation.png b/doc/content/integrations/adding-applications/application-api-key-creation.png
index 9497f16277..c68d172ab2 100644
Binary files a/doc/content/integrations/adding-applications/application-api-key-creation.png and b/doc/content/integrations/adding-applications/application-api-key-creation.png differ
diff --git a/doc/content/integrations/adding-applications/application-creation.png b/doc/content/integrations/adding-applications/application-creation.png
index 2090a40b8a..f4c9c4b4da 100644
Binary files a/doc/content/integrations/adding-applications/application-creation.png and b/doc/content/integrations/adding-applications/application-creation.png differ
diff --git a/doc/content/integrations/adding-applications/application-link-creation.png b/doc/content/integrations/adding-applications/application-link-creation.png
deleted file mode 100644
index bf45b31a50..0000000000
Binary files a/doc/content/integrations/adding-applications/application-link-creation.png and /dev/null differ
diff --git a/doc/content/integrations/adding-applications/application-overview.png b/doc/content/integrations/adding-applications/application-overview.png
index f6f319f012..9ca832563c 100644
Binary files a/doc/content/integrations/adding-applications/application-overview.png and b/doc/content/integrations/adding-applications/application-overview.png differ
diff --git a/doc/content/integrations/adding-applications/skip-payload-crypto.png b/doc/content/integrations/adding-applications/skip-payload-crypto.png
index 32425430b9..c6bc6adf0e 100644
Binary files a/doc/content/integrations/adding-applications/skip-payload-crypto.png and b/doc/content/integrations/adding-applications/skip-payload-crypto.png differ
diff --git a/doc/content/integrations/payload-formatters/application.png b/doc/content/integrations/payload-formatters/application.png
index b290ae2a7b..682746597a 100644
Binary files a/doc/content/integrations/payload-formatters/application.png and b/doc/content/integrations/payload-formatters/application.png differ
diff --git a/doc/content/integrations/payload-formatters/device.png b/doc/content/integrations/payload-formatters/device.png
index 64ac2a6992..f61bf7ad95 100644
Binary files a/doc/content/integrations/payload-formatters/device.png and b/doc/content/integrations/payload-formatters/device.png differ
diff --git a/doc/content/integrations/storage/enable/activate-storage-integration.png b/doc/content/integrations/storage/enable/activate-storage-integration.png
index 55e8c7430e..a33972422f 100644
Binary files a/doc/content/integrations/storage/enable/activate-storage-integration.png and b/doc/content/integrations/storage/enable/activate-storage-integration.png differ
diff --git a/doc/content/integrations/storage/enable/activated-storage-integration.png b/doc/content/integrations/storage/enable/activated-storage-integration.png
index 145fff5bd0..37a643b435 100644
Binary files a/doc/content/integrations/storage/enable/activated-storage-integration.png and b/doc/content/integrations/storage/enable/activated-storage-integration.png differ
diff --git a/doc/content/integrations/webhooks/add-webhook.png b/doc/content/integrations/webhooks/add-webhook.png
index 34e0276da9..6bddff5dd9 100644
Binary files a/doc/content/integrations/webhooks/add-webhook.png and b/doc/content/integrations/webhooks/add-webhook.png differ
diff --git a/doc/content/integrations/webhooks/api-key-created.png b/doc/content/integrations/webhooks/api-key-created.png
index 4c24519b1a..d30e04937f 100644
Binary files a/doc/content/integrations/webhooks/api-key-created.png and b/doc/content/integrations/webhooks/api-key-created.png differ
diff --git a/doc/content/integrations/webhooks/api-key-creation.png b/doc/content/integrations/webhooks/api-key-creation.png
index 28779bcdbb..c6fd35bb2a 100644
Binary files a/doc/content/integrations/webhooks/api-key-creation.png and b/doc/content/integrations/webhooks/api-key-creation.png differ
diff --git a/doc/content/integrations/webhooks/enabled-messages.png b/doc/content/integrations/webhooks/enabled-messages.png
index 45bc41ad7a..9e7c4cf468 100644
Binary files a/doc/content/integrations/webhooks/enabled-messages.png and b/doc/content/integrations/webhooks/enabled-messages.png differ
diff --git a/doc/content/integrations/webhooks/retries.md b/doc/content/integrations/webhooks/retries.md
index 4a591ec2f5..9a6e5ed32e 100644
--- a/doc/content/integrations/webhooks/retries.md
+++ b/doc/content/integrations/webhooks/retries.md
@@ -21,11 +21,9 @@ Webhook queuing allows individual HTTP requests to be retried at later times, wh
 
 The webhook retries feature can be enabled on both new and existing webhooks via the Console, by ticking the **Retries** checkbox in the webhook settings:
 
-{{< figure src="../webhook-queue-before.png" alt="Enabling webhook retries" >}}
-
 After the checkbox has been ticked, and the webhook has been saved, future requests will be enqueued and retried on failure.
 
-{{< figure src="../webhook-queue-after.png" alt="Webhook queueing enabled" >}}
+{{< figure src="../webhook-retries.png" alt="Webhook queueing enabled" >}}
 
 ## What counts as a failed try ?
 
diff --git a/doc/content/integrations/webhooks/tti.eu1.cloud.thethings.industries_console_.png b/doc/content/integrations/webhooks/tti.eu1.cloud.thethings.industries_console_.png
deleted file mode 100644
index 336aa0048f..0000000000
Binary files a/doc/content/integrations/webhooks/tti.eu1.cloud.thethings.industries_console_.png and /dev/null differ
diff --git a/doc/content/integrations/webhooks/webhook-queue-after.png b/doc/content/integrations/webhooks/webhook-queue-after.png
deleted file mode 100644
index bf85e44759..0000000000
Binary files a/doc/content/integrations/webhooks/webhook-queue-after.png and /dev/null differ
diff --git a/doc/content/integrations/webhooks/webhook-queue-before.png b/doc/content/integrations/webhooks/webhook-queue-before.png
deleted file mode 100644
index acebaf79a5..0000000000
Binary files a/doc/content/integrations/webhooks/webhook-queue-before.png and /dev/null differ
diff --git a/doc/content/integrations/webhooks/webhook-retries.png b/doc/content/integrations/webhooks/webhook-retries.png
new file mode 100644
index 0000000000..76f2f95be6
Binary files /dev/null and b/doc/content/integrations/webhooks/webhook-retries.png differ
diff --git a/doc/content/integrations/webhooks/webhook-screen.png b/doc/content/integrations/webhooks/webhook-screen.png
deleted file mode 100644
index 7e16c80eb2..0000000000
Binary files a/doc/content/integrations/webhooks/webhook-screen.png and /dev/null differ
diff --git a/doc/content/integrations/webhooks/webhook-templates.png b/doc/content/integrations/webhooks/webhook-templates.png
index 129f6690eb..427c052786 100644
Binary files a/doc/content/integrations/webhooks/webhook-templates.png and b/doc/content/integrations/webhooks/webhook-templates.png differ
diff --git a/doc/content/reference/components/console_overview.png b/doc/content/reference/components/console_overview.png
index 41d59c68f8..a79b80158f 100644
Binary files a/doc/content/reference/components/console_overview.png and b/doc/content/reference/components/console_overview.png differ
diff --git a/doc/content/the-things-stack/interact/console/console.png b/doc/content/the-things-stack/interact/console/console.png
index 1e5c2c2a1a..a79b80158f 100644
Binary files a/doc/content/the-things-stack/interact/console/console.png and b/doc/content/the-things-stack/interact/console/console.png differ
diff --git a/doc/content/the-things-stack/interact/console/login/_index.md b/doc/content/the-things-stack/interact/console/login/_index.md
index 0de6d2eb23..79bd08fc81 100644
--- a/doc/content/the-things-stack/interact/console/login/_index.md
+++ b/doc/content/the-things-stack/interact/console/login/_index.md
@@ -13,12 +13,12 @@ On the Console landing page, click **Login with your {{% tts %}} Account** in or
 
 {{< figure src="login.png" alt="Login" >}}
 
-If you do not have an account yet, you can register one by clicking **Create an account**, filling your details and clicking **Register**.
+If you do not have an account yet, you can register one by clicking **Login using credentials** and then **Create an account**. Then fill in your details and click **Create account**.
 
 {{< figure src="register.png" alt="Create an account" >}}
 
 When you use a new account, you may not be able to continue until you have confirmed your email address or your account is approved by an admin user.
 
-After entering your credentials and logging in, you will reach the Console overview page.
+After entering your credentials and logging in, you will reach the Console Home page.
 
 {{< figure src="overview.png" alt="Overview" >}}
diff --git a/doc/content/the-things-stack/interact/console/login/login.png b/doc/content/the-things-stack/interact/console/login/login.png
index c648483066..2c876b57d9 100644
Binary files a/doc/content/the-things-stack/interact/console/login/login.png and b/doc/content/the-things-stack/interact/console/login/login.png differ
diff --git a/doc/content/the-things-stack/interact/console/login/overview.png b/doc/content/the-things-stack/interact/console/login/overview.png
index 834ddf732b..a79b80158f 100644
Binary files a/doc/content/the-things-stack/interact/console/login/overview.png and b/doc/content/the-things-stack/interact/console/login/overview.png differ
diff --git a/doc/content/the-things-stack/interact/console/login/register.png b/doc/content/the-things-stack/interact/console/login/register.png
index d057d9f63f..a42f67ec43 100644
Binary files a/doc/content/the-things-stack/interact/console/login/register.png and b/doc/content/the-things-stack/interact/console/login/register.png differ
diff --git a/doc/content/the-things-stack/interact/console/personal-settings/_index.md b/doc/content/the-things-stack/interact/console/personal-settings/_index.md
index 6df1291047..a177841c14 100644
--- a/doc/content/the-things-stack/interact/console/personal-settings/_index.md
+++ b/doc/content/the-things-stack/interact/console/personal-settings/_index.md
@@ -33,7 +33,7 @@ Click **Save changes** to save any modified info.
 
 ### Change password
 
-To set up a new password for your account, click the **Expand** button next to the **Change password** section.
+To set up a new password for your account, click **Password** in the left-hand sidebar.
 
 Type in your **Current password**, then create a **New password** and confirm it. We highly recommend you create a strong password to enhance your profile's security.
 
@@ -51,7 +51,7 @@ In this section, we explain how to create personal API keys that grant certain r
 
 {{< tabs/tab "Console" >}}
 
-To create a personal API key, click on your avatar in the upper right corner in the Console and select **Personal API keys**.
+To create a personal API key, click on **User settings** in the left-hand sidebar and select **API keys**.
 
 Enter a **Name** for your key, set the **Expiry date**, select rights that you want to grant and then press **Create API Key**.
 
diff --git a/doc/content/the-things-stack/interact/console/personal-settings/change-password.png b/doc/content/the-things-stack/interact/console/personal-settings/change-password.png
index aa7ecd9b05..01369be8b1 100644
Binary files a/doc/content/the-things-stack/interact/console/personal-settings/change-password.png and b/doc/content/the-things-stack/interact/console/personal-settings/change-password.png differ
diff --git a/doc/content/the-things-stack/interact/console/personal-settings/general-settings.png b/doc/content/the-things-stack/interact/console/personal-settings/general-settings.png
index 8c9475319e..0f291b1b0b 100644
Binary files a/doc/content/the-things-stack/interact/console/personal-settings/general-settings.png and b/doc/content/the-things-stack/interact/console/personal-settings/general-settings.png differ
diff --git a/doc/content/the-things-stack/interact/console/personal-settings/personal-api-key-creation.png b/doc/content/the-things-stack/interact/console/personal-settings/personal-api-key-creation.png
index 40d44a56ef..036c473269 100644
Binary files a/doc/content/the-things-stack/interact/console/personal-settings/personal-api-key-creation.png and b/doc/content/the-things-stack/interact/console/personal-settings/personal-api-key-creation.png differ
diff --git a/doc/content/the-things-stack/interact/console/personal-settings/profile-settings.png b/doc/content/the-things-stack/interact/console/personal-settings/profile-settings.png
index a7a2a888fc..27b7ab2c49 100644
Binary files a/doc/content/the-things-stack/interact/console/personal-settings/profile-settings.png and b/doc/content/the-things-stack/interact/console/personal-settings/profile-settings.png differ
diff --git a/doc/content/the-things-stack/management/sso/login-screen.png b/doc/content/the-things-stack/management/sso/login-screen.png
index 64538c30a9..2c876b57d9 100644
Binary files a/doc/content/the-things-stack/management/sso/login-screen.png and b/doc/content/the-things-stack/management/sso/login-screen.png differ
diff --git a/doc/content/the-things-stack/management/user-management/org/_index.md b/doc/content/the-things-stack/management/user-management/org/_index.md
index 691c1f8534..c00906e4c4 100644
--- a/doc/content/the-things-stack/management/user-management/org/_index.md
+++ b/doc/content/the-things-stack/management/user-management/org/_index.md
@@ -24,7 +24,7 @@ To manage organizations, click the **Organizations** tab in the top menu.
 
 {{< figure src="orgs.png" alt="Organizations" >}}
 
-To add an organization, click **Add organization**.
+To add an organization, click **Create organization**.
 
 {{< figure src="add-org.png" alt="Add organization" >}}
 
@@ -34,7 +34,9 @@ Use the left hand menu in your organization's settings to add or remove collabor
 
 ### Create Organization API Key
 
-When a user is a member of an organization which is a collaborator for an entity, the user's rights are the intersection of the user's rights in the organization and the organization's rights on the entity. To grant rights to your organization, navigate to **API Keys** on the left hand menu of your organization's settings and select **Add API Key**.
+When a user is a member of an organization which is a collaborator for an entity, the user's rights are the intersection of the user's rights in the organization and the organization's rights on the entity. To grant rights to your organization, navigate to **API Keys** on the top hand menu of your organization's settings and select **Add API Key**.
+
+{{< figure src="organization-api-keys.png" alt="Application API Key" >}}
 
 Enter a **Name** for your key, set the **Expiry date**, select rights that you want to grant and then press **Create API Key**.
 
diff --git a/doc/content/the-things-stack/management/user-management/org/add-org.png b/doc/content/the-things-stack/management/user-management/org/add-org.png
index cf20827caf..9b08a54cf8 100644
Binary files a/doc/content/the-things-stack/management/user-management/org/add-org.png and b/doc/content/the-things-stack/management/user-management/org/add-org.png differ
diff --git a/doc/content/the-things-stack/management/user-management/org/organization-api-key-creation.png b/doc/content/the-things-stack/management/user-management/org/organization-api-key-creation.png
index 87e83aa205..3ac675d4f5 100644
Binary files a/doc/content/the-things-stack/management/user-management/org/organization-api-key-creation.png and b/doc/content/the-things-stack/management/user-management/org/organization-api-key-creation.png differ
diff --git a/doc/content/the-things-stack/management/user-management/org/organization-api-keys.png b/doc/content/the-things-stack/management/user-management/org/organization-api-keys.png
new file mode 100644
index 0000000000..9f35ba684a
Binary files /dev/null and b/doc/content/the-things-stack/management/user-management/org/organization-api-keys.png differ
diff --git a/doc/content/the-things-stack/management/user-management/org/orgs.png b/doc/content/the-things-stack/management/user-management/org/orgs.png
index 23d4cd4078..45ab42c15d 100644
Binary files a/doc/content/the-things-stack/management/user-management/org/orgs.png and b/doc/content/the-things-stack/management/user-management/org/orgs.png differ
diff --git a/doc/content/the-things-stack/management/user-management/rights/collaborators.png b/doc/content/the-things-stack/management/user-management/rights/collaborators.png
index 56baaf569f..026b570eb3 100644
Binary files a/doc/content/the-things-stack/management/user-management/rights/collaborators.png and b/doc/content/the-things-stack/management/user-management/rights/collaborators.png differ
diff --git a/doc/content/the-things-stack/management/user-management/rights/rights.png b/doc/content/the-things-stack/management/user-management/rights/rights.png
index ca5dc0dcf3..b268ea3180 100644
Binary files a/doc/content/the-things-stack/management/user-management/rights/rights.png and b/doc/content/the-things-stack/management/user-management/rights/rights.png differ