diff --git a/general/auth/google.rst b/general/auth/google.rst
index 3e7eaeba6..f08a59594 100644
--- a/general/auth/google.rst
+++ b/general/auth/google.rst
@@ -1,49 +1,95 @@
-=======================================================
-How to allow users to sign in with their Google account
-=======================================================
+=======================================
+Integrate Google Sign-In Authentication
+=======================================
-- Connect to your Google account and go to the `Google API Dashboard
- `_.
+test2 The **Google Sign-In Authentication** is a function that allows your users to sign in to Odoo
+with their Google account (the same account they already use with Gmail, etc). It reduces the burden
+of login for the users, and makes the process easier, quicker and more secure for them. Moreover,
+users do not need to remember or manage yet another password.
-- Click on **Create Project** and enter the project name and other details.
+.. _google/configuration:
-.. image:: media/google01.png
- :align: center
+Configuration
+=============
-.. image:: media/google02.png
- :align: center
+The integration of the Google sign-in function requires configuration both in Google and in Odoo.
-- Click on **Use Google APIs**
+These are the steps to follow in order to integrate Google sign-in authentication:
-.. image:: media/google03.png
- :align: center
+#. Connect to your Google account and go to the `Google API Dashboard
+ `_.
-- On the left side menu, select the sub menu **Credentials** (from **API Manager**) then select **OAuth consent screen**.
+#. Click on *Create Project* on the right, and enter the project name and other details of your
+ company.
-.. image:: media/google04.png
- :align: center
+#. Click on *Create*.
-- Fill in your address, email and the product name (for example odoo) and then save.
+ .. image:: media/google-auth-create-project.png
+ :align: center
+ :alt: Create project button
-.. image:: media/google05.png
- :align: center
+ .. image:: media/google-auth-new-project-details.png
+ :align: center
+ :alt: Filling in the details of a new project
-- Then click on **Add Credentials** and select the second option (OAuth 2.0 Client ID).
+ .. note::
+ - Type the name of your own company, NOT odoo.com as in the example.
-.. image:: media/google06.png
- :align: center
+#. On the left side menu, click on :menuselection:`OAuth consent screen`.
-.. image:: media/google07.png
- :align: center
+ .. image:: media/google-oauth-consent-selection.png
+ :align: center
+ :alt: Google oauth consent selection menu
-- Check that the application type is set on **Web Application**. Now configure the allowed pages on which you will be redirected.
+#. Choose one of the options **(Internal / External)** as instructed, and click on *Create*.
-- To achieve this, complete the field **Authorized redirect URIs**. Copy paste the following link in the box: http://mydomain.odoo.com/auth_oauth/signin. Then click on **Create**
+ .. image:: media/google-oauth-consent.png
+ :align: center
+ :alt: Choice of a user type in oauth consent
-.. image:: media/google08.png
- :align: center
+#. Fill in your details, then click on *Save and Continue*.
-.. image:: media/google09.png
- :align: center
+ .. image:: media/google-auth-edit-app-registration.png
+ :align: center
+ :alt: Edit app registration page
-- Once done, you receive two information (your Client ID and Client Secret). You have to insert your Client ID in the **General Settings**.
+ .. image:: media/google-auth-edit-app-registration-part2.png
+ :align: center
+ :alt: Edit app registration page part 2
+
+#. Click on *Save and Continue* once again, then click on *Back to Dashboard*.
+
+#. On the left side menu, click on :menuselection:`Credentials`.
+
+ .. image:: media/google-auth-credentials-button.png
+ :align: center
+ :alt: Credentials button menu
+
+#. Click on *Create Credentials* and select **OAuth client ID**.
+
+ .. image:: media/google-oauth-client-id.png
+ :align: center
+ :alt: Oauth client id selection
+
+#. Select **Web Application** as the Application type. Now configure the allowed pages on which you
+ will be redirected. To achieve this, complete the field **Authorized redirect URIs**. Copy paste
+ the following link into the box: http://mydomain.odoo.com/auth_oauth/signin (replace "mydomain"
+ with your own domain). Then click on *Create*.
+
+ .. image:: media/google-create-oauth-client-id.png
+ :align: center
+ :alt: Creating oauth client id
+
+#. Once done, you receive two infos (your Client ID and Client Secret). *Insert* your Client ID in
+ the **General Settings** on Odoo.
+
+ .. image:: media/google-auth-secret-ids.png
+ :align: center
+ :alt: Secret ids display
+
+ .. image:: media/odoo-settings-client-id.png
+ :align: center
+ :alt: Filling in the client id in odoo settings
+
+.. seealso::
+ - `Google Identity `_
diff --git a/general/auth/media/add_to_google_spread.png b/general/auth/media/add_to_google_spread.png
deleted file mode 100644
index 82d45df49..000000000
Binary files a/general/auth/media/add_to_google_spread.png and /dev/null differ
diff --git a/general/auth/media/authori.png b/general/auth/media/authori.png
deleted file mode 100644
index 0a2668e80..000000000
Binary files a/general/auth/media/authori.png and /dev/null differ
diff --git a/general/auth/media/google-auth-create-project.png b/general/auth/media/google-auth-create-project.png
new file mode 100644
index 000000000..eea5fe4c8
Binary files /dev/null and b/general/auth/media/google-auth-create-project.png differ
diff --git a/general/auth/media/google-auth-credentials-button.png b/general/auth/media/google-auth-credentials-button.png
new file mode 100644
index 000000000..830e5bf26
Binary files /dev/null and b/general/auth/media/google-auth-credentials-button.png differ
diff --git a/general/auth/media/google-auth-edit-app-registration-part2.png b/general/auth/media/google-auth-edit-app-registration-part2.png
new file mode 100644
index 000000000..76c925626
Binary files /dev/null and b/general/auth/media/google-auth-edit-app-registration-part2.png differ
diff --git a/general/auth/media/google-auth-edit-app-registration.png b/general/auth/media/google-auth-edit-app-registration.png
new file mode 100644
index 000000000..92dbb9e23
Binary files /dev/null and b/general/auth/media/google-auth-edit-app-registration.png differ
diff --git a/general/auth/media/google-auth-new-project-details.png b/general/auth/media/google-auth-new-project-details.png
new file mode 100644
index 000000000..e9ad25ce1
Binary files /dev/null and b/general/auth/media/google-auth-new-project-details.png differ
diff --git a/general/auth/media/google-auth-secret-ids.png b/general/auth/media/google-auth-secret-ids.png
new file mode 100644
index 000000000..0ff49c881
Binary files /dev/null and b/general/auth/media/google-auth-secret-ids.png differ
diff --git a/general/auth/media/google-create-oauth-client-id.png b/general/auth/media/google-create-oauth-client-id.png
new file mode 100644
index 000000000..b0454a2e6
Binary files /dev/null and b/general/auth/media/google-create-oauth-client-id.png differ
diff --git a/general/auth/media/google-oauth-client-id.png b/general/auth/media/google-oauth-client-id.png
new file mode 100644
index 000000000..f83c4c37b
Binary files /dev/null and b/general/auth/media/google-oauth-client-id.png differ
diff --git a/general/auth/media/google-oauth-consent-selection.png b/general/auth/media/google-oauth-consent-selection.png
new file mode 100644
index 000000000..b166bdc08
Binary files /dev/null and b/general/auth/media/google-oauth-consent-selection.png differ
diff --git a/general/auth/media/google-oauth-consent.png b/general/auth/media/google-oauth-consent.png
new file mode 100644
index 000000000..aa4ce5eee
Binary files /dev/null and b/general/auth/media/google-oauth-consent.png differ
diff --git a/general/auth/media/google01.png b/general/auth/media/google01.png
deleted file mode 100644
index e566bd57e..000000000
Binary files a/general/auth/media/google01.png and /dev/null differ
diff --git a/general/auth/media/google02.png b/general/auth/media/google02.png
deleted file mode 100644
index d8efa8a90..000000000
Binary files a/general/auth/media/google02.png and /dev/null differ
diff --git a/general/auth/media/google03.png b/general/auth/media/google03.png
deleted file mode 100644
index e22da632c..000000000
Binary files a/general/auth/media/google03.png and /dev/null differ
diff --git a/general/auth/media/google04.png b/general/auth/media/google04.png
deleted file mode 100644
index 9b53656af..000000000
Binary files a/general/auth/media/google04.png and /dev/null differ
diff --git a/general/auth/media/google05.png b/general/auth/media/google05.png
deleted file mode 100644
index 86010d2c1..000000000
Binary files a/general/auth/media/google05.png and /dev/null differ
diff --git a/general/auth/media/google06.png b/general/auth/media/google06.png
deleted file mode 100644
index bf9aecb5a..000000000
Binary files a/general/auth/media/google06.png and /dev/null differ
diff --git a/general/auth/media/google07.png b/general/auth/media/google07.png
deleted file mode 100644
index 064b81a97..000000000
Binary files a/general/auth/media/google07.png and /dev/null differ
diff --git a/general/auth/media/google08.png b/general/auth/media/google08.png
deleted file mode 100644
index b1ec01739..000000000
Binary files a/general/auth/media/google08.png and /dev/null differ
diff --git a/general/auth/media/google09.png b/general/auth/media/google09.png
deleted file mode 100644
index 72053a474..000000000
Binary files a/general/auth/media/google09.png and /dev/null differ
diff --git a/general/auth/media/ldap01.png b/general/auth/media/ldap01.png
deleted file mode 100644
index 6dc4354bd..000000000
Binary files a/general/auth/media/ldap01.png and /dev/null differ
diff --git a/general/auth/media/ldap02.png b/general/auth/media/ldap02.png
deleted file mode 100644
index 7e65eb5e1..000000000
Binary files a/general/auth/media/ldap02.png and /dev/null differ
diff --git a/general/auth/media/ldap03.png b/general/auth/media/ldap03.png
deleted file mode 100644
index 93482c002..000000000
Binary files a/general/auth/media/ldap03.png and /dev/null differ
diff --git a/general/auth/media/ldap04.png b/general/auth/media/ldap04.png
deleted file mode 100644
index 7199e9a2c..000000000
Binary files a/general/auth/media/ldap04.png and /dev/null differ
diff --git a/general/auth/media/ldap05.png b/general/auth/media/ldap05.png
deleted file mode 100644
index f80e9cd40..000000000
Binary files a/general/auth/media/ldap05.png and /dev/null differ
diff --git a/general/auth/media/ldap06.png b/general/auth/media/ldap06.png
deleted file mode 100644
index b652747af..000000000
Binary files a/general/auth/media/ldap06.png and /dev/null differ
diff --git a/general/auth/media/ldap07.png b/general/auth/media/ldap07.png
deleted file mode 100644
index 045f07472..000000000
Binary files a/general/auth/media/ldap07.png and /dev/null differ
diff --git a/general/auth/media/odoo-settings-client-id.png b/general/auth/media/odoo-settings-client-id.png
new file mode 100644
index 000000000..364fa0cee
Binary files /dev/null and b/general/auth/media/odoo-settings-client-id.png differ
diff --git a/general/auth/media/odoo_menu.png b/general/auth/media/odoo_menu.png
deleted file mode 100644
index 987b26968..000000000
Binary files a/general/auth/media/odoo_menu.png and /dev/null differ
diff --git a/general/auth/media/retrieve_data.png b/general/auth/media/retrieve_data.png
deleted file mode 100644
index 9c63bb8b5..000000000
Binary files a/general/auth/media/retrieve_data.png and /dev/null differ
diff --git a/general/auth/media/retrieve_sums.png b/general/auth/media/retrieve_sums.png
deleted file mode 100644
index b742f670c..000000000
Binary files a/general/auth/media/retrieve_sums.png and /dev/null differ