diff --git a/user_manual/talk/images/call-menu.png b/user_manual/talk/images/call-menu.png
index d86e836cd..58f061f25 100644
Binary files a/user_manual/talk/images/call-menu.png and b/user_manual/talk/images/call-menu.png differ
diff --git a/user_manual/talk/images/change-name.png b/user_manual/talk/images/change-name.png
index df7c75c2b..75b7a4ffc 100644
Binary files a/user_manual/talk/images/change-name.png and b/user_manual/talk/images/change-name.png differ
diff --git a/user_manual/talk/images/device-check.png b/user_manual/talk/images/device-check.png
new file mode 100644
index 000000000..da521716d
Binary files /dev/null and b/user_manual/talk/images/device-check.png differ
diff --git a/user_manual/talk/images/guest-room-menu.png b/user_manual/talk/images/guest-room-menu.png
index 4620eff6d..f29d96844 100644
Binary files a/user_manual/talk/images/guest-room-menu.png and b/user_manual/talk/images/guest-room-menu.png differ
diff --git a/user_manual/talk/images/guest-settings.png b/user_manual/talk/images/guest-settings.png
index 7880ee19a..cb9165e79 100644
Binary files a/user_manual/talk/images/guest-settings.png and b/user_manual/talk/images/guest-settings.png differ
diff --git a/user_manual/talk/images/guest-view.png b/user_manual/talk/images/guest-view.png
index 3a9d7646b..35ae8d36f 100644
Binary files a/user_manual/talk/images/guest-view.png and b/user_manual/talk/images/guest-view.png differ
diff --git a/user_manual/talk/images/talk-grid-view.png b/user_manual/talk/images/talk-grid-view.png
index 0ae15f3a7..09fbec201 100644
Binary files a/user_manual/talk/images/talk-grid-view.png and b/user_manual/talk/images/talk-grid-view.png differ
diff --git a/user_manual/talk/join_a_call_or_chat_as_guest.rst b/user_manual/talk/join_a_call_or_chat_as_guest.rst
index 0540d174c..81074d752 100644
--- a/user_manual/talk/join_a_call_or_chat_as_guest.rst
+++ b/user_manual/talk/join_a_call_or_chat_as_guest.rst
@@ -1,7 +1,7 @@
-join a call or chat as guest
+Join a call or chat as guest
 ============================
 
-Nextcloud Talk offers audio/video and text chat integrated in Nextcloud. It offers
+Nextcloud Talk offers audio/video call and text chat integrated in Nextcloud. It offers
 a web interface as well as mobile apps.
 
 You can find out more about Nextcloud Talk `on our website <https://nextcloud.com/talk/>`_.
@@ -18,20 +18,25 @@ You can change your name by clicking the ``Edit`` button, located top-right.
 .. image:: images/change-name.png
 
 Your camera and microphone settings can be found in the ``Settings`` menu. There you can also find a list of shortcuts you can use.
- 
+
 .. image:: images/guest-settings.png
 
+Joining a call
+--------------
+
 You can start a call any time with the ``Start call`` button. Other participants will get notified and can join the call. If somebody else has started a call already, the button will change in a green ``Join call`` button.
 
 .. image:: images/join-call.png
 
-During a call, you can find the Camera and Microphone settings in the ``...`` menu on your video.
+Before actually joining the call you will see a device check, where you can pick the right camera and microphone, enable background blur or even join with any devices.
+
+.. image:: images/device-check.png
+
+During a call, you can find the Camera and Microphone settings in the ``...`` menu in the top bar.
 
 .. image:: images/call-menu.png
 
-.. image:: images/talk-settings.png
-
-During a call, you can mute your microphone and disable your video with the buttons on your video on the bottom-right, or using the shortcuts ``M`` to mute audio and ``V`` to disable video. You can also use the space bar to toggle mute. When you are muted, pressing space will unmute you so you can speak until you let go of the space bar. If you are unmuted, pressing space will mute you until you let go.
+During a call, you can mute your microphone and disable your video with the buttons in the top-right, or using the shortcuts ``M`` to mute audio and ``V`` to disable video. You can also use the ``space bar`` to toggle mute. When you are muted, pressing space will unmute you so you can speak until you let go of the space bar. If you are unmuted, pressing space will mute you until you let go.
 
 You can hide your video (useful during a screen share) with the little arrow just above the video stream. Bring it back with the little arrow again.