diff --git a/README.md b/README.md
index 2915cc92c..b86e21e10 100644
--- a/README.md
+++ b/README.md
@@ -7,13 +7,13 @@
 Icinga DB is a set of components for publishing, synchronizing and
 visualizing monitoring data in the Icinga ecosystem, consisting of:
 
-* Icinga DB Web which connects to both a Redis server and a database to view and work with
+* Icinga DB Web which connects to both a Redis® server and a database to view and work with
   most up-to-date monitoring data
 * Icinga 2 with its [Icinga DB feature](https://icinga.com/docs/icinga-2/latest/doc/14-features/#icinga-db) enabled,
-  responsible for publishing the data to the Redis server, i.e. configuration and its runtime updates, check results, state changes,
-  downtimes, acknowledgements, notifications, and other events such as flapping
+  responsible for publishing the data to the Redis® server, i.e. configuration and its runtime updates, check results,
+  state changes, downtimes, acknowledgements, notifications, and other events such as flapping
 * And the [Icinga DB daemon](https://icinga.com/docs/icinga-db),
-  which synchronizes the data between the Redis server and the database
+  which synchronizes the data between the Redis® server and the database
 
 ![Icinga DB Architecture](doc/res/icingadb-architecture.png)
 
diff --git a/doc/01-About.md b/doc/01-About.md
index a13333eaa..e173e3912 100644
--- a/doc/01-About.md
+++ b/doc/01-About.md
@@ -3,12 +3,12 @@
 Icinga DB is a set of components for publishing, synchronizing and
 visualizing monitoring data in the Icinga ecosystem, consisting of:
 
-* Icinga DB Web which connects to both a Redis server and a database to view and work with monitoring data
+* Icinga DB Web which connects to both a Redis® server and a database to view and work with monitoring data
 * Icinga 2 with its [Icinga DB feature](https://icinga.com/docs/icinga-2/latest/14-features/#icinga-db) enabled,
   responsible for publishing monitoring configuration, check results,
-  states changes and history items to the Redis server
+  states changes and history items to the Redis® server
 * And the [Icinga DB daemon](https://icinga.com/docs/icinga-db/latest/01-About/),
-  which synchronizes monitoring data between the Redis server and the database
+  which synchronizes monitoring data between the Redis® server and the database
 
 ![Icinga DB Architecture](res/icingadb-architecture.png)
 
diff --git a/doc/03-Configuration.md b/doc/03-Configuration.md
index c02992fb4..c79ce66bf 100644
--- a/doc/03-Configuration.md
+++ b/doc/03-Configuration.md
@@ -15,17 +15,17 @@ Connection configuration for the database to which Icinga DB synchronizes monito
 2. Configure the resource you just created as the database connection for the Icinga DB Web module using the
    `Configuration → Modules → icingadb → Database` menu.
 
-## Redis Configuration
+## Redis® Configuration
 
-Connection configuration for the Redis server where Icinga 2 writes check results.
+Connection configuration for the Redis® server where Icinga 2 writes check results.
 This data is used to display the latest state information in Icinga DB Web.
 
-1. Configure the connection to the Redis server through the `Configuration → Modules → icingadb → Redis` menu.
+1. Configure the connection to the Redis® server through the `Configuration → Modules → icingadb → Redis` menu.
 
 !!! info
 
     If you are running a high-availability Icinga 2 setup,
-    also configure the secondary master's Redis connection details.
+    also configure the secondary master's Redis® connection details.
     Icinga DB Web then uses this connection if the primary one is not available.
 
 ## Command Transport Configuration
diff --git a/doc/res/icingadb-architecture.png b/doc/res/icingadb-architecture.png
index 3d55ff757..c4af6eb3f 100644
Binary files a/doc/res/icingadb-architecture.png and b/doc/res/icingadb-architecture.png differ
diff --git a/doc/res/icingadb-web.png b/doc/res/icingadb-web.png
index 05a3e3185..2d983349a 100644
Binary files a/doc/res/icingadb-web.png and b/doc/res/icingadb-web.png differ