diff --git a/website/optimize.rst b/website/optimize.rst
index c391bf3fe..102f50f24 100644
--- a/website/optimize.rst
+++ b/website/optimize.rst
@@ -7,6 +7,7 @@ Optimize
optimize/seo
optimize/google_analytics
+ optimize/google_analytics_dashboard
diff --git a/website/optimize/google_analytics.rst b/website/optimize/google_analytics.rst
index c4199a26f..cef6b25f6 100644
--- a/website/optimize/google_analytics.rst
+++ b/website/optimize/google_analytics.rst
@@ -1,54 +1,32 @@
-==================================================
-How to track your traffic through Google Analytics
-==================================================
+=======================================================
+How to track your website's traffic in Google Analytics
+=======================================================
-To setup the signin process with Google, first you have to perform the following steps:
+To follow your website's traffic with Google Analytics:
+- `Create a Google Analytics account `__ if
+ you don't have any.
-- Connect on your google account and go to https://console.developers.google.com
+- Go through the creation form and accept the conditions to get the tracking ID.
-- Click on **Create Project** and enter a project name
-
- .. image:: media/GC_create_project.png
+ .. image:: media/google_analytics_account.png
:align: center
- .. image:: media/GC_new_project.png
+- Copy the tracking ID to insert it in Odoo.
+
+ .. image:: media/google_analytics_tracking_id.png
:align: center
-- In the menu on left side, select the sub menu APIs (from menu APIs and auth) and
- activate **"Analytics API"** by clicking on button "OFF". When it's done, check
- that the button of **"Calendar API"** is well in green and with text "ON"
+- Go to the *Configuration* menu of your Odoo's Website app.
+ In the settings, turn on Google Analytics and paste the tracking ID.
+ Then save the page.
- .. image:: media/GC_API.png
+ .. image:: media/google_analytics_settings.png
:align: center
- .. image:: media/GC_off_api.png
- :align: center
+To make your first steps in Google Analytics, refer to `Google Documentation.
+ `__
- .. image:: media/GC_on_api.png
- :align: center
+.. seealso::
-- In the menu on left side, select the sub menu **"Credentials"** (from menu APIs and
- auth) and click on button **"Create New Client ID"**
-
- .. image:: media/GC_credentials.png
- :align: center
-
- .. image:: media/GC_create_new_client_id.png
- :align: center
-
-- Fill in the Name of application and check that the platform is well on **"Web Application"**.
- You should now configure the allowed pages on which you will be redirected. To do
- it, you need to complete the field **"Redirect RI"** and set as value (your own domain
- followed by ``/google_account/authentication``) : You can now click on **"Create Client ID"**
-
- .. image:: media/GC_client_id.png
- :align: center
-
-- Once done, you will have the both informations (**Client ID** and **Client Secret**) that
- you need to insert in the 2 fields below !
-
- .. image:: media/GC_copy.png
- :align: center
-
-- Click on **Apply**
+ * :doc:`google_analytics_dashboard`
\ No newline at end of file
diff --git a/website/optimize/google_analytics_dashboard.rst b/website/optimize/google_analytics_dashboard.rst
new file mode 100644
index 000000000..49b6f5865
--- /dev/null
+++ b/website/optimize/google_analytics_dashboard.rst
@@ -0,0 +1,66 @@
+============================================================
+How to track your website's traffic from your Odoo Dashboard
+============================================================
+
+You can follow your traffic's statistics straight from your Odoo Website
+Dashboard thanks to Google Analytics.
+
+- A preliminary step is creating a Google Analytics account and entering the
+ tracking ID in your Website's settings (see :doc:`google_analytics`).
+
+- Go to `Google APIs platform `__
+ to generate Analytics API credentials. Log in with your Google account.
+
+- Select Analytics API.
+
+ .. image:: media/google_analytics_api.png
+ :align: center
+
+- Create a new project and give it a name (e.g. Google Analytics in Odoo).
+
+ .. image:: media/google_analytics_create_project.png
+ :align: center
+
+- Enable the API.
+
+ .. image:: media/google_analytics_enable.png
+ :align: center
+
+- Create credentials to use in Odoo. Select *Web browser (Javascript)*
+ as calling source and *User data* as kind of data.
+
+ .. image:: media/google_analytics_create_credentials.png
+ :align: center
+
+ .. image:: media/google_analytics_get_credentials.png
+ :align: center
+
+- Then enter the name of the application (e.g. Odoo) and the allowed pages on
+ which you will be redirected. The *Authorized JavaScript origin* is your
+ Odoo's instance URL. The *Authorized redirect URI* is your Odoo's instance
+ URL followed by /google_account/authentication.
+
+ .. image:: media/google_analytics_authorization.png
+ :align: center
+
+
+- Go through the Consent Screen step by entering a product name
+ (e.g. Google Analytics in Odoo). Feel free to check the customizations options
+ but this is not mandatory. The Consent Screen will only show up when you enter
+ the Client ID in Odoo for the first time.
+
+- Finally you are provided with your Client ID. Copy and paste it in Odoo.
+
+ .. image:: media/google_analytics_client_id.png
+ :align: center
+
+- Open your Website Dashboard in Odoo and link your Analytics account.
+ to past your Client ID.
+
+ .. image:: media/google_analytics_start.png
+ :align: center
+
+- As a last step, authorize Odoo to access Google API.
+
+ .. image:: media/google_analytics_login.png
+ :align: center
diff --git a/website/optimize/media/GC_API.png b/website/optimize/media/GC_API.png
deleted file mode 100644
index 3d3d39bbe..000000000
Binary files a/website/optimize/media/GC_API.png and /dev/null differ
diff --git a/website/optimize/media/GC_Project.png b/website/optimize/media/GC_Project.png
deleted file mode 100644
index d7a3ab5cd..000000000
Binary files a/website/optimize/media/GC_Project.png and /dev/null differ
diff --git a/website/optimize/media/GC_client_id.png b/website/optimize/media/GC_client_id.png
deleted file mode 100644
index 0f5b3f376..000000000
Binary files a/website/optimize/media/GC_client_id.png and /dev/null differ
diff --git a/website/optimize/media/GC_copy.png b/website/optimize/media/GC_copy.png
deleted file mode 100644
index d6aeec75b..000000000
Binary files a/website/optimize/media/GC_copy.png and /dev/null differ
diff --git a/website/optimize/media/GC_create_new_client_id.png b/website/optimize/media/GC_create_new_client_id.png
deleted file mode 100644
index cb8c66cbc..000000000
Binary files a/website/optimize/media/GC_create_new_client_id.png and /dev/null differ
diff --git a/website/optimize/media/GC_credentials.png b/website/optimize/media/GC_credentials.png
deleted file mode 100644
index 5a2927ad5..000000000
Binary files a/website/optimize/media/GC_credentials.png and /dev/null differ
diff --git a/website/optimize/media/GC_enable_api.png b/website/optimize/media/GC_enable_api.png
deleted file mode 100644
index e0390826c..000000000
Binary files a/website/optimize/media/GC_enable_api.png and /dev/null differ
diff --git a/website/optimize/media/GC_new_project.png b/website/optimize/media/GC_new_project.png
deleted file mode 100644
index 730c9291a..000000000
Binary files a/website/optimize/media/GC_new_project.png and /dev/null differ
diff --git a/website/optimize/media/GC_off_api.png b/website/optimize/media/GC_off_api.png
deleted file mode 100644
index 693042665..000000000
Binary files a/website/optimize/media/GC_off_api.png and /dev/null differ
diff --git a/website/optimize/media/GC_on_api.png b/website/optimize/media/GC_on_api.png
deleted file mode 100644
index 1aed345ae..000000000
Binary files a/website/optimize/media/GC_on_api.png and /dev/null differ
diff --git a/website/optimize/media/google_analytics_account.png b/website/optimize/media/google_analytics_account.png
new file mode 100644
index 000000000..0c04a6ddd
Binary files /dev/null and b/website/optimize/media/google_analytics_account.png differ
diff --git a/website/optimize/media/google_analytics_api.png b/website/optimize/media/google_analytics_api.png
new file mode 100644
index 000000000..0f4fa236b
Binary files /dev/null and b/website/optimize/media/google_analytics_api.png differ
diff --git a/website/optimize/media/google_analytics_authorization.png b/website/optimize/media/google_analytics_authorization.png
new file mode 100644
index 000000000..4819f952c
Binary files /dev/null and b/website/optimize/media/google_analytics_authorization.png differ
diff --git a/website/optimize/media/google_analytics_client_id.png b/website/optimize/media/google_analytics_client_id.png
new file mode 100644
index 000000000..a76a26ba5
Binary files /dev/null and b/website/optimize/media/google_analytics_client_id.png differ
diff --git a/website/optimize/media/google_analytics_create_credentials.png b/website/optimize/media/google_analytics_create_credentials.png
new file mode 100644
index 000000000..6faffa356
Binary files /dev/null and b/website/optimize/media/google_analytics_create_credentials.png differ
diff --git a/website/optimize/media/GC_create_project.png b/website/optimize/media/google_analytics_create_project.png
similarity index 100%
rename from website/optimize/media/GC_create_project.png
rename to website/optimize/media/google_analytics_create_project.png
diff --git a/website/optimize/media/google_analytics_enable.png b/website/optimize/media/google_analytics_enable.png
new file mode 100644
index 000000000..e554b9fd4
Binary files /dev/null and b/website/optimize/media/google_analytics_enable.png differ
diff --git a/website/optimize/media/google_analytics_get_credentials.png b/website/optimize/media/google_analytics_get_credentials.png
new file mode 100644
index 000000000..26283cf26
Binary files /dev/null and b/website/optimize/media/google_analytics_get_credentials.png differ
diff --git a/website/optimize/media/google_analytics_login.png b/website/optimize/media/google_analytics_login.png
new file mode 100644
index 000000000..a079ac94d
Binary files /dev/null and b/website/optimize/media/google_analytics_login.png differ
diff --git a/website/optimize/media/google_analytics_settings.png b/website/optimize/media/google_analytics_settings.png
new file mode 100644
index 000000000..5fae4c814
Binary files /dev/null and b/website/optimize/media/google_analytics_settings.png differ
diff --git a/website/optimize/media/google_analytics_start.png b/website/optimize/media/google_analytics_start.png
new file mode 100644
index 000000000..9d6e98748
Binary files /dev/null and b/website/optimize/media/google_analytics_start.png differ
diff --git a/website/optimize/media/google_analytics_tracking_id.png b/website/optimize/media/google_analytics_tracking_id.png
new file mode 100644
index 000000000..b9870ead6
Binary files /dev/null and b/website/optimize/media/google_analytics_tracking_id.png differ