diff --git a/social_marketing.rst b/social_marketing.rst
index 728219e39..e1bac985d 100644
--- a/social_marketing.rst
+++ b/social_marketing.rst
@@ -7,5 +7,5 @@ Social Marketing
 .. toctree::
    :titlesonly:
 
-   social_marketing/social_marketing
+   social_marketing/overview
    
\ No newline at end of file
diff --git a/social_marketing/overview.rst b/social_marketing/overview.rst
new file mode 100644
index 000000000..df9eacccd
--- /dev/null
+++ b/social_marketing/overview.rst
@@ -0,0 +1,11 @@
+========
+Overview
+========
+
+.. toctree::
+   :titlesonly:
+
+   overview/manage_social
+   overview/push_notifications
+   overview/livechat
+   overview/campaigns
\ No newline at end of file
diff --git a/social_marketing/overview/campaigns.rst b/social_marketing/overview/campaigns.rst
new file mode 100644
index 000000000..5e70bd565
--- /dev/null
+++ b/social_marketing/overview/campaigns.rst
@@ -0,0 +1,36 @@
+===========================================
+Connecting to my Marketplace with Campaigns
+===========================================
+
+Whether your goal is to sell a new product, explain the value of your services or advertise your
+event, a campaign helps you to connect with your marketplace. They normally involve multiple
+channels, so it is fundamental to have a solution with which you can plan, execute, track, and
+analyze your content.
+
+Go to :menuselection:`Social Marketing --> Campaigns --> Create`.
+
+.. image:: media/create_campaign.png
+   :align: center
+   :alt: Click on create to start a campaign in Odoo Social Marketing
+
+As you create content, tabs for that specific channel will be shown. The overview of the campaign
+shows you global metric such as:
+
+- *Revenue*: number of users who, from a link in your content, finished a transaction (paid).
+- *Quotations*: number of users who, from a link in your content, have started but not finished a
+  transaction (did not pay).
+- *Leads*: users who have filled out your contact form, from a link in your content.
+
+.. important::
+   To be able to *Send New Mailing*, make sure the feature is enabled in the *Email Marketing*
+   application, under :menuselection:`Email Marketing --> Configuration --> Settings`.
+   To be able to *Send SMS*, the *SMS Marketing* application must be installed on your database.
+
+.. note::
+   *Social Marketing* works integrated with other applications such as *Sales*,
+   *Invoicing*, *CRM* and *Website*.
+
+.. seealso::
+   - :doc:`./push_notifications`
+   - :doc:`./manage_social`
+
diff --git a/social_marketing/overview/livechat.rst b/social_marketing/overview/livechat.rst
new file mode 100644
index 000000000..5686e7a08
--- /dev/null
+++ b/social_marketing/overview/livechat.rst
@@ -0,0 +1,60 @@
+===================================================
+Interact with Customers and Visitors with Live Chat
+===================================================
+
+One of the ways you can build stronger relationships with your customers is by making yourself
+available through live chat. Live chats can have a big impact not just on your customer service,
+but also on sales performance, as it gives users a chance of having real-time, fast, and effective
+interaction.
+
+Configuration
+=============
+
+Go to :menuselection:`Website --> Configuration --> Settings --> Live Chat` select the appropriate
+channel, and set it up.
+
+.. image:: media/enable_livechat.png
+   :align: center
+   :alt: Enable live chat under website configurations for Odoo Social Marketing
+
+Under *Channel Rules*, choose when the chat pop-up appears, and an action for a given URL and/or
+country. Note that to take the country into account, GeoIP must be installed on your server.
+
+.. important::
+   The *Live Chat* application must be installed on your database.
+
+Monitor your visitors
+=====================
+
+Under the  *Visitors* menu,  see the visitors that landed on one of your
+:ref:`social_marketing/website_tracked_pages` online or offline.
+
+| You can send emails (if an email address has been saved), send SMSs (if a phone number has been
+  saved), send a push notification (if the user has subscribed to it), and even send a live chat
+  request that will be received by the user once they move to a tracked page.
+| Open a record to see details including the visited pages, and the first and last date and time
+  the user was connected.
+
+.. image:: media/monitor_visitors.png
+   :align: center
+   :alt: See a visitor's history of pages in Odoo Social Marketing
+
+.. tip::
+   #. Your online visitors will be authenticated if they are linked to a lead or an existing partner.
+   #. If you do not use the *Website* app, you can add a live chat widget to your own website.
+
+.. _social_marketing/website_tracked_pages:
+
+Website’s tracked pages
+-----------------------
+
+To define which pages are tracked, on the *Website* application, go to
+:menuselection:`Website --> Configuration --> Pages` and enable the option *Track*,
+on the respective pages.
+
+.. image:: media/website_track_pages.png
+   :align: center
+   :alt: Choose the pages to be tracked in the website application for Odoo Social Marketing
+
+.. seealso::
+   - :doc:`../../livechat/livechat`
diff --git a/social_marketing/overview/manage_social.rst b/social_marketing/overview/manage_social.rst
new file mode 100644
index 000000000..c31f1e123
--- /dev/null
+++ b/social_marketing/overview/manage_social.rst
@@ -0,0 +1,79 @@
+============================================
+Manage Social Media Pages and Create Content
+============================================
+
+Once you are present on social media platforms, it is important to keep them up-to-date. However,
+that might feel like a full-time job. Having a solution that allows you to create, schedule, keep
+track, engage with your audience and measure results saves you time and helps you to successfully
+execute your online strategy, from posts to results.
+
+
+Add accounts and create your feed
+=================================
+
+Click on *Add Stream* and grant the required permissions to add your accounts.
+
+.. image:: media/add_streams.png
+   :align: center
+   :alt: Click on add streams to add accounts in Odoo Social Marketing
+
+.. note::
+   You can link a Facebook page for which you are the admin.
+
+| You are then redirected to your *Feed* and a column with the publications is automatically added.
+| You can then add new accounts and/or streams, such as Facebook mentions, and customize your
+  Kanban view.
+
+.. image:: media/feed.png
+   :align: center
+   :alt: See all streams in the feed in Odoo Social Marketing
+
+Adding social media accounts to your feed will also link KPIs. To get redirected to the statistics
+page of the social account, click on *Insights*.
+
+.. image:: media/insights.png
+   :align: center
+   :alt: Click on insights to be redirected to the social account from Odoo Social Marketing
+
+Link a LinkedIn account
+-----------------------
+
+Go to :menuselection:`Social Marketing --> Configuration --> Social Media`.
+
+.. image:: media/add_linkedin.png
+   :align: center
+   :alt: Go to configuration to link a linkedin account in Odoo Social Marketing
+
+.. note::
+   LinkedIn is in Beta Version, therefore, the feed is not available. Only the creation of content.
+
+Publish content
+===============
+
+Click on :menuselection:`Social Marketing --> Feed --> New Post`, or go to
+:menuselection:`Social Marketing --> Posts → Create`.
+
+.. image:: media/publish_content.png
+   :align: center
+   :alt: Click on create or new post to create and publish content in Odoo Social Marketing
+
+| Choose to upload your post right away or to schedule it.
+| Saving your post will apply a draft status to it.
+
+Overview and plan your posts with a calendar view
+=================================================
+
+| Through the calendar view, besides having an overview of your planned day, week or month, also see
+  your drafted, scheduled and published posts.
+| Drag and drop (scheduled posts) to change their scheduled date.
+| Double-click on a date to create a post directly from the *Calendar view*, and click on an
+  existing one to edit it.
+
+.. image:: media/calendar_view.png
+   :align: center
+   :alt: Click on the calendar view option in Odoo Social Marketing
+
+.. seealso::
+   - :doc:`./push_notifications`
+   - :doc:`./campaigns`
+   - :doc:`./livechat`
diff --git a/social_marketing/overview/media/add_linkedin.png b/social_marketing/overview/media/add_linkedin.png
new file mode 100644
index 000000000..0b99da084
Binary files /dev/null and b/social_marketing/overview/media/add_linkedin.png differ
diff --git a/social_marketing/overview/media/add_streams.png b/social_marketing/overview/media/add_streams.png
new file mode 100644
index 000000000..adbb29a00
Binary files /dev/null and b/social_marketing/overview/media/add_streams.png differ
diff --git a/social_marketing/overview/media/calendar_view.png b/social_marketing/overview/media/calendar_view.png
new file mode 100644
index 000000000..0d1cdf991
Binary files /dev/null and b/social_marketing/overview/media/calendar_view.png differ
diff --git a/social_marketing/overview/media/create_campaign.png b/social_marketing/overview/media/create_campaign.png
new file mode 100644
index 000000000..8d44fea0c
Binary files /dev/null and b/social_marketing/overview/media/create_campaign.png differ
diff --git a/social_marketing/overview/media/enable_livechat.png b/social_marketing/overview/media/enable_livechat.png
new file mode 100644
index 000000000..1f9d93547
Binary files /dev/null and b/social_marketing/overview/media/enable_livechat.png differ
diff --git a/social_marketing/overview/media/enable_push.png b/social_marketing/overview/media/enable_push.png
new file mode 100644
index 000000000..3c6e4a2a6
Binary files /dev/null and b/social_marketing/overview/media/enable_push.png differ
diff --git a/social_marketing/overview/media/feed.png b/social_marketing/overview/media/feed.png
new file mode 100644
index 000000000..21cbbf56e
Binary files /dev/null and b/social_marketing/overview/media/feed.png differ
diff --git a/social_marketing/overview/media/individually_push.png b/social_marketing/overview/media/individually_push.png
new file mode 100644
index 000000000..6d754bfda
Binary files /dev/null and b/social_marketing/overview/media/individually_push.png differ
diff --git a/social_marketing/overview/media/insights.png b/social_marketing/overview/media/insights.png
new file mode 100644
index 000000000..6539c717f
Binary files /dev/null and b/social_marketing/overview/media/insights.png differ
diff --git a/social_marketing/overview/media/monitor_visitors.png b/social_marketing/overview/media/monitor_visitors.png
new file mode 100644
index 000000000..15bba8d98
Binary files /dev/null and b/social_marketing/overview/media/monitor_visitors.png differ
diff --git a/social_marketing/overview/media/publish_content.png b/social_marketing/overview/media/publish_content.png
new file mode 100644
index 000000000..15d0dcc44
Binary files /dev/null and b/social_marketing/overview/media/publish_content.png differ
diff --git a/social_marketing/overview/media/push_permission.png b/social_marketing/overview/media/push_permission.png
new file mode 100644
index 000000000..796e789bb
Binary files /dev/null and b/social_marketing/overview/media/push_permission.png differ
diff --git a/social_marketing/overview/media/push_rules.png b/social_marketing/overview/media/push_rules.png
new file mode 100644
index 000000000..46ef0afca
Binary files /dev/null and b/social_marketing/overview/media/push_rules.png differ
diff --git a/social_marketing/overview/media/push_to_a_group.png b/social_marketing/overview/media/push_to_a_group.png
new file mode 100644
index 000000000..a53c966ef
Binary files /dev/null and b/social_marketing/overview/media/push_to_a_group.png differ
diff --git a/social_marketing/overview/media/website_track_pages.png b/social_marketing/overview/media/website_track_pages.png
new file mode 100644
index 000000000..2d4f674d9
Binary files /dev/null and b/social_marketing/overview/media/website_track_pages.png differ
diff --git a/social_marketing/overview/push_notifications.rst b/social_marketing/overview/push_notifications.rst
new file mode 100644
index 000000000..208c43cb3
--- /dev/null
+++ b/social_marketing/overview/push_notifications.rst
@@ -0,0 +1,67 @@
+==========================
+Use Web Push Notifications
+==========================
+
+Web Push Notifications deliver messages to your user’s device without the need to be on your
+website, or for them to give personal information. They can be used to inform your users about news,
+articles and content posted, practical messages like traffic and weather updates,
+flight information, sales alerts, coupons, and product updates.
+
+Ask users for permission
+========================
+
+In the *Website* application go to :menuselection:`Website --> Configuration --> Settings`
+and enable *Web Push Notifications*.
+
+.. image:: media/enable_push.png
+   :align: center
+   :alt: Go to settings and enable web push notifications for Odoo Social Marketing
+
+Choose your message, icon, and delay time (which is the wait time for the permission request to be
+shown once the user lands on your page).
+
+.. image:: media/push_permission.png
+   :align: center
+   :alt: Request to send messages is being shown on the page for Odoo Social Marketing
+
+Send notifications
+==================
+
+Individually
+------------
+
+You can send individual messages through the menu *Visitors*.
+
+.. image:: media/individually_push.png
+   :align: center
+   :alt: Choose individually to whom send web push notifications in Odoo Social Marketing
+
+To a group
+----------
+
+Target a bigger segment by selecting multiple visitors in the *View List* (e.g.: all visitors that
+visited your Homepage).
+
+.. image:: media/push_to_a_group.png
+   :align: center
+   :alt: Select multiple contacts to send web push notifications in Odoo Social Marketing
+
+.. note::
+   Visitors records are kept under *Visitors* for a week, before getting archived.
+
+By rules
+--------
+
+Or go to :menuselection:`Social Marketing --> Posts --> Create`. Under *Web Notification options*,
+apply filters to send your message to the records that match the rules you set.
+
+.. image:: media/push_rules.png
+   :align: center
+   :alt: Define rules to send push notifications in Odoo Social Marketing
+
+.. note::
+   The feature only works with Odoo Website application.
+
+.. seealso::
+   - :doc:`./manage_social`
+   - :doc:`./campaigns`
diff --git a/social_marketing/social_marketing.rst b/social_marketing/social_marketing.rst
deleted file mode 100644
index 0bdfb0959..000000000
--- a/social_marketing/social_marketing.rst
+++ /dev/null
@@ -1,8 +0,0 @@
-===============
-Advanced Topics
-===============
-
-.. toctree::
-   :titlesonly:
-
-   social_marketing/social_marketing
\ No newline at end of file
diff --git a/social_marketing/social_marketing/media/social_marketing01.png b/social_marketing/social_marketing/media/social_marketing01.png
deleted file mode 100644
index 933f582b2..000000000
Binary files a/social_marketing/social_marketing/media/social_marketing01.png and /dev/null differ
diff --git a/social_marketing/social_marketing/media/social_marketing02.png b/social_marketing/social_marketing/media/social_marketing02.png
deleted file mode 100644
index d4729b984..000000000
Binary files a/social_marketing/social_marketing/media/social_marketing02.png and /dev/null differ
diff --git a/social_marketing/social_marketing/media/social_marketing03.png b/social_marketing/social_marketing/media/social_marketing03.png
deleted file mode 100644
index be1c60f3e..000000000
Binary files a/social_marketing/social_marketing/media/social_marketing03.png and /dev/null differ
diff --git a/social_marketing/social_marketing/media/social_marketing04.png b/social_marketing/social_marketing/media/social_marketing04.png
deleted file mode 100644
index d0c31e794..000000000
Binary files a/social_marketing/social_marketing/media/social_marketing04.png and /dev/null differ
diff --git a/social_marketing/social_marketing/media/social_marketing05.png b/social_marketing/social_marketing/media/social_marketing05.png
deleted file mode 100644
index 18e885ffc..000000000
Binary files a/social_marketing/social_marketing/media/social_marketing05.png and /dev/null differ
diff --git a/social_marketing/social_marketing/social_marketing.rst b/social_marketing/social_marketing/social_marketing.rst
deleted file mode 100644
index 540031ce3..000000000
--- a/social_marketing/social_marketing/social_marketing.rst
+++ /dev/null
@@ -1,110 +0,0 @@
-Social Marketing
-================
-
-One of the biggest challenges of a company is to engage efficiently with
-their community. Odoo Social helps you to meet your audience with the
-help of several supports: social media, push notifications, or live chat
-request.
-
-Add your social media and create your feed
-------------------------------------------
-
-You first need to add your social media accounts. To do that, add a
-Stream and choose your social media account. You’ll need to grant
-permissions to Odoo Social Marketing application.
-
-.. image:: media/social_marketing01.png
-  :align: center
-
-Once it’s done, you’ll be redirected to your Feed and a column will be
-automatically added with the publications of your freshly added
-account. You can then add new streams to your Feed and customize your
-Kanban view as you like.
-
-.. image:: media/social_marketing02.png
-  :align: center
-
-| Adding social media accounts to your Feed will also add some KPIs on
-  it:
-
--  Audience: Number of followers of your channel
-
--  Engagement: Number of times people have engaged with your posts
-
--  Stories: Number of times people who have engaged with your channel
-   have created stories on their friend’s or follower’s feed (Shares, Retweet,..)
-
-You can access more information by clicking on the “Insights” link: this
-will lead you to statistics of the selected social medium.
-
-Publish content
----------------
-
-To publish content on your social media accounts or send a push
-notification to your subscribed users, either go to your Feed and click
-on New Post, or use the “Posts” menu and create it from there. Select
-all the accounts where you want to post your content, write your post
-and get an instant preview of how it will look when published.
-
-If you select the push notifications, you’ll get some additional fields
-on the form that will allow you to complete the push notifications
-configuration and choose your segment between all your subscribed users.
-You can also send push notifications via the Visitors menu, as explained
-in the previous paragraph.
-
-Enable push notifications on your website
------------------------------------------
-
-The push notifications system uses a Firebase account, configured by
-default. This feature allows you to send push notifications to your
-website’s visitors after they subscribed to it. To enable push
-notifications on your website, go to the Website application Settings,
-and configure the notifications permission request.
-
-.. image:: media/social_marketing03.png
-  :align: center
-
-Once it’s done, a popup will appear to your website’s visitors, asking
-them to allow push notifications. As soon as they subscribe to it, you
-can start sending them push notifications through the Visitors menu. You
-can either send it individually or target a bigger segment by selecting
-multiple visitors in the list view (e.g. all the visitors that visited
-your Homepage).
-
-Interact with your online visitors 
------------------------------------
-
-You can monitor your online visits via the Visitors menu. You’ll see
-every visitors that landed on one of your tracked pages (you can
-configure your tracked pages in the Website application), online or
-offline. Your online visitors will be authenticated if they’re linked to
-a lead or an existing partner. You will be able to contact them with an
-email, a message sms, a push notification (if they have subscribed to
-it), or even send them a live chat request that they will receive on
-their next move on one of your tracked pages (if you installed the Live
-Chat application).
-
-.. image:: media/social_marketing04.png
-  :align: center
-
-Configure your own Facebook and Twitter developer accounts
-----------------------------------------------------------
-
-By default, the Social application is already configured with a Facebook
-and Twitter developer accounts but you can use your own if necessary.
-Activate the :doc:`Developer mode <../../general/developer_mode/activate>`, and enter your
-own API keys.
-
-.. image:: media/social_marketing05.png
-  :align: center
-
-Configure your own Firebase API 
--------------------------------
-
-By default, a Firebase project is running on your database so there’s no
-need to configure it. If you have multiple websites, every website will
-be linked to a different Firebase project. If you need to configure your
-own Firebase project, please go to :menuselection:`Website --> Configuration --> Settings` Web Push Notifications section.
-
-
-