diff --git a/accounting/overview/getting_started/media/setup01.png b/accounting/overview/getting_started/media/setup01.png
deleted file mode 100644
index da6fb65d6..000000000
Binary files a/accounting/overview/getting_started/media/setup01.png and /dev/null differ
diff --git a/accounting/overview/getting_started/media/setup02.png b/accounting/overview/getting_started/media/setup02.png
deleted file mode 100644
index 7e2fbf5eb..000000000
Binary files a/accounting/overview/getting_started/media/setup02.png and /dev/null differ
diff --git a/accounting/overview/getting_started/media/setup_accounting_onboarding.png b/accounting/overview/getting_started/media/setup_accounting_onboarding.png
new file mode 100644
index 000000000..73f6b7bcd
Binary files /dev/null and b/accounting/overview/getting_started/media/setup_accounting_onboarding.png differ
diff --git a/accounting/overview/getting_started/media/setup_chart_of_accounts.png b/accounting/overview/getting_started/media/setup_chart_of_accounts.png
new file mode 100644
index 000000000..01a2142f2
Binary files /dev/null and b/accounting/overview/getting_started/media/setup_chart_of_accounts.png differ
diff --git a/accounting/overview/getting_started/media/setup_company.png b/accounting/overview/getting_started/media/setup_company.png
new file mode 100644
index 000000000..8bba880fd
Binary files /dev/null and b/accounting/overview/getting_started/media/setup_company.png differ
diff --git a/accounting/overview/getting_started/media/setup_document_layout.png b/accounting/overview/getting_started/media/setup_document_layout.png
new file mode 100644
index 000000000..6b64d282d
Binary files /dev/null and b/accounting/overview/getting_started/media/setup_document_layout.png differ
diff --git a/accounting/overview/getting_started/media/setup_invoicing_onboarding.png b/accounting/overview/getting_started/media/setup_invoicing_onboarding.png
new file mode 100644
index 000000000..8e48ed250
Binary files /dev/null and b/accounting/overview/getting_started/media/setup_invoicing_onboarding.png differ
diff --git a/accounting/overview/getting_started/setup.rst b/accounting/overview/getting_started/setup.rst
index 72af8c4dc..06558a9df 100644
--- a/accounting/overview/getting_started/setup.rst
+++ b/accounting/overview/getting_started/setup.rst
@@ -1,36 +1,189 @@
-=============================
-How to setup Odoo Accounting?
-=============================
+===================================================
+Initial setup of Odoo Accounting and Odoo Invoicing
+===================================================
-The Odoo Accounting application has an implementation guide that you
-should follow to configure it. It's a step-by-step wizard with links to
-the different screens you will need.
+When you first open your Odoo Accounting app, the *Accounting Overview* page welcomes you with a
+step-by-step onboarding banner, a wizard that helps you get started. This onboarding banner is
+displayed until you choose to close it.
-Once you have `installed the Accounting
-application `__,
-you should click on the top-right progressbar to get access to the
-implementation guide.
+The settings visible in the onboarding banner can still be modified later by going to
+:menuselection:`Accounting --> Configuration --> Settings`.
-.. image:: ./media/setup01.png
+.. note::
+ Odoo Accounting automatically installs the appropriate **Fiscal Localization Package** for your
+ company, according to the country selected at the creation of the database. This way, the right
+ accounts, reports, and taxes are ready-to-go.
+
+Accounting onboarding banner
+============================
+
+The step-by-step Accounting onboarding banner is composed of four steps:
+
+.. image:: media/setup_accounting_onboarding.png
:align: center
+ :alt: Step-by-step onboarding banner in Odoo Accounting
-The implementation guide will help you through the following steps:
+#. :ref:`accounting-setup-company`
+#. :ref:`accounting-setup-bank`
+#. :ref:`accounting-setup-periods`
+#. :ref:`accounting-setup-chart`
-1. Completing your company settings
-2. Entering in your bank accounts
-3. Selecting your chart of accounts
-4. Confirming your usual tax rates
-5. Setting up any foreign currencies
-6. Importing your customers
-7. Importing your suppliers
-8. Importing your products
-9. Importing your outstanding transactions
-10. Importing your starting balances
-11. Define the users for accounting
+.. _accounting-setup-company:
-.. image:: ./media/setup02.png
+Company Data
+------------
+
+This menu allows you to add your company’s details such as the name, address, logo, website, phone
+number, email address, and Tax ID, or VAT number. These details are then displayed on your documents,
+such as on invoices.
+
+.. image:: media/setup_company.png
:align: center
+ :alt: Add your company's details in Odoo Accounting and Odoo Invoicing
-Once a step is done, you can click on the "Mark as Done" button, in the
-bottom of the screen. That way, you can track the progress of your
-overall configuration of Odoo.
+.. note::
+ You can also change these settings by going to :menuselection:`Settings --> General Settings -->
+ Settings --> Companies` and clicking on **Update Info**.
+
+.. _accounting-setup-bank:
+
+Bank Account
+------------
+
+Connect your bank account database to your database, and have your bank statements synced
+automatically. To do so, find your bank on the list, click on *Connect*, and follow the instructions
+on-screen.
+
+.. note::
+ :doc:`Click here <../../bank/feeds/bank_synchronization>` for more information about this feature.
+
+If your bank can’t be synchronized automatically, or if you prefer not to sync your bank account
+with your database, you may also configure your bank account manually by clicking on *Create it*,
+and filling out the form.
+
+- **Name**: the bank account's name, as displayed on Odoo.
+- **Account Number**: your bank account number (IBAN in Europe).
+- **Bank**: click on *Create and Edit* to configure the bank's details. Add the real bank's name
+ and its Identifier Code (BIC or SWIFT).
+- **Code**: this code is your Journal's *Short Code*, as displayed on Odoo. By default, Odoo creates
+ a new Journal with this Short Code.
+- **Journal**: if this field is displayed, then select the *Journal* you want to use to record the
+ financial transactions linked to this bank account, or create a new one by clicking on *Create and
+ Edit*.
+
+.. note::
+ You can add as many bank accounts as needed with this tool by going to :menuselection:`Accounting
+ --> Configuration`, and clicking on *Add a Bank Account*.
+
+.. _accounting-setup-periods:
+
+Accounting Periods
+------------------
+
+Define here your **Fiscal Years**’ opening and closing dates, which are used to generate reports
+automatically, and your **Tax Return Periodicity**, along with a reminder to never miss a tax return
+deadline.
+
+By default, the opening date is set on the 1st of January and the closing date on the 31st of
+December, as this is the most common use.
+
+.. note::
+ You can also change these settings by going to :menuselection:`Accounting --> Configuration -->
+ Settings --> Fiscal Periods` and updating the values.
+
+.. _accounting-setup-chart:
+
+Chart of Accounts
+-----------------
+
+With this menu, you can add accounts to your **Chart of Accounts** and indicate their initial
+opening balances.
+
+Basic settings are displayed on this page to help you review your Chart of Accounts. To access all
+the settings of an account, click on the *double arrow button* at the end of the line.
+
+.. image:: media/setup_chart_of_accounts.png
+ :align: center
+ :alt: Setup of the Chart of Accounts and their opening balances in Odoo Accounting
+
+.. note::
+ :doc:`Click here ` for more information on how to configure your Chart of
+ Accounts.
+
+Invoicing onboarding banner
+===========================
+
+There is another step-by-step onboarding banner that helps you take advantage of your Odoo Invoicing
+and Accounting apps. The *Invoicing onboarding banner* is the one that welcomes you if you use the
+Invoicing app rather than the Accounting app.
+
+If you have Odoo Accounting installed on your database, you can reach it by going to
+:menuselection:`Accounting --> Customers --> Invoices`.
+
+The Invoicing onboarding banner is composed of four main steps:
+
+.. image:: media/setup_invoicing_onboarding.png
+ :align: center
+ :alt: Step-by-step onboarding banner in Odoo Invoicing
+
+#. :ref:`invoicing-setup-company`
+#. :ref:`invoicing-setup-layout`
+#. :ref:`invoicing-setup-payment`
+#. :ref:`invoicing-setup-sample`
+
+.. _invoicing-setup-company:
+
+Company Data
+------------
+
+This form is the same as :ref:`the one presented in the Accounting onboarding banner
+`.
+
+.. _invoicing-setup-layout:
+
+Invoice Layout
+--------------
+
+With this tool, you can design the appearance of your documents by selecting which layout tamplate,
+paper format, colors, font, and logo you want to use.
+
+You can also add your *Company Tagline* and the content of the documents’ *footer*. Note that Odoo
+automatically adds the company's phone number, email, website URL, and Tax ID (or VAT number) to the
+footer, according to the values you previously configured in the :ref:`Company Data
+`.
+
+.. image:: media/setup_document_layout.png
+ :align: center
+ :alt: Document layout configuration in Odoo Invoicing
+
+.. tip::
+ Add your **bank account number** and a link to your **General Terms & Condition** in the footer.
+ This way, your contacts can find the full content of your GT&C online without having to print
+ them on the invoices you issue.
+
+.. note::
+ These settings can also be modified by going to :menuselection:`Settings --> General Settings`,
+ under the *Business Documents* section.
+
+.. _invoicing-setup-payment:
+
+Payment Method
+--------------
+
+This menu helps you configure the payment methods with which your customers can pay you.
+
+.. important::
+ Configuring a *Payment Acquirer* with this tool also activates the *Invoice Online Payment*
+ option automatically. With this, users can directly pay online, from their Customer Portal.
+
+.. _invoicing-setup-sample:
+
+Sample Invoice
+--------------
+
+Send yourself a sample invoice by email to make sure everything is correctly configured.
+
+.. seealso::
+ * :doc:`chart_of_accounts`
+ * :doc:`../../bank/feeds/bank_synchronization`
+ * `Odoo Learn: Accounting Basics `_
\ No newline at end of file