diff --git a/addons/account/views/account_portal_templates.xml b/addons/account/views/account_portal_templates.xml
index 04d4af64930..89f42cb6f7f 100644
--- a/addons/account/views/account_portal_templates.xml
+++ b/addons/account/views/account_portal_templates.xml
@@ -119,7 +119,7 @@
                                 <div class="row">
                                     <div class="col flex-grow-0 pr-2">
                                         <img t-if="invoice.invoice_user_id.image_1024" class="rounded-circle mt-1 o_portal_contact_img" t-att-src="image_data_uri(invoice.invoice_user_id.image_1024)" alt="Contact"/>
-                                        <img t-else="" class="rounded-circle mt-1 o_portal_contact_img" src="/web/static/src/img/user_menu_avatar.png" alt="Contact"/>
+                                        <img t-else="" class="rounded-circle mt-1 o_portal_contact_img" src="/web/static/img/user_menu_avatar.png" alt="Contact"/>
                                     </div>
                                     <div class="col pl-0">
                                         <span t-field="invoice.invoice_user_id" t-options='{"widget": "contact", "fields": ["name", "phone"], "no_marker": True}'/>
diff --git a/addons/crm/models/crm_lead.py b/addons/crm/models/crm_lead.py
index f0687a0dc08..442fb7ecfc8 100644
--- a/addons/crm/models/crm_lead.py
+++ b/addons/crm/models/crm_lead.py
@@ -956,7 +956,7 @@ class Lead(models.Model):
                 'effect': {
                     'fadeout': 'slow',
                     'message': message,
-                    'img_url': '/web/image/%s/%s/image_1024' % (self.team_id.user_id._name, self.team_id.user_id.id) if self.team_id.user_id.image_1024 else '/web/static/src/img/smile.svg',
+                    'img_url': '/web/image/%s/%s/image_1024' % (self.team_id.user_id._name, self.team_id.user_id.id) if self.team_id.user_id.image_1024 else '/web/static/img/smile.svg',
                     'type': 'rainbow_man',
                 }
             }
diff --git a/addons/hw_drivers/views/pos_display.html b/addons/hw_drivers/views/pos_display.html
index 4cd91f68ab4..ee3ce333918 100644
--- a/addons/hw_drivers/views/pos_display.html
+++ b/addons/hw_drivers/views/pos_display.html
@@ -51,7 +51,7 @@
     <body>
         <div class="container-fluid">
             <div class="text-center pt-5">
-                <img style="width: 150px;" src="/web/static/src/img/logo_inverse_white_206px.png">
+                <img style="width: 150px;" src="/web/static/img/logo_inverse_white_206px.png">
                 <p class="mt-3" style="color: #fff;font-size: 30px;">IoTBox</p>
             </div>
             <div class="pos-display-boxes">
diff --git a/addons/hw_posbox_homepage/views/loading.html b/addons/hw_posbox_homepage/views/loading.html
index a4c040fcf2e..7d651464cc7 100644
--- a/addons/hw_posbox_homepage/views/loading.html
+++ b/addons/hw_posbox_homepage/views/loading.html
@@ -2,7 +2,7 @@
 <div class="loading-block o_hide">
     <div class="loading-message-block">
         <div style="height: 50px">
-            <img src="/web/static/src/img/spin.png" style="animation: spin 4s infinite linear;" alt="Loading...">
+            <img src="/web/static/img/spin.png" style="animation: spin 4s infinite linear;" alt="Loading...">
         </div>
         <br>
         <div class="loading-message">
diff --git a/addons/im_livechat/static/src/legacy/public_livechat.scss b/addons/im_livechat/static/src/legacy/public_livechat.scss
index 3710e11be8d..53888a85b01 100644
--- a/addons/im_livechat/static/src/legacy/public_livechat.scss
+++ b/addons/im_livechat/static/src/legacy/public_livechat.scss
@@ -448,7 +448,7 @@ $o-mail-thread-window-zindex: $zindex-modal + 1 !default;
         &.o_neutral_face_icon:before {
             @extend %o-nocontent-init-image;
             @include size(120px, 140px);
-            background: transparent url(/web/static/src/img/neutral_face.svg) no-repeat center;
+            background: transparent url(/web/static/img/neutral_face.svg) no-repeat center;
         }
     }
 
diff --git a/addons/mail/static/src/components/composer/composer.js b/addons/mail/static/src/components/composer/composer.js
index 1dcb263e98a..66194560569 100644
--- a/addons/mail/static/src/components/composer/composer.js
+++ b/addons/mail/static/src/components/composer/composer.js
@@ -135,7 +135,7 @@ class Composer extends Component {
                     id: this.env.messaging.currentUser.id,
                     model: 'res.users',
                 })
-            : '/web/static/src/img/user_menu_avatar.png';
+            : '/web/static/img/user_menu_avatar.png';
         return avatar;
     }
 
diff --git a/addons/mail/static/src/components/message_list/message_list.scss b/addons/mail/static/src/components/message_list/message_list.scss
index f003ef2db25..9da57875ff9 100644
--- a/addons/mail/static/src/components/message_list/message_list.scss
+++ b/addons/mail/static/src/components/message_list/message_list.scss
@@ -89,7 +89,7 @@
     &.o-neutral-face-icon:before {
         @extend %o-nocontent-init-image;
         @include size(120px, 140px);
-        background: transparent url(/web/static/src/img/neutral_face.svg) no-repeat center;
+        background: transparent url(/web/static/img/neutral_face.svg) no-repeat center;
     }
 }
 
diff --git a/addons/mail/static/src/scss/thread.scss b/addons/mail/static/src/scss/thread.scss
index 070adb6d518..1fa2753e6b6 100644
--- a/addons/mail/static/src/scss/thread.scss
+++ b/addons/mail/static/src/scss/thread.scss
@@ -147,7 +147,7 @@
         &.o_neutral_face_icon:before {
             @extend %o-nocontent-init-image;
             @include size(120px, 140px);
-            background: transparent url(/web/static/src/img/neutral_face.svg) no-repeat center;
+            background: transparent url(/web/static/img/neutral_face.svg) no-repeat center;
         }
     }
 
diff --git a/addons/partner_autocomplete/static/tests/partner_autocomplete_tests.js b/addons/partner_autocomplete/static/tests/partner_autocomplete_tests.js
index 7b07bd99455..54a5199facd 100644
--- a/addons/partner_autocomplete/static/tests/partner_autocomplete_tests.js
+++ b/addons/partner_autocomplete/static/tests/partner_autocomplete_tests.js
@@ -207,7 +207,7 @@ odoo.define('partner_autocomplete.tests', function (require) {
                 '<field name="vat"/>' +
                 '</form>',
             mockRPC: function (route) {
-                if (route === "/web/static/src/img/placeholder.png"
+                if (route === "/web/static/img/placeholder.png"
                     || route === "odoo.com/logo.png"
                     || route === "data:image/png;base64,odoobase64") { // land here as it is not valid base64 content
                     return Promise.resolve();
@@ -280,7 +280,7 @@ odoo.define('partner_autocomplete.tests', function (require) {
                 '<field name="vat"/>' +
                 '</form>',
             mockRPC: function (route) {
-                if (route === "/web/static/src/img/placeholder.png"
+                if (route === "/web/static/img/placeholder.png"
                     || route === "odoo.com/logo.png"
                     || route === "data:image/png;base64,odoobase64") { // land here as it is not valid base64 content
                     return Promise.resolve();
diff --git a/addons/payment/static/src/js/post_processing.js b/addons/payment/static/src/js/post_processing.js
index 7f25a91c93e..ccc24e211cc 100644
--- a/addons/payment/static/src/js/post_processing.js
+++ b/addons/payment/static/src/js/post_processing.js
@@ -124,7 +124,7 @@ odoo.define('payment.post_processing', function (require) {
         displayLoading: function () {
             var msg = _t("We are processing your payment, please wait ...");
             $.blockUI({
-                'message': '<h2 class="text-white"><img src="/web/static/src/img/spin.png" class="fa-pulse"/>' +
+                'message': '<h2 class="text-white"><img src="/web/static/img/spin.png" class="fa-pulse"/>' +
                     '    <br />' + msg +
                     '</h2>'
             });
diff --git a/addons/point_of_sale/__manifest__.py b/addons/point_of_sale/__manifest__.py
index 4bf64ba75a0..c869729c02d 100644
--- a/addons/point_of_sale/__manifest__.py
+++ b/addons/point_of_sale/__manifest__.py
@@ -53,7 +53,7 @@
             'point_of_sale/static/tests/tours/**/*',
         ],
         'point_of_sale.assets': [
-            'web/static/src/scss/fonts.scss',
+            'web/static/fonts/fonts.scss',
             'web/static/lib/fontawesome/css/font-awesome.css',
             'point_of_sale/static/src/css/pos.css',
             'point_of_sale/static/src/css/keyboard.css',
diff --git a/addons/point_of_sale/static/src/css/customer_facing_display.css b/addons/point_of_sale/static/src/css/customer_facing_display.css
index 3ca48b211a1..95c1b1c54ac 100644
--- a/addons/point_of_sale/static/src/css/customer_facing_display.css
+++ b/addons/point_of_sale/static/src/css/customer_facing_display.css
@@ -261,7 +261,7 @@ body .pos-customer_facing_display .pos-payment_info .pos-payment_info_details .p
   line-height: 1.3;
 }
 body .pos-customer_facing_display .pos-payment_info .pos-payment_info_details .pos-odoo_logo_container {
-  background-image: url(/web/static/src/img/logo_inverse_white_206px.png);
+  background-image: url(/web/static/img/logo_inverse_white_206px.png);
   background-position: right top;
   background-size: contain;
   background-repeat: no-repeat;
diff --git a/addons/point_of_sale/views/pos_assets_index.xml b/addons/point_of_sale/views/pos_assets_index.xml
index c44ddbc2888..e131c52bfc1 100644
--- a/addons/point_of_sale/views/pos_assets_index.xml
+++ b/addons/point_of_sale/views/pos_assets_index.xml
@@ -23,7 +23,7 @@
 
         <style> body { background: #222; } </style>
 
-        <link rel="shortcut icon" href="/web/static/src/img/favicon.ico" type="image/x-icon"/>
+        <link rel="shortcut icon" href="/web/static/img/favicon.ico" type="image/x-icon"/>
 
         <script type="text/javascript">
             var odoo = <t t-out="json.dumps({
diff --git a/addons/portal/views/portal_templates.xml b/addons/portal/views/portal_templates.xml
index 9ae14030823..1ca10a05b65 100644
--- a/addons/portal/views/portal_templates.xml
+++ b/addons/portal/views/portal_templates.xml
@@ -72,7 +72,7 @@
             <a href="#" role="button" data-toggle="dropdown" t-attf-class="dropdown-toggle #{_link_class}">
                 <t t-if="_avatar">
                     <t t-if="user_id.image_256" t-set="avatar_source" t-value="image_data_uri(user_id.image_256)"/>
-                    <t t-else="" t-set="avatar_source" t-value="'/web/static/src/img/placeholder.png'"/>
+                    <t t-else="" t-set="avatar_source" t-value="'/web/static/img/placeholder.png'"/>
                     <img t-att-src="avatar_source" t-attf-class="rounded-circle #{_avatar_class}" width="24" height="24" alt="" loading="eager"/>
                 </t>
                 <i t-if="_icon" t-attf-class="fa fa-1x fa-fw fa-user-circle-o #{_icon_class}"/>
@@ -203,7 +203,7 @@
                 </div>
                 <t t-if="entries" t-out="entries"/>
                 <div class="card-footer small text-center text-muted border-top-0 pt-1 pb-1 d-none d-lg-block">
-                    Powered by <a target="_blank" href="http://www.odoo.com?utm_source=db&amp;utm_medium=portal" title="odoo"><img src="/web/static/src/img/logo.png" alt="Odoo Logo" height="15"/></a>
+                    Powered by <a target="_blank" href="http://www.odoo.com?utm_source=db&amp;utm_medium=portal" title="odoo"><img src="/web/static/img/logo.png" alt="Odoo Logo" height="15"/></a>
                 </div>
             </div>
         </div>
diff --git a/addons/project/views/project_portal_templates.xml b/addons/project/views/project_portal_templates.xml
index bbe462d8616..1e68a5069fd 100644
--- a/addons/project/views/project_portal_templates.xml
+++ b/addons/project/views/project_portal_templates.xml
@@ -92,7 +92,7 @@
                             <div class="row">
                                 <div class="col flex-grow-0 pr-3">
                                     <img t-if="project.partner_id.image_1024" class="rounded-circle mt-1 o_portal_contact_img" t-att-src="image_data_uri(project.partner_id.image_1024)" alt="Contact"/>
-                                    <img t-else="" class="rounded-circle mt-1 o_portal_contact_img" src="/web/static/src/img/user_menu_avatar.png" alt="Contact"/>
+                                    <img t-else="" class="rounded-circle mt-1 o_portal_contact_img" src="/web/static/img/user_menu_avatar.png" alt="Contact"/>
                                 </div>
                                 <div class="col pl-sm-0">
                                     <address t-field="project.partner_id" t-options='{"widget": "contact", "fields": ["name", "email", "phone"]}'/>
@@ -104,7 +104,7 @@
                             <div class="row">
                                 <div class="col flex-grow-0 pr-3">
                                     <img t-if="project.user_id.image_1024" class="rounded-circle mt-1 o_portal_contact_img" t-att-src="image_data_uri(project.user_id.image_1024)" alt="Contact"/>
-                                    <img t-else="" class="rounded-circle mt-1 o_portal_contact_img" src="/web/static/src/img/user_menu_avatar.png" alt="Contact"/>
+                                    <img t-else="" class="rounded-circle mt-1 o_portal_contact_img" src="/web/static/img/user_menu_avatar.png" alt="Contact"/>
                                 </div>
                                 <div class="col pl-sm-0">
                                     <address t-field="project.user_id" t-options='{"widget": "contact", "fields": ["name", "email", "phone"]}'/>
@@ -213,7 +213,7 @@
                             <div class="row">
                                 <div class="col flex-grow-0 pr-3">
                                     <img t-if="task.user_id.image_1024" class="rounded-circle mt-1 o_portal_contact_img" t-att-src="image_data_uri(task.user_id.image_1024)" alt="Contact"/>
-                                    <img t-else="" class="rounded-circle mt-1 o_portal_contact_img" src="/web/static/src/img/user_menu_avatar.png" alt="Contact"/>
+                                    <img t-else="" class="rounded-circle mt-1 o_portal_contact_img" src="/web/static/img/user_menu_avatar.png" alt="Contact"/>
                                 </div>
                                 <div class="col pl-md-0">
                                     <div t-field="task.user_id" t-options='{"widget": "contact", "fields": ["name", "email", "phone"]}'/>
@@ -225,7 +225,7 @@
                             <div class="row">
                                 <div class="col flex-grow-0 pr-3">
                                     <img t-if="task.partner_id.image_1024" class="rounded-circle mt-1 o_portal_contact_img" t-att-src="image_data_uri(task.partner_id.image_1024)" alt="Contact"/>
-                                    <img t-else="" class="rounded-circle mt-1 o_portal_contact_img" src="/web/static/src/img/user_menu_avatar.png" alt="Contact"/>
+                                    <img t-else="" class="rounded-circle mt-1 o_portal_contact_img" src="/web/static/img/user_menu_avatar.png" alt="Contact"/>
                                 </div>
                                 <div class="col pl-md-0">
                                     <div t-field="task.partner_id" t-options='{"widget": "contact", "fields": ["name", "email", "phone"]}'/>
diff --git a/addons/purchase/views/portal_templates.xml b/addons/purchase/views/portal_templates.xml
index 3e6fa6b060d..6da7bea7f32 100644
--- a/addons/purchase/views/portal_templates.xml
+++ b/addons/purchase/views/portal_templates.xml
@@ -157,7 +157,7 @@
                               <div class="row flex-nowrap">
                                   <div class="col flex-grow-0 pr-2">
                                       <img class="rounded-circle mr4 float-left o_portal_contact_img" t-if="order.user_id.image_1024" t-att-src="image_data_uri(order.user_id.image_1024)" alt="Contact"/>
-                                      <img class="rounded-circle mr4 float-left o_portal_contact_img" t-if="not order.user_id.image_1024" src="/web/static/src/img/placeholder.png" alt="Contact"/>
+                                      <img class="rounded-circle mr4 float-left o_portal_contact_img" t-if="not order.user_id.image_1024" src="/web/static/img/placeholder.png" alt="Contact"/>
                                   </div>
                                   <div class="col pl-0" style="min-width: 150px">
                                       <span t-field="order.user_id" t-options='{"widget": "contact", "fields": ["name", "phone"], "no_marker": True}'/>
diff --git a/addons/sale/views/sale_portal_templates.xml b/addons/sale/views/sale_portal_templates.xml
index 61948dff0c4..118af5f6c2c 100644
--- a/addons/sale/views/sale_portal_templates.xml
+++ b/addons/sale/views/sale_portal_templates.xml
@@ -181,7 +181,7 @@
                                 <div class="row flex-nowrap">
                                     <div class="col flex-grow-0 pr-2">
                                         <img class="rounded-circle mr4 float-left o_portal_contact_img" t-if="sale_order.user_id.image_1024" t-att-src="image_data_uri(sale_order.user_id.image_1024)" alt="Contact"/>
-                                        <img class="rounded-circle mr4 float-left o_portal_contact_img" t-if="not sale_order.user_id.image_1024" src="/web/static/src/img/placeholder.png" alt="Contact"/>
+                                        <img class="rounded-circle mr4 float-left o_portal_contact_img" t-if="not sale_order.user_id.image_1024" src="/web/static/img/placeholder.png" alt="Contact"/>
                                     </div>
                                     <div class="col pl-0" style="min-width: 150px">
                                         <span t-field="sale_order.user_id" t-options='{"widget": "contact", "fields": ["name", "phone"], "no_marker": True}'/>
diff --git a/addons/survey/views/survey_templates_print.xml b/addons/survey/views/survey_templates_print.xml
index ee454154247..eb4bcfa752c 100644
--- a/addons/survey/views/survey_templates_print.xml
+++ b/addons/survey/views/survey_templates_print.xml
@@ -58,7 +58,7 @@
         <html>
             <head>
                 <title t-esc="'%s Preview' % page_title"/>
-                <link rel="shortcut icon" href="/web/static/src/img/favicon.ico" type="image/x-icon"/>
+                <link rel="shortcut icon" href="/web/static/img/favicon.ico" type="image/x-icon"/>
             </head>
             <body style="margin:0;">
                 <iframe type="application/pdf" t-att-src="preview_url" frameBorder="0" width="100%" height="100%"/>
diff --git a/addons/web/__manifest__.py b/addons/web/__manifest__.py
index 1123c6d2114..e0b615e1800 100644
--- a/addons/web/__manifest__.py
+++ b/addons/web/__manifest__.py
@@ -265,7 +265,7 @@ This module provides the core of the Odoo Web Client.
 
             'base/static/src/css/description.css',
             'web/static/lib/fontawesome/css/font-awesome.css',
-            'web/static/src/scss/fonts.scss',
+            'web/static/fonts/fonts.scss',
             'web/static/src/scss/report.scss',
             'web/static/src/scss/layout_standard.scss',
             'web/static/src/scss/layout_background.scss',
@@ -327,7 +327,7 @@ This module provides the core of the Odoo Web Client.
             'web/static/lib/select2/select2.css',
             'web/static/lib/select2-bootstrap-css/select2-bootstrap.css',
             'web/static/lib/tempusdominus/tempusdominus.scss',
-            'web/static/src/scss/fonts.scss',
+            'web/static/fonts/fonts.scss',
             'web/static/src/scss/ui.scss',
             'web/static/src/scss/ui_extra.scss',
             'web/static/src/scss/navbar.scss',
diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index e119a309b19..3f435126821 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -1374,7 +1374,7 @@ class Binary(http.Controller):
 
     @staticmethod
     def placeholder(image='placeholder.png'):
-        image_path = image.lstrip('/').split('/') if '/' in image else ['web', 'static', 'src', 'img', image]
+        image_path = image.lstrip('/').split('/') if '/' in image else ['web', 'static', 'img', image]
         with tools.file_open(get_resource_path(*image_path), 'rb') as fd:
             return fd.read()
 
@@ -1578,7 +1578,7 @@ class Binary(http.Controller):
     def company_logo(self, dbname=None, **kw):
         imgname = 'logo'
         imgext = '.png'
-        placeholder = functools.partial(get_resource_path, 'web', 'static', 'src', 'img')
+        placeholder = functools.partial(get_resource_path, 'web', 'static', 'img')
         uid = None
         if request.session.db:
             dbname = request.session.db
@@ -1640,8 +1640,8 @@ class Binary(http.Controller):
         fonts = []
         if fontname:
             module_path = get_module_path('web')
-            fonts_folder_path = os.path.join(module_path, 'static/src/fonts/sign/')
-            module_resource_path = get_resource_path('web', 'static/src/fonts/sign/' + fontname)
+            fonts_folder_path = os.path.join(module_path, 'static/fonts/sign/')
+            module_resource_path = get_resource_path('web', 'static/fonts/sign/' + fontname)
             if fonts_folder_path and module_resource_path:
                 fonts_folder_path = os.path.join(os.path.normpath(fonts_folder_path), '')
                 module_resource_path = os.path.normpath(module_resource_path)
@@ -1651,7 +1651,7 @@ class Binary(http.Controller):
                         fonts.append(font)
         else:
             current_dir = os.path.dirname(os.path.abspath(__file__))
-            fonts_directory = os.path.join(current_dir, '..', 'static', 'src', 'fonts', 'sign')
+            fonts_directory = os.path.join(current_dir, '..', 'static', 'fonts', 'sign')
             font_filenames = sorted([fn for fn in os.listdir(fonts_directory) if fn.endswith(('.ttf', '.otf', '.woff', '.woff2'))])
 
             for filename in font_filenames:
diff --git a/addons/web/static/src/scss/fonts.scss b/addons/web/static/fonts/fonts.scss
similarity index 98%
rename from addons/web/static/src/scss/fonts.scss
rename to addons/web/static/fonts/fonts.scss
index 26996d89c4c..1abe7d3ac42 100644
--- a/addons/web/static/src/scss/fonts.scss
+++ b/addons/web/static/fonts/fonts.scss
@@ -1,7 +1,7 @@
 // ------------------------------------------------------------------
 // Lato
 // ------------------------------------------------------------------
-$lato-font-path: '../fonts/lato';
+$lato-font-path: './lato';
 
 @mixin lato-font($type, $weight, $style) {
     // Cyrillic: U+0400-04FF, U+0500-052F
@@ -69,7 +69,7 @@ $lato-font-path: '../fonts/lato';
 // ------------------------------------------------------------------
 // Google fonts
 // ------------------------------------------------------------------
-$google-font-path: '../fonts/google';
+$google-font-path: './google';
 
 @mixin google-font($family, $type, $weight, $style) {
     @font-face {
diff --git a/addons/web/static/src/fonts/google/Montserrat/Montserrat-Black.ttf b/addons/web/static/fonts/google/Montserrat/Montserrat-Black.ttf
similarity index 100%
rename from addons/web/static/src/fonts/google/Montserrat/Montserrat-Black.ttf
rename to addons/web/static/fonts/google/Montserrat/Montserrat-Black.ttf
diff --git a/addons/web/static/src/fonts/google/Montserrat/Montserrat-BlackItalic.ttf b/addons/web/static/fonts/google/Montserrat/Montserrat-BlackItalic.ttf
similarity index 100%
rename from addons/web/static/src/fonts/google/Montserrat/Montserrat-BlackItalic.ttf
rename to addons/web/static/fonts/google/Montserrat/Montserrat-BlackItalic.ttf
diff --git a/addons/web/static/src/fonts/google/Montserrat/Montserrat-Bold.ttf b/addons/web/static/fonts/google/Montserrat/Montserrat-Bold.ttf
similarity index 100%
rename from addons/web/static/src/fonts/google/Montserrat/Montserrat-Bold.ttf
rename to addons/web/static/fonts/google/Montserrat/Montserrat-Bold.ttf
diff --git a/addons/web/static/src/fonts/google/Montserrat/Montserrat-BoldItalic.ttf b/addons/web/static/fonts/google/Montserrat/Montserrat-BoldItalic.ttf
similarity index 100%
rename from addons/web/static/src/fonts/google/Montserrat/Montserrat-BoldItalic.ttf
rename to addons/web/static/fonts/google/Montserrat/Montserrat-BoldItalic.ttf
diff --git a/addons/web/static/src/fonts/google/Montserrat/Montserrat-ExtraBold.ttf b/addons/web/static/fonts/google/Montserrat/Montserrat-ExtraBold.ttf
similarity index 100%
rename from addons/web/static/src/fonts/google/Montserrat/Montserrat-ExtraBold.ttf
rename to addons/web/static/fonts/google/Montserrat/Montserrat-ExtraBold.ttf
diff --git a/addons/web/static/src/fonts/google/Montserrat/Montserrat-ExtraBoldItalic.ttf b/addons/web/static/fonts/google/Montserrat/Montserrat-ExtraBoldItalic.ttf
similarity index 100%
rename from addons/web/static/src/fonts/google/Montserrat/Montserrat-ExtraBoldItalic.ttf
rename to addons/web/static/fonts/google/Montserrat/Montserrat-ExtraBoldItalic.ttf
diff --git a/addons/web/static/src/fonts/google/Montserrat/Montserrat-ExtraLight.ttf b/addons/web/static/fonts/google/Montserrat/Montserrat-ExtraLight.ttf
similarity index 100%
rename from addons/web/static/src/fonts/google/Montserrat/Montserrat-ExtraLight.ttf
rename to addons/web/static/fonts/google/Montserrat/Montserrat-ExtraLight.ttf
diff --git a/addons/web/static/src/fonts/google/Montserrat/Montserrat-ExtraLightItalic.ttf b/addons/web/static/fonts/google/Montserrat/Montserrat-ExtraLightItalic.ttf
similarity index 100%
rename from addons/web/static/src/fonts/google/Montserrat/Montserrat-ExtraLightItalic.ttf
rename to addons/web/static/fonts/google/Montserrat/Montserrat-ExtraLightItalic.ttf
diff --git a/addons/web/static/src/fonts/google/Montserrat/Montserrat-Italic.ttf b/addons/web/static/fonts/google/Montserrat/Montserrat-Italic.ttf
similarity index 100%
rename from addons/web/static/src/fonts/google/Montserrat/Montserrat-Italic.ttf
rename to addons/web/static/fonts/google/Montserrat/Montserrat-Italic.ttf
diff --git a/addons/web/static/src/fonts/google/Montserrat/Montserrat-Light.ttf b/addons/web/static/fonts/google/Montserrat/Montserrat-Light.ttf
similarity index 100%
rename from addons/web/static/src/fonts/google/Montserrat/Montserrat-Light.ttf
rename to addons/web/static/fonts/google/Montserrat/Montserrat-Light.ttf
diff --git a/addons/web/static/src/fonts/google/Montserrat/Montserrat-LightItalic.ttf b/addons/web/static/fonts/google/Montserrat/Montserrat-LightItalic.ttf
similarity index 100%
rename from addons/web/static/src/fonts/google/Montserrat/Montserrat-LightItalic.ttf
rename to addons/web/static/fonts/google/Montserrat/Montserrat-LightItalic.ttf
diff --git a/addons/web/static/src/fonts/google/Montserrat/Montserrat-Medium.ttf b/addons/web/static/fonts/google/Montserrat/Montserrat-Medium.ttf
similarity index 100%
rename from addons/web/static/src/fonts/google/Montserrat/Montserrat-Medium.ttf
rename to addons/web/static/fonts/google/Montserrat/Montserrat-Medium.ttf
diff --git a/addons/web/static/src/fonts/google/Montserrat/Montserrat-MediumItalic.ttf b/addons/web/static/fonts/google/Montserrat/Montserrat-MediumItalic.ttf
similarity index 100%
rename from addons/web/static/src/fonts/google/Montserrat/Montserrat-MediumItalic.ttf
rename to addons/web/static/fonts/google/Montserrat/Montserrat-MediumItalic.ttf
diff --git a/addons/web/static/src/fonts/google/Montserrat/Montserrat-Regular.ttf b/addons/web/static/fonts/google/Montserrat/Montserrat-Regular.ttf
similarity index 100%
rename from addons/web/static/src/fonts/google/Montserrat/Montserrat-Regular.ttf
rename to addons/web/static/fonts/google/Montserrat/Montserrat-Regular.ttf
diff --git a/addons/web/static/src/fonts/google/Montserrat/Montserrat-SemiBold.ttf b/addons/web/static/fonts/google/Montserrat/Montserrat-SemiBold.ttf
similarity index 100%
rename from addons/web/static/src/fonts/google/Montserrat/Montserrat-SemiBold.ttf
rename to addons/web/static/fonts/google/Montserrat/Montserrat-SemiBold.ttf
diff --git a/addons/web/static/src/fonts/google/Montserrat/Montserrat-SemiBoldItalic.ttf b/addons/web/static/fonts/google/Montserrat/Montserrat-SemiBoldItalic.ttf
similarity index 100%
rename from addons/web/static/src/fonts/google/Montserrat/Montserrat-SemiBoldItalic.ttf
rename to addons/web/static/fonts/google/Montserrat/Montserrat-SemiBoldItalic.ttf
diff --git a/addons/web/static/src/fonts/google/Montserrat/Montserrat-Thin.ttf b/addons/web/static/fonts/google/Montserrat/Montserrat-Thin.ttf
similarity index 100%
rename from addons/web/static/src/fonts/google/Montserrat/Montserrat-Thin.ttf
rename to addons/web/static/fonts/google/Montserrat/Montserrat-Thin.ttf
diff --git a/addons/web/static/src/fonts/google/Montserrat/Montserrat-ThinItalic.ttf b/addons/web/static/fonts/google/Montserrat/Montserrat-ThinItalic.ttf
similarity index 100%
rename from addons/web/static/src/fonts/google/Montserrat/Montserrat-ThinItalic.ttf
rename to addons/web/static/fonts/google/Montserrat/Montserrat-ThinItalic.ttf
diff --git a/addons/web/static/src/fonts/google/Montserrat/OFL.txt b/addons/web/static/fonts/google/Montserrat/OFL.txt
similarity index 100%
rename from addons/web/static/src/fonts/google/Montserrat/OFL.txt
rename to addons/web/static/fonts/google/Montserrat/OFL.txt
diff --git a/addons/web/static/src/fonts/google/Roboto/LICENSE.txt b/addons/web/static/fonts/google/Open_Sans/LICENSE.txt
similarity index 100%
rename from addons/web/static/src/fonts/google/Roboto/LICENSE.txt
rename to addons/web/static/fonts/google/Open_Sans/LICENSE.txt
diff --git a/addons/web/static/src/fonts/google/Open_Sans/Open_Sans-Bold.ttf b/addons/web/static/fonts/google/Open_Sans/Open_Sans-Bold.ttf
similarity index 100%
rename from addons/web/static/src/fonts/google/Open_Sans/Open_Sans-Bold.ttf
rename to addons/web/static/fonts/google/Open_Sans/Open_Sans-Bold.ttf
diff --git a/addons/web/static/src/fonts/google/Open_Sans/Open_Sans-BoldItalic.ttf b/addons/web/static/fonts/google/Open_Sans/Open_Sans-BoldItalic.ttf
similarity index 100%
rename from addons/web/static/src/fonts/google/Open_Sans/Open_Sans-BoldItalic.ttf
rename to addons/web/static/fonts/google/Open_Sans/Open_Sans-BoldItalic.ttf
diff --git a/addons/web/static/src/fonts/google/Open_Sans/Open_Sans-ExtraBold.ttf b/addons/web/static/fonts/google/Open_Sans/Open_Sans-ExtraBold.ttf
similarity index 100%
rename from addons/web/static/src/fonts/google/Open_Sans/Open_Sans-ExtraBold.ttf
rename to addons/web/static/fonts/google/Open_Sans/Open_Sans-ExtraBold.ttf
diff --git a/addons/web/static/src/fonts/google/Open_Sans/Open_Sans-ExtraBoldItalic.ttf b/addons/web/static/fonts/google/Open_Sans/Open_Sans-ExtraBoldItalic.ttf
similarity index 100%
rename from addons/web/static/src/fonts/google/Open_Sans/Open_Sans-ExtraBoldItalic.ttf
rename to addons/web/static/fonts/google/Open_Sans/Open_Sans-ExtraBoldItalic.ttf
diff --git a/addons/web/static/src/fonts/google/Open_Sans/Open_Sans-Italic.ttf b/addons/web/static/fonts/google/Open_Sans/Open_Sans-Italic.ttf
similarity index 100%
rename from addons/web/static/src/fonts/google/Open_Sans/Open_Sans-Italic.ttf
rename to addons/web/static/fonts/google/Open_Sans/Open_Sans-Italic.ttf
diff --git a/addons/web/static/src/fonts/google/Open_Sans/Open_Sans-Light.ttf b/addons/web/static/fonts/google/Open_Sans/Open_Sans-Light.ttf
similarity index 100%
rename from addons/web/static/src/fonts/google/Open_Sans/Open_Sans-Light.ttf
rename to addons/web/static/fonts/google/Open_Sans/Open_Sans-Light.ttf
diff --git a/addons/web/static/src/fonts/google/Open_Sans/Open_Sans-LightItalic.ttf b/addons/web/static/fonts/google/Open_Sans/Open_Sans-LightItalic.ttf
similarity index 100%
rename from addons/web/static/src/fonts/google/Open_Sans/Open_Sans-LightItalic.ttf
rename to addons/web/static/fonts/google/Open_Sans/Open_Sans-LightItalic.ttf
diff --git a/addons/web/static/src/fonts/google/Open_Sans/Open_Sans-Regular.ttf b/addons/web/static/fonts/google/Open_Sans/Open_Sans-Regular.ttf
similarity index 100%
rename from addons/web/static/src/fonts/google/Open_Sans/Open_Sans-Regular.ttf
rename to addons/web/static/fonts/google/Open_Sans/Open_Sans-Regular.ttf
diff --git a/addons/web/static/src/fonts/google/Open_Sans/Open_Sans-SemiBold.ttf b/addons/web/static/fonts/google/Open_Sans/Open_Sans-SemiBold.ttf
similarity index 100%
rename from addons/web/static/src/fonts/google/Open_Sans/Open_Sans-SemiBold.ttf
rename to addons/web/static/fonts/google/Open_Sans/Open_Sans-SemiBold.ttf
diff --git a/addons/web/static/src/fonts/google/Open_Sans/Open_Sans-SemiBoldItalic.ttf b/addons/web/static/fonts/google/Open_Sans/Open_Sans-SemiBoldItalic.ttf
similarity index 100%
rename from addons/web/static/src/fonts/google/Open_Sans/Open_Sans-SemiBoldItalic.ttf
rename to addons/web/static/fonts/google/Open_Sans/Open_Sans-SemiBoldItalic.ttf
diff --git a/addons/web/static/src/fonts/google/Oswald/OFL.txt b/addons/web/static/fonts/google/Oswald/OFL.txt
similarity index 100%
rename from addons/web/static/src/fonts/google/Oswald/OFL.txt
rename to addons/web/static/fonts/google/Oswald/OFL.txt
diff --git a/addons/web/static/src/fonts/google/Oswald/Oswald-Bold.ttf b/addons/web/static/fonts/google/Oswald/Oswald-Bold.ttf
similarity index 100%
rename from addons/web/static/src/fonts/google/Oswald/Oswald-Bold.ttf
rename to addons/web/static/fonts/google/Oswald/Oswald-Bold.ttf
diff --git a/addons/web/static/src/fonts/google/Oswald/Oswald-ExtraLight.ttf b/addons/web/static/fonts/google/Oswald/Oswald-ExtraLight.ttf
similarity index 100%
rename from addons/web/static/src/fonts/google/Oswald/Oswald-ExtraLight.ttf
rename to addons/web/static/fonts/google/Oswald/Oswald-ExtraLight.ttf
diff --git a/addons/web/static/src/fonts/google/Oswald/Oswald-Light.ttf b/addons/web/static/fonts/google/Oswald/Oswald-Light.ttf
similarity index 100%
rename from addons/web/static/src/fonts/google/Oswald/Oswald-Light.ttf
rename to addons/web/static/fonts/google/Oswald/Oswald-Light.ttf
diff --git a/addons/web/static/src/fonts/google/Oswald/Oswald-Medium.ttf b/addons/web/static/fonts/google/Oswald/Oswald-Medium.ttf
similarity index 100%
rename from addons/web/static/src/fonts/google/Oswald/Oswald-Medium.ttf
rename to addons/web/static/fonts/google/Oswald/Oswald-Medium.ttf
diff --git a/addons/web/static/src/fonts/google/Oswald/Oswald-Regular.ttf b/addons/web/static/fonts/google/Oswald/Oswald-Regular.ttf
similarity index 100%
rename from addons/web/static/src/fonts/google/Oswald/Oswald-Regular.ttf
rename to addons/web/static/fonts/google/Oswald/Oswald-Regular.ttf
diff --git a/addons/web/static/src/fonts/google/Oswald/Oswald-SemiBold.ttf b/addons/web/static/fonts/google/Oswald/Oswald-SemiBold.ttf
similarity index 100%
rename from addons/web/static/src/fonts/google/Oswald/Oswald-SemiBold.ttf
rename to addons/web/static/fonts/google/Oswald/Oswald-SemiBold.ttf
diff --git a/addons/web/static/src/fonts/google/Raleway/OFL.txt b/addons/web/static/fonts/google/Raleway/OFL.txt
similarity index 100%
rename from addons/web/static/src/fonts/google/Raleway/OFL.txt
rename to addons/web/static/fonts/google/Raleway/OFL.txt
diff --git a/addons/web/static/src/fonts/google/Raleway/Raleway-Black.ttf b/addons/web/static/fonts/google/Raleway/Raleway-Black.ttf
similarity index 100%
rename from addons/web/static/src/fonts/google/Raleway/Raleway-Black.ttf
rename to addons/web/static/fonts/google/Raleway/Raleway-Black.ttf
diff --git a/addons/web/static/src/fonts/google/Raleway/Raleway-BlackItalic.ttf b/addons/web/static/fonts/google/Raleway/Raleway-BlackItalic.ttf
similarity index 100%
rename from addons/web/static/src/fonts/google/Raleway/Raleway-BlackItalic.ttf
rename to addons/web/static/fonts/google/Raleway/Raleway-BlackItalic.ttf
diff --git a/addons/web/static/src/fonts/google/Raleway/Raleway-Bold.ttf b/addons/web/static/fonts/google/Raleway/Raleway-Bold.ttf
similarity index 100%
rename from addons/web/static/src/fonts/google/Raleway/Raleway-Bold.ttf
rename to addons/web/static/fonts/google/Raleway/Raleway-Bold.ttf
diff --git a/addons/web/static/src/fonts/google/Raleway/Raleway-BoldItalic.ttf b/addons/web/static/fonts/google/Raleway/Raleway-BoldItalic.ttf
similarity index 100%
rename from addons/web/static/src/fonts/google/Raleway/Raleway-BoldItalic.ttf
rename to addons/web/static/fonts/google/Raleway/Raleway-BoldItalic.ttf
diff --git a/addons/web/static/src/fonts/google/Raleway/Raleway-ExtraBold.ttf b/addons/web/static/fonts/google/Raleway/Raleway-ExtraBold.ttf
similarity index 100%
rename from addons/web/static/src/fonts/google/Raleway/Raleway-ExtraBold.ttf
rename to addons/web/static/fonts/google/Raleway/Raleway-ExtraBold.ttf
diff --git a/addons/web/static/src/fonts/google/Raleway/Raleway-ExtraBoldItalic.ttf b/addons/web/static/fonts/google/Raleway/Raleway-ExtraBoldItalic.ttf
similarity index 100%
rename from addons/web/static/src/fonts/google/Raleway/Raleway-ExtraBoldItalic.ttf
rename to addons/web/static/fonts/google/Raleway/Raleway-ExtraBoldItalic.ttf
diff --git a/addons/web/static/src/fonts/google/Raleway/Raleway-ExtraLight.ttf b/addons/web/static/fonts/google/Raleway/Raleway-ExtraLight.ttf
similarity index 100%
rename from addons/web/static/src/fonts/google/Raleway/Raleway-ExtraLight.ttf
rename to addons/web/static/fonts/google/Raleway/Raleway-ExtraLight.ttf
diff --git a/addons/web/static/src/fonts/google/Raleway/Raleway-ExtraLightItalic.ttf b/addons/web/static/fonts/google/Raleway/Raleway-ExtraLightItalic.ttf
similarity index 100%
rename from addons/web/static/src/fonts/google/Raleway/Raleway-ExtraLightItalic.ttf
rename to addons/web/static/fonts/google/Raleway/Raleway-ExtraLightItalic.ttf
diff --git a/addons/web/static/src/fonts/google/Raleway/Raleway-Italic.ttf b/addons/web/static/fonts/google/Raleway/Raleway-Italic.ttf
similarity index 100%
rename from addons/web/static/src/fonts/google/Raleway/Raleway-Italic.ttf
rename to addons/web/static/fonts/google/Raleway/Raleway-Italic.ttf
diff --git a/addons/web/static/src/fonts/google/Raleway/Raleway-Light.ttf b/addons/web/static/fonts/google/Raleway/Raleway-Light.ttf
similarity index 100%
rename from addons/web/static/src/fonts/google/Raleway/Raleway-Light.ttf
rename to addons/web/static/fonts/google/Raleway/Raleway-Light.ttf
diff --git a/addons/web/static/src/fonts/google/Raleway/Raleway-LightItalic.ttf b/addons/web/static/fonts/google/Raleway/Raleway-LightItalic.ttf
similarity index 100%
rename from addons/web/static/src/fonts/google/Raleway/Raleway-LightItalic.ttf
rename to addons/web/static/fonts/google/Raleway/Raleway-LightItalic.ttf
diff --git a/addons/web/static/src/fonts/google/Raleway/Raleway-Medium.ttf b/addons/web/static/fonts/google/Raleway/Raleway-Medium.ttf
similarity index 100%
rename from addons/web/static/src/fonts/google/Raleway/Raleway-Medium.ttf
rename to addons/web/static/fonts/google/Raleway/Raleway-Medium.ttf
diff --git a/addons/web/static/src/fonts/google/Raleway/Raleway-MediumItalic.ttf b/addons/web/static/fonts/google/Raleway/Raleway-MediumItalic.ttf
similarity index 100%
rename from addons/web/static/src/fonts/google/Raleway/Raleway-MediumItalic.ttf
rename to addons/web/static/fonts/google/Raleway/Raleway-MediumItalic.ttf
diff --git a/addons/web/static/src/fonts/google/Raleway/Raleway-Regular.ttf b/addons/web/static/fonts/google/Raleway/Raleway-Regular.ttf
similarity index 100%
rename from addons/web/static/src/fonts/google/Raleway/Raleway-Regular.ttf
rename to addons/web/static/fonts/google/Raleway/Raleway-Regular.ttf
diff --git a/addons/web/static/src/fonts/google/Raleway/Raleway-SemiBold.ttf b/addons/web/static/fonts/google/Raleway/Raleway-SemiBold.ttf
similarity index 100%
rename from addons/web/static/src/fonts/google/Raleway/Raleway-SemiBold.ttf
rename to addons/web/static/fonts/google/Raleway/Raleway-SemiBold.ttf
diff --git a/addons/web/static/src/fonts/google/Raleway/Raleway-SemiBoldItalic.ttf b/addons/web/static/fonts/google/Raleway/Raleway-SemiBoldItalic.ttf
similarity index 100%
rename from addons/web/static/src/fonts/google/Raleway/Raleway-SemiBoldItalic.ttf
rename to addons/web/static/fonts/google/Raleway/Raleway-SemiBoldItalic.ttf
diff --git a/addons/web/static/src/fonts/google/Raleway/Raleway-Thin.ttf b/addons/web/static/fonts/google/Raleway/Raleway-Thin.ttf
similarity index 100%
rename from addons/web/static/src/fonts/google/Raleway/Raleway-Thin.ttf
rename to addons/web/static/fonts/google/Raleway/Raleway-Thin.ttf
diff --git a/addons/web/static/src/fonts/google/Raleway/Raleway-ThinItalic.ttf b/addons/web/static/fonts/google/Raleway/Raleway-ThinItalic.ttf
similarity index 100%
rename from addons/web/static/src/fonts/google/Raleway/Raleway-ThinItalic.ttf
rename to addons/web/static/fonts/google/Raleway/Raleway-ThinItalic.ttf
diff --git a/addons/web/static/src/fonts/google/Open_Sans/LICENSE.txt b/addons/web/static/fonts/google/Roboto/LICENSE.txt
similarity index 100%
rename from addons/web/static/src/fonts/google/Open_Sans/LICENSE.txt
rename to addons/web/static/fonts/google/Roboto/LICENSE.txt
diff --git a/addons/web/static/src/fonts/google/Roboto/Roboto-Black.ttf b/addons/web/static/fonts/google/Roboto/Roboto-Black.ttf
similarity index 100%
rename from addons/web/static/src/fonts/google/Roboto/Roboto-Black.ttf
rename to addons/web/static/fonts/google/Roboto/Roboto-Black.ttf
diff --git a/addons/web/static/src/fonts/google/Roboto/Roboto-BlackItalic.ttf b/addons/web/static/fonts/google/Roboto/Roboto-BlackItalic.ttf
similarity index 100%
rename from addons/web/static/src/fonts/google/Roboto/Roboto-BlackItalic.ttf
rename to addons/web/static/fonts/google/Roboto/Roboto-BlackItalic.ttf
diff --git a/addons/web/static/src/fonts/google/Roboto/Roboto-Bold.ttf b/addons/web/static/fonts/google/Roboto/Roboto-Bold.ttf
similarity index 100%
rename from addons/web/static/src/fonts/google/Roboto/Roboto-Bold.ttf
rename to addons/web/static/fonts/google/Roboto/Roboto-Bold.ttf
diff --git a/addons/web/static/src/fonts/google/Roboto/Roboto-BoldItalic.ttf b/addons/web/static/fonts/google/Roboto/Roboto-BoldItalic.ttf
similarity index 100%
rename from addons/web/static/src/fonts/google/Roboto/Roboto-BoldItalic.ttf
rename to addons/web/static/fonts/google/Roboto/Roboto-BoldItalic.ttf
diff --git a/addons/web/static/src/fonts/google/Roboto/Roboto-Italic.ttf b/addons/web/static/fonts/google/Roboto/Roboto-Italic.ttf
similarity index 100%
rename from addons/web/static/src/fonts/google/Roboto/Roboto-Italic.ttf
rename to addons/web/static/fonts/google/Roboto/Roboto-Italic.ttf
diff --git a/addons/web/static/src/fonts/google/Roboto/Roboto-Light.ttf b/addons/web/static/fonts/google/Roboto/Roboto-Light.ttf
similarity index 100%
rename from addons/web/static/src/fonts/google/Roboto/Roboto-Light.ttf
rename to addons/web/static/fonts/google/Roboto/Roboto-Light.ttf
diff --git a/addons/web/static/src/fonts/google/Roboto/Roboto-LightItalic.ttf b/addons/web/static/fonts/google/Roboto/Roboto-LightItalic.ttf
similarity index 100%
rename from addons/web/static/src/fonts/google/Roboto/Roboto-LightItalic.ttf
rename to addons/web/static/fonts/google/Roboto/Roboto-LightItalic.ttf
diff --git a/addons/web/static/src/fonts/google/Roboto/Roboto-Medium.ttf b/addons/web/static/fonts/google/Roboto/Roboto-Medium.ttf
similarity index 100%
rename from addons/web/static/src/fonts/google/Roboto/Roboto-Medium.ttf
rename to addons/web/static/fonts/google/Roboto/Roboto-Medium.ttf
diff --git a/addons/web/static/src/fonts/google/Roboto/Roboto-MediumItalic.ttf b/addons/web/static/fonts/google/Roboto/Roboto-MediumItalic.ttf
similarity index 100%
rename from addons/web/static/src/fonts/google/Roboto/Roboto-MediumItalic.ttf
rename to addons/web/static/fonts/google/Roboto/Roboto-MediumItalic.ttf
diff --git a/addons/web/static/src/fonts/google/Roboto/Roboto-Regular.ttf b/addons/web/static/fonts/google/Roboto/Roboto-Regular.ttf
similarity index 100%
rename from addons/web/static/src/fonts/google/Roboto/Roboto-Regular.ttf
rename to addons/web/static/fonts/google/Roboto/Roboto-Regular.ttf
diff --git a/addons/web/static/src/fonts/google/Roboto/Roboto-Thin.ttf b/addons/web/static/fonts/google/Roboto/Roboto-Thin.ttf
similarity index 100%
rename from addons/web/static/src/fonts/google/Roboto/Roboto-Thin.ttf
rename to addons/web/static/fonts/google/Roboto/Roboto-Thin.ttf
diff --git a/addons/web/static/src/fonts/google/Roboto/Roboto-ThinItalic.ttf b/addons/web/static/fonts/google/Roboto/Roboto-ThinItalic.ttf
similarity index 100%
rename from addons/web/static/src/fonts/google/Roboto/Roboto-ThinItalic.ttf
rename to addons/web/static/fonts/google/Roboto/Roboto-ThinItalic.ttf
diff --git a/addons/web/static/src/fonts/google/Roboto/roboto.b64 b/addons/web/static/fonts/google/Roboto/roboto.b64
similarity index 100%
rename from addons/web/static/src/fonts/google/Roboto/roboto.b64
rename to addons/web/static/fonts/google/Roboto/roboto.b64
diff --git a/addons/web/static/src/fonts/lato/Lato-Bla-webfont.eot b/addons/web/static/fonts/lato/Lato-Bla-webfont.eot
similarity index 100%
rename from addons/web/static/src/fonts/lato/Lato-Bla-webfont.eot
rename to addons/web/static/fonts/lato/Lato-Bla-webfont.eot
diff --git a/addons/web/static/src/fonts/lato/Lato-Bla-webfont.svg b/addons/web/static/fonts/lato/Lato-Bla-webfont.svg
similarity index 100%
rename from addons/web/static/src/fonts/lato/Lato-Bla-webfont.svg
rename to addons/web/static/fonts/lato/Lato-Bla-webfont.svg
diff --git a/addons/web/static/src/fonts/lato/Lato-Bla-webfont.ttf b/addons/web/static/fonts/lato/Lato-Bla-webfont.ttf
similarity index 100%
rename from addons/web/static/src/fonts/lato/Lato-Bla-webfont.ttf
rename to addons/web/static/fonts/lato/Lato-Bla-webfont.ttf
diff --git a/addons/web/static/src/fonts/lato/Lato-Bla-webfont.woff b/addons/web/static/fonts/lato/Lato-Bla-webfont.woff
similarity index 100%
rename from addons/web/static/src/fonts/lato/Lato-Bla-webfont.woff
rename to addons/web/static/fonts/lato/Lato-Bla-webfont.woff
diff --git a/addons/web/static/src/fonts/lato/Lato-BlaIta-webfont.eot b/addons/web/static/fonts/lato/Lato-BlaIta-webfont.eot
similarity index 100%
rename from addons/web/static/src/fonts/lato/Lato-BlaIta-webfont.eot
rename to addons/web/static/fonts/lato/Lato-BlaIta-webfont.eot
diff --git a/addons/web/static/src/fonts/lato/Lato-BlaIta-webfont.svg b/addons/web/static/fonts/lato/Lato-BlaIta-webfont.svg
similarity index 100%
rename from addons/web/static/src/fonts/lato/Lato-BlaIta-webfont.svg
rename to addons/web/static/fonts/lato/Lato-BlaIta-webfont.svg
diff --git a/addons/web/static/src/fonts/lato/Lato-BlaIta-webfont.ttf b/addons/web/static/fonts/lato/Lato-BlaIta-webfont.ttf
similarity index 100%
rename from addons/web/static/src/fonts/lato/Lato-BlaIta-webfont.ttf
rename to addons/web/static/fonts/lato/Lato-BlaIta-webfont.ttf
diff --git a/addons/web/static/src/fonts/lato/Lato-BlaIta-webfont.woff b/addons/web/static/fonts/lato/Lato-BlaIta-webfont.woff
similarity index 100%
rename from addons/web/static/src/fonts/lato/Lato-BlaIta-webfont.woff
rename to addons/web/static/fonts/lato/Lato-BlaIta-webfont.woff
diff --git a/addons/web/static/src/fonts/lato/Lato-Bol-webfont.eot b/addons/web/static/fonts/lato/Lato-Bol-webfont.eot
similarity index 100%
rename from addons/web/static/src/fonts/lato/Lato-Bol-webfont.eot
rename to addons/web/static/fonts/lato/Lato-Bol-webfont.eot
diff --git a/addons/web/static/src/fonts/lato/Lato-Bol-webfont.svg b/addons/web/static/fonts/lato/Lato-Bol-webfont.svg
similarity index 100%
rename from addons/web/static/src/fonts/lato/Lato-Bol-webfont.svg
rename to addons/web/static/fonts/lato/Lato-Bol-webfont.svg
diff --git a/addons/web/static/src/fonts/lato/Lato-Bol-webfont.ttf b/addons/web/static/fonts/lato/Lato-Bol-webfont.ttf
similarity index 100%
rename from addons/web/static/src/fonts/lato/Lato-Bol-webfont.ttf
rename to addons/web/static/fonts/lato/Lato-Bol-webfont.ttf
diff --git a/addons/web/static/src/fonts/lato/Lato-Bol-webfont.woff b/addons/web/static/fonts/lato/Lato-Bol-webfont.woff
similarity index 100%
rename from addons/web/static/src/fonts/lato/Lato-Bol-webfont.woff
rename to addons/web/static/fonts/lato/Lato-Bol-webfont.woff
diff --git a/addons/web/static/src/fonts/lato/Lato-BolIta-webfont.eot b/addons/web/static/fonts/lato/Lato-BolIta-webfont.eot
similarity index 100%
rename from addons/web/static/src/fonts/lato/Lato-BolIta-webfont.eot
rename to addons/web/static/fonts/lato/Lato-BolIta-webfont.eot
diff --git a/addons/web/static/src/fonts/lato/Lato-BolIta-webfont.svg b/addons/web/static/fonts/lato/Lato-BolIta-webfont.svg
similarity index 100%
rename from addons/web/static/src/fonts/lato/Lato-BolIta-webfont.svg
rename to addons/web/static/fonts/lato/Lato-BolIta-webfont.svg
diff --git a/addons/web/static/src/fonts/lato/Lato-BolIta-webfont.ttf b/addons/web/static/fonts/lato/Lato-BolIta-webfont.ttf
similarity index 100%
rename from addons/web/static/src/fonts/lato/Lato-BolIta-webfont.ttf
rename to addons/web/static/fonts/lato/Lato-BolIta-webfont.ttf
diff --git a/addons/web/static/src/fonts/lato/Lato-BolIta-webfont.woff b/addons/web/static/fonts/lato/Lato-BolIta-webfont.woff
similarity index 100%
rename from addons/web/static/src/fonts/lato/Lato-BolIta-webfont.woff
rename to addons/web/static/fonts/lato/Lato-BolIta-webfont.woff
diff --git a/addons/web/static/src/fonts/lato/Lato-Hai-webfont.eot b/addons/web/static/fonts/lato/Lato-Hai-webfont.eot
similarity index 100%
rename from addons/web/static/src/fonts/lato/Lato-Hai-webfont.eot
rename to addons/web/static/fonts/lato/Lato-Hai-webfont.eot
diff --git a/addons/web/static/src/fonts/lato/Lato-Hai-webfont.svg b/addons/web/static/fonts/lato/Lato-Hai-webfont.svg
similarity index 100%
rename from addons/web/static/src/fonts/lato/Lato-Hai-webfont.svg
rename to addons/web/static/fonts/lato/Lato-Hai-webfont.svg
diff --git a/addons/web/static/src/fonts/lato/Lato-Hai-webfont.ttf b/addons/web/static/fonts/lato/Lato-Hai-webfont.ttf
similarity index 100%
rename from addons/web/static/src/fonts/lato/Lato-Hai-webfont.ttf
rename to addons/web/static/fonts/lato/Lato-Hai-webfont.ttf
diff --git a/addons/web/static/src/fonts/lato/Lato-Hai-webfont.woff b/addons/web/static/fonts/lato/Lato-Hai-webfont.woff
similarity index 100%
rename from addons/web/static/src/fonts/lato/Lato-Hai-webfont.woff
rename to addons/web/static/fonts/lato/Lato-Hai-webfont.woff
diff --git a/addons/web/static/src/fonts/lato/Lato-HaiIta-webfont.eot b/addons/web/static/fonts/lato/Lato-HaiIta-webfont.eot
similarity index 100%
rename from addons/web/static/src/fonts/lato/Lato-HaiIta-webfont.eot
rename to addons/web/static/fonts/lato/Lato-HaiIta-webfont.eot
diff --git a/addons/web/static/src/fonts/lato/Lato-HaiIta-webfont.svg b/addons/web/static/fonts/lato/Lato-HaiIta-webfont.svg
similarity index 100%
rename from addons/web/static/src/fonts/lato/Lato-HaiIta-webfont.svg
rename to addons/web/static/fonts/lato/Lato-HaiIta-webfont.svg
diff --git a/addons/web/static/src/fonts/lato/Lato-HaiIta-webfont.ttf b/addons/web/static/fonts/lato/Lato-HaiIta-webfont.ttf
similarity index 100%
rename from addons/web/static/src/fonts/lato/Lato-HaiIta-webfont.ttf
rename to addons/web/static/fonts/lato/Lato-HaiIta-webfont.ttf
diff --git a/addons/web/static/src/fonts/lato/Lato-HaiIta-webfont.woff b/addons/web/static/fonts/lato/Lato-HaiIta-webfont.woff
similarity index 100%
rename from addons/web/static/src/fonts/lato/Lato-HaiIta-webfont.woff
rename to addons/web/static/fonts/lato/Lato-HaiIta-webfont.woff
diff --git a/addons/web/static/src/fonts/lato/Lato-Lig-webfont.eot b/addons/web/static/fonts/lato/Lato-Lig-webfont.eot
similarity index 100%
rename from addons/web/static/src/fonts/lato/Lato-Lig-webfont.eot
rename to addons/web/static/fonts/lato/Lato-Lig-webfont.eot
diff --git a/addons/web/static/src/fonts/lato/Lato-Lig-webfont.svg b/addons/web/static/fonts/lato/Lato-Lig-webfont.svg
similarity index 100%
rename from addons/web/static/src/fonts/lato/Lato-Lig-webfont.svg
rename to addons/web/static/fonts/lato/Lato-Lig-webfont.svg
diff --git a/addons/web/static/src/fonts/lato/Lato-Lig-webfont.ttf b/addons/web/static/fonts/lato/Lato-Lig-webfont.ttf
similarity index 100%
rename from addons/web/static/src/fonts/lato/Lato-Lig-webfont.ttf
rename to addons/web/static/fonts/lato/Lato-Lig-webfont.ttf
diff --git a/addons/web/static/src/fonts/lato/Lato-Lig-webfont.woff b/addons/web/static/fonts/lato/Lato-Lig-webfont.woff
similarity index 100%
rename from addons/web/static/src/fonts/lato/Lato-Lig-webfont.woff
rename to addons/web/static/fonts/lato/Lato-Lig-webfont.woff
diff --git a/addons/web/static/src/fonts/lato/Lato-LigIta-webfont.eot b/addons/web/static/fonts/lato/Lato-LigIta-webfont.eot
similarity index 100%
rename from addons/web/static/src/fonts/lato/Lato-LigIta-webfont.eot
rename to addons/web/static/fonts/lato/Lato-LigIta-webfont.eot
diff --git a/addons/web/static/src/fonts/lato/Lato-LigIta-webfont.svg b/addons/web/static/fonts/lato/Lato-LigIta-webfont.svg
similarity index 100%
rename from addons/web/static/src/fonts/lato/Lato-LigIta-webfont.svg
rename to addons/web/static/fonts/lato/Lato-LigIta-webfont.svg
diff --git a/addons/web/static/src/fonts/lato/Lato-LigIta-webfont.ttf b/addons/web/static/fonts/lato/Lato-LigIta-webfont.ttf
similarity index 100%
rename from addons/web/static/src/fonts/lato/Lato-LigIta-webfont.ttf
rename to addons/web/static/fonts/lato/Lato-LigIta-webfont.ttf
diff --git a/addons/web/static/src/fonts/lato/Lato-LigIta-webfont.woff b/addons/web/static/fonts/lato/Lato-LigIta-webfont.woff
similarity index 100%
rename from addons/web/static/src/fonts/lato/Lato-LigIta-webfont.woff
rename to addons/web/static/fonts/lato/Lato-LigIta-webfont.woff
diff --git a/addons/web/static/src/fonts/lato/Lato-Reg-webfont.eot b/addons/web/static/fonts/lato/Lato-Reg-webfont.eot
similarity index 100%
rename from addons/web/static/src/fonts/lato/Lato-Reg-webfont.eot
rename to addons/web/static/fonts/lato/Lato-Reg-webfont.eot
diff --git a/addons/web/static/src/fonts/lato/Lato-Reg-webfont.svg b/addons/web/static/fonts/lato/Lato-Reg-webfont.svg
similarity index 100%
rename from addons/web/static/src/fonts/lato/Lato-Reg-webfont.svg
rename to addons/web/static/fonts/lato/Lato-Reg-webfont.svg
diff --git a/addons/web/static/src/fonts/lato/Lato-Reg-webfont.ttf b/addons/web/static/fonts/lato/Lato-Reg-webfont.ttf
similarity index 100%
rename from addons/web/static/src/fonts/lato/Lato-Reg-webfont.ttf
rename to addons/web/static/fonts/lato/Lato-Reg-webfont.ttf
diff --git a/addons/web/static/src/fonts/lato/Lato-Reg-webfont.woff b/addons/web/static/fonts/lato/Lato-Reg-webfont.woff
similarity index 100%
rename from addons/web/static/src/fonts/lato/Lato-Reg-webfont.woff
rename to addons/web/static/fonts/lato/Lato-Reg-webfont.woff
diff --git a/addons/web/static/src/fonts/lato/Lato-RegIta-webfont.eot b/addons/web/static/fonts/lato/Lato-RegIta-webfont.eot
similarity index 100%
rename from addons/web/static/src/fonts/lato/Lato-RegIta-webfont.eot
rename to addons/web/static/fonts/lato/Lato-RegIta-webfont.eot
diff --git a/addons/web/static/src/fonts/lato/Lato-RegIta-webfont.svg b/addons/web/static/fonts/lato/Lato-RegIta-webfont.svg
similarity index 100%
rename from addons/web/static/src/fonts/lato/Lato-RegIta-webfont.svg
rename to addons/web/static/fonts/lato/Lato-RegIta-webfont.svg
diff --git a/addons/web/static/src/fonts/lato/Lato-RegIta-webfont.ttf b/addons/web/static/fonts/lato/Lato-RegIta-webfont.ttf
similarity index 100%
rename from addons/web/static/src/fonts/lato/Lato-RegIta-webfont.ttf
rename to addons/web/static/fonts/lato/Lato-RegIta-webfont.ttf
diff --git a/addons/web/static/src/fonts/lato/Lato-RegIta-webfont.woff b/addons/web/static/fonts/lato/Lato-RegIta-webfont.woff
similarity index 100%
rename from addons/web/static/src/fonts/lato/Lato-RegIta-webfont.woff
rename to addons/web/static/fonts/lato/Lato-RegIta-webfont.woff
diff --git a/addons/web/static/src/fonts/lato/SIL-Open-Font-License-1.1.txt b/addons/web/static/fonts/lato/SIL-Open-Font-License-1.1.txt
similarity index 100%
rename from addons/web/static/src/fonts/lato/SIL-Open-Font-License-1.1.txt
rename to addons/web/static/fonts/lato/SIL-Open-Font-License-1.1.txt
diff --git a/addons/web/static/src/fonts/mnmliconsv21-webfont.eot b/addons/web/static/fonts/mnmliconsv21-webfont.eot
similarity index 100%
rename from addons/web/static/src/fonts/mnmliconsv21-webfont.eot
rename to addons/web/static/fonts/mnmliconsv21-webfont.eot
diff --git a/addons/web/static/src/fonts/mnmliconsv21-webfont.svg b/addons/web/static/fonts/mnmliconsv21-webfont.svg
similarity index 100%
rename from addons/web/static/src/fonts/mnmliconsv21-webfont.svg
rename to addons/web/static/fonts/mnmliconsv21-webfont.svg
diff --git a/addons/web/static/src/fonts/mnmliconsv21-webfont.ttf b/addons/web/static/fonts/mnmliconsv21-webfont.ttf
similarity index 100%
rename from addons/web/static/src/fonts/mnmliconsv21-webfont.ttf
rename to addons/web/static/fonts/mnmliconsv21-webfont.ttf
diff --git a/addons/web/static/src/fonts/mnmliconsv21-webfont.woff b/addons/web/static/fonts/mnmliconsv21-webfont.woff
similarity index 100%
rename from addons/web/static/src/fonts/mnmliconsv21-webfont.woff
rename to addons/web/static/fonts/mnmliconsv21-webfont.woff
diff --git a/addons/web/static/src/fonts/sign/LaBelleAurore-Regular.ttf b/addons/web/static/fonts/sign/LaBelleAurore-Regular.ttf
similarity index 100%
rename from addons/web/static/src/fonts/sign/LaBelleAurore-Regular.ttf
rename to addons/web/static/fonts/sign/LaBelleAurore-Regular.ttf
diff --git a/addons/web/static/src/fonts/sign/LaBelleAurore-ofl.txt b/addons/web/static/fonts/sign/LaBelleAurore-ofl.txt
similarity index 100%
rename from addons/web/static/src/fonts/sign/LaBelleAurore-ofl.txt
rename to addons/web/static/fonts/sign/LaBelleAurore-ofl.txt
diff --git a/addons/web/static/src/fonts/sign/MarckScript-Regular-ofl.txt b/addons/web/static/fonts/sign/MarckScript-Regular-ofl.txt
similarity index 100%
rename from addons/web/static/src/fonts/sign/MarckScript-Regular-ofl.txt
rename to addons/web/static/fonts/sign/MarckScript-Regular-ofl.txt
diff --git a/addons/web/static/src/fonts/sign/MarckScript-Regular.ttf b/addons/web/static/fonts/sign/MarckScript-Regular.ttf
similarity index 100%
rename from addons/web/static/src/fonts/sign/MarckScript-Regular.ttf
rename to addons/web/static/fonts/sign/MarckScript-Regular.ttf
diff --git a/addons/web/static/src/fonts/sign/NotoSans-Reg.ttf b/addons/web/static/fonts/sign/NotoSans-Reg.ttf
similarity index 100%
rename from addons/web/static/src/fonts/sign/NotoSans-Reg.ttf
rename to addons/web/static/fonts/sign/NotoSans-Reg.ttf
diff --git a/addons/web/static/src/fonts/sign/ReenieBeanie-Regular.ttf b/addons/web/static/fonts/sign/ReenieBeanie-Regular.ttf
similarity index 100%
rename from addons/web/static/src/fonts/sign/ReenieBeanie-Regular.ttf
rename to addons/web/static/fonts/sign/ReenieBeanie-Regular.ttf
diff --git a/addons/web/static/src/fonts/sign/ReenieBeanie-ofl.txt b/addons/web/static/fonts/sign/ReenieBeanie-ofl.txt
similarity index 100%
rename from addons/web/static/src/fonts/sign/ReenieBeanie-ofl.txt
rename to addons/web/static/fonts/sign/ReenieBeanie-ofl.txt
diff --git a/addons/web/static/src/fonts/sign/Rhesmanisa.ttf b/addons/web/static/fonts/sign/Rhesmanisa.ttf
similarity index 100%
rename from addons/web/static/src/fonts/sign/Rhesmanisa.ttf
rename to addons/web/static/fonts/sign/Rhesmanisa.ttf
diff --git a/addons/web/static/src/fonts/sign/ShadowsIntoLight-Regular.ttf b/addons/web/static/fonts/sign/ShadowsIntoLight-Regular.ttf
similarity index 100%
rename from addons/web/static/src/fonts/sign/ShadowsIntoLight-Regular.ttf
rename to addons/web/static/fonts/sign/ShadowsIntoLight-Regular.ttf
diff --git a/addons/web/static/src/fonts/sign/ShadowsIntoLight-ofl.txt b/addons/web/static/fonts/sign/ShadowsIntoLight-ofl.txt
similarity index 100%
rename from addons/web/static/src/fonts/sign/ShadowsIntoLight-ofl.txt
rename to addons/web/static/fonts/sign/ShadowsIntoLight-ofl.txt
diff --git a/addons/web/static/src/fonts/sign/Zeyada-Regular.ttf b/addons/web/static/fonts/sign/Zeyada-Regular.ttf
similarity index 100%
rename from addons/web/static/src/fonts/sign/Zeyada-Regular.ttf
rename to addons/web/static/fonts/sign/Zeyada-Regular.ttf
diff --git a/addons/web/static/src/fonts/sign/Zeyada-ofl.txt b/addons/web/static/fonts/sign/Zeyada-ofl.txt
similarity index 100%
rename from addons/web/static/src/fonts/sign/Zeyada-ofl.txt
rename to addons/web/static/fonts/sign/Zeyada-ofl.txt
diff --git a/addons/web/static/src/fonts/sign/khand.ttf b/addons/web/static/fonts/sign/khand.ttf
similarity index 100%
rename from addons/web/static/src/fonts/sign/khand.ttf
rename to addons/web/static/fonts/sign/khand.ttf
diff --git a/addons/web/static/src/img/empty_folder.svg b/addons/web/static/img/empty_folder.svg
similarity index 100%
rename from addons/web/static/src/img/empty_folder.svg
rename to addons/web/static/img/empty_folder.svg
diff --git a/addons/web/static/src/img/enterprise_upgrade.jpg b/addons/web/static/img/enterprise_upgrade.jpg
similarity index 100%
rename from addons/web/static/src/img/enterprise_upgrade.jpg
rename to addons/web/static/img/enterprise_upgrade.jpg
diff --git a/addons/web/static/src/img/favicon.ico b/addons/web/static/img/favicon.ico
similarity index 100%
rename from addons/web/static/src/img/favicon.ico
rename to addons/web/static/img/favicon.ico
diff --git a/addons/web/static/src/img/form_sheetbg.png b/addons/web/static/img/form_sheetbg.png
similarity index 100%
rename from addons/web/static/src/img/form_sheetbg.png
rename to addons/web/static/img/form_sheetbg.png
diff --git a/addons/web/static/src/img/graph_background.png b/addons/web/static/img/graph_background.png
similarity index 100%
rename from addons/web/static/src/img/graph_background.png
rename to addons/web/static/img/graph_background.png
diff --git a/addons/web/static/src/img/logo.png b/addons/web/static/img/logo.png
similarity index 100%
rename from addons/web/static/src/img/logo.png
rename to addons/web/static/img/logo.png
diff --git a/addons/web/static/src/img/logo2.png b/addons/web/static/img/logo2.png
similarity index 100%
rename from addons/web/static/src/img/logo2.png
rename to addons/web/static/img/logo2.png
diff --git a/addons/web/static/src/img/logo_inverse_white_206px.png b/addons/web/static/img/logo_inverse_white_206px.png
similarity index 100%
rename from addons/web/static/src/img/logo_inverse_white_206px.png
rename to addons/web/static/img/logo_inverse_white_206px.png
diff --git a/addons/web/static/src/img/mimetypes/addresses.svg b/addons/web/static/img/mimetypes/addresses.svg
similarity index 100%
rename from addons/web/static/src/img/mimetypes/addresses.svg
rename to addons/web/static/img/mimetypes/addresses.svg
diff --git a/addons/web/static/src/img/mimetypes/archive.svg b/addons/web/static/img/mimetypes/archive.svg
similarity index 100%
rename from addons/web/static/src/img/mimetypes/archive.svg
rename to addons/web/static/img/mimetypes/archive.svg
diff --git a/addons/web/static/src/img/mimetypes/audio.svg b/addons/web/static/img/mimetypes/audio.svg
similarity index 100%
rename from addons/web/static/src/img/mimetypes/audio.svg
rename to addons/web/static/img/mimetypes/audio.svg
diff --git a/addons/web/static/src/img/mimetypes/binary.svg b/addons/web/static/img/mimetypes/binary.svg
similarity index 100%
rename from addons/web/static/src/img/mimetypes/binary.svg
rename to addons/web/static/img/mimetypes/binary.svg
diff --git a/addons/web/static/src/img/mimetypes/calendar.svg b/addons/web/static/img/mimetypes/calendar.svg
similarity index 100%
rename from addons/web/static/src/img/mimetypes/calendar.svg
rename to addons/web/static/img/mimetypes/calendar.svg
diff --git a/addons/web/static/src/img/mimetypes/certificate.svg b/addons/web/static/img/mimetypes/certificate.svg
similarity index 100%
rename from addons/web/static/src/img/mimetypes/certificate.svg
rename to addons/web/static/img/mimetypes/certificate.svg
diff --git a/addons/web/static/src/img/mimetypes/disk.svg b/addons/web/static/img/mimetypes/disk.svg
similarity index 100%
rename from addons/web/static/src/img/mimetypes/disk.svg
rename to addons/web/static/img/mimetypes/disk.svg
diff --git a/addons/web/static/src/img/mimetypes/document.svg b/addons/web/static/img/mimetypes/document.svg
similarity index 100%
rename from addons/web/static/src/img/mimetypes/document.svg
rename to addons/web/static/img/mimetypes/document.svg
diff --git a/addons/web/static/src/img/mimetypes/font.svg b/addons/web/static/img/mimetypes/font.svg
similarity index 100%
rename from addons/web/static/src/img/mimetypes/font.svg
rename to addons/web/static/img/mimetypes/font.svg
diff --git a/addons/web/static/src/img/mimetypes/image.svg b/addons/web/static/img/mimetypes/image.svg
similarity index 100%
rename from addons/web/static/src/img/mimetypes/image.svg
rename to addons/web/static/img/mimetypes/image.svg
diff --git a/addons/web/static/src/img/mimetypes/javascript.svg b/addons/web/static/img/mimetypes/javascript.svg
similarity index 100%
rename from addons/web/static/src/img/mimetypes/javascript.svg
rename to addons/web/static/img/mimetypes/javascript.svg
diff --git a/addons/web/static/src/img/mimetypes/pdf.svg b/addons/web/static/img/mimetypes/pdf.svg
similarity index 100%
rename from addons/web/static/src/img/mimetypes/pdf.svg
rename to addons/web/static/img/mimetypes/pdf.svg
diff --git a/addons/web/static/src/img/mimetypes/presentation.svg b/addons/web/static/img/mimetypes/presentation.svg
similarity index 100%
rename from addons/web/static/src/img/mimetypes/presentation.svg
rename to addons/web/static/img/mimetypes/presentation.svg
diff --git a/addons/web/static/src/img/mimetypes/print.svg b/addons/web/static/img/mimetypes/print.svg
similarity index 100%
rename from addons/web/static/src/img/mimetypes/print.svg
rename to addons/web/static/img/mimetypes/print.svg
diff --git a/addons/web/static/src/img/mimetypes/script.svg b/addons/web/static/img/mimetypes/script.svg
similarity index 100%
rename from addons/web/static/src/img/mimetypes/script.svg
rename to addons/web/static/img/mimetypes/script.svg
diff --git a/addons/web/static/src/img/mimetypes/spreadsheet.svg b/addons/web/static/img/mimetypes/spreadsheet.svg
similarity index 100%
rename from addons/web/static/src/img/mimetypes/spreadsheet.svg
rename to addons/web/static/img/mimetypes/spreadsheet.svg
diff --git a/addons/web/static/src/img/mimetypes/text.svg b/addons/web/static/img/mimetypes/text.svg
similarity index 100%
rename from addons/web/static/src/img/mimetypes/text.svg
rename to addons/web/static/img/mimetypes/text.svg
diff --git a/addons/web/static/src/img/mimetypes/unknown.svg b/addons/web/static/img/mimetypes/unknown.svg
similarity index 100%
rename from addons/web/static/src/img/mimetypes/unknown.svg
rename to addons/web/static/img/mimetypes/unknown.svg
diff --git a/addons/web/static/src/img/mimetypes/vector.svg b/addons/web/static/img/mimetypes/vector.svg
similarity index 100%
rename from addons/web/static/src/img/mimetypes/vector.svg
rename to addons/web/static/img/mimetypes/vector.svg
diff --git a/addons/web/static/src/img/mimetypes/video.svg b/addons/web/static/img/mimetypes/video.svg
similarity index 100%
rename from addons/web/static/src/img/mimetypes/video.svg
rename to addons/web/static/img/mimetypes/video.svg
diff --git a/addons/web/static/src/img/mimetypes/web_code.svg b/addons/web/static/img/mimetypes/web_code.svg
similarity index 100%
rename from addons/web/static/src/img/mimetypes/web_code.svg
rename to addons/web/static/img/mimetypes/web_code.svg
diff --git a/addons/web/static/src/img/mimetypes/web_style.svg b/addons/web/static/img/mimetypes/web_style.svg
similarity index 100%
rename from addons/web/static/src/img/mimetypes/web_style.svg
rename to addons/web/static/img/mimetypes/web_style.svg
diff --git a/addons/web/static/src/img/neutral_face.svg b/addons/web/static/img/neutral_face.svg
similarity index 100%
rename from addons/web/static/src/img/neutral_face.svg
rename to addons/web/static/img/neutral_face.svg
diff --git a/addons/web/static/src/img/nologo.png b/addons/web/static/img/nologo.png
similarity index 100%
rename from addons/web/static/src/img/nologo.png
rename to addons/web/static/img/nologo.png
diff --git a/addons/web/static/src/img/odoo_logo_tiny.png b/addons/web/static/img/odoo_logo_tiny.png
similarity index 100%
rename from addons/web/static/src/img/odoo_logo_tiny.png
rename to addons/web/static/img/odoo_logo_tiny.png
diff --git a/addons/web/static/src/img/placeholder.png b/addons/web/static/img/placeholder.png
similarity index 100%
rename from addons/web/static/src/img/placeholder.png
rename to addons/web/static/img/placeholder.png
diff --git a/addons/web/static/src/img/sep-a.gif b/addons/web/static/img/sep-a.gif
similarity index 100%
rename from addons/web/static/src/img/sep-a.gif
rename to addons/web/static/img/sep-a.gif
diff --git a/addons/web/static/src/img/smile.svg b/addons/web/static/img/smile.svg
similarity index 100%
rename from addons/web/static/src/img/smile.svg
rename to addons/web/static/img/smile.svg
diff --git a/addons/web/static/src/img/smiling_face.svg b/addons/web/static/img/smiling_face.svg
similarity index 100%
rename from addons/web/static/src/img/smiling_face.svg
rename to addons/web/static/img/smiling_face.svg
diff --git a/addons/web/static/src/img/spin.png b/addons/web/static/img/spin.png
similarity index 100%
rename from addons/web/static/src/img/spin.png
rename to addons/web/static/img/spin.png
diff --git a/addons/web/static/src/img/transparent.png b/addons/web/static/img/transparent.png
similarity index 100%
rename from addons/web/static/src/img/transparent.png
rename to addons/web/static/img/transparent.png
diff --git a/addons/web/static/src/img/user_menu_avatar.png b/addons/web/static/img/user_menu_avatar.png
similarity index 100%
rename from addons/web/static/src/img/user_menu_avatar.png
rename to addons/web/static/img/user_menu_avatar.png
diff --git a/addons/web/static/src/img/user_placeholder.jpg b/addons/web/static/img/user_placeholder.jpg
similarity index 100%
rename from addons/web/static/src/img/user_placeholder.jpg
rename to addons/web/static/img/user_placeholder.jpg
diff --git a/addons/web/static/src/img/accessories-archiver.png b/addons/web/static/src/img/accessories-archiver.png
deleted file mode 100644
index 0d6c249c652..00000000000
Binary files a/addons/web/static/src/img/accessories-archiver.png and /dev/null differ
diff --git a/addons/web/static/src/img/add-shortcut.png b/addons/web/static/src/img/add-shortcut.png
deleted file mode 100644
index 07b8ed40207..00000000000
Binary files a/addons/web/static/src/img/add-shortcut.png and /dev/null differ
diff --git a/addons/web/static/src/img/attachments-close.png b/addons/web/static/src/img/attachments-close.png
deleted file mode 100644
index 2633d7142fe..00000000000
Binary files a/addons/web/static/src/img/attachments-close.png and /dev/null differ
diff --git a/addons/web/static/src/img/back-enable.jpg b/addons/web/static/src/img/back-enable.jpg
deleted file mode 100644
index 79a7098f6da..00000000000
Binary files a/addons/web/static/src/img/back-enable.jpg and /dev/null differ
diff --git a/addons/web/static/src/img/box-a-header-a.gif b/addons/web/static/src/img/box-a-header-a.gif
deleted file mode 100644
index 6b461b42bfe..00000000000
Binary files a/addons/web/static/src/img/box-a-header-a.gif and /dev/null differ
diff --git a/addons/web/static/src/img/collapse.gif b/addons/web/static/src/img/collapse.gif
deleted file mode 100644
index 759e72ebcfe..00000000000
Binary files a/addons/web/static/src/img/collapse.gif and /dev/null differ
diff --git a/addons/web/static/src/img/db.png b/addons/web/static/src/img/db.png
deleted file mode 100644
index d573d1d395b..00000000000
Binary files a/addons/web/static/src/img/db.png and /dev/null differ
diff --git a/addons/web/static/src/img/expand.gif b/addons/web/static/src/img/expand.gif
deleted file mode 100644
index ca98d0b5f2b..00000000000
Binary files a/addons/web/static/src/img/expand.gif and /dev/null differ
diff --git a/addons/web/static/src/img/form_steps.png b/addons/web/static/src/img/form_steps.png
deleted file mode 100644
index 84b1a0a459d..00000000000
Binary files a/addons/web/static/src/img/form_steps.png and /dev/null differ
diff --git a/addons/web/static/src/img/gradientlinebg.gif b/addons/web/static/src/img/gradientlinebg.gif
deleted file mode 100644
index f40bd9c0f6a..00000000000
Binary files a/addons/web/static/src/img/gradientlinebg.gif and /dev/null differ
diff --git a/addons/web/static/src/img/header.gif b/addons/web/static/src/img/header.gif
deleted file mode 100644
index f40bd9c0f6a..00000000000
Binary files a/addons/web/static/src/img/header.gif and /dev/null differ
diff --git a/addons/web/static/src/img/iconset-a-help.gif b/addons/web/static/src/img/iconset-a-help.gif
deleted file mode 100644
index 5400acec57b..00000000000
Binary files a/addons/web/static/src/img/iconset-a-help.gif and /dev/null differ
diff --git a/addons/web/static/src/img/iconset-a-help.png b/addons/web/static/src/img/iconset-a-help.png
deleted file mode 100644
index a9df2902ed3..00000000000
Binary files a/addons/web/static/src/img/iconset-a-help.png and /dev/null differ
diff --git a/addons/web/static/src/img/iconset-b-remove.png b/addons/web/static/src/img/iconset-b-remove.png
deleted file mode 100644
index 48eb9670641..00000000000
Binary files a/addons/web/static/src/img/iconset-b-remove.png and /dev/null differ
diff --git a/addons/web/static/src/img/iconset-d-drop.gif b/addons/web/static/src/img/iconset-d-drop.gif
deleted file mode 100644
index 4907a927619..00000000000
Binary files a/addons/web/static/src/img/iconset-d-drop.gif and /dev/null differ
diff --git a/addons/web/static/src/img/pager_first.png b/addons/web/static/src/img/pager_first.png
deleted file mode 100644
index 8f9005bfe2f..00000000000
Binary files a/addons/web/static/src/img/pager_first.png and /dev/null differ
diff --git a/addons/web/static/src/img/pager_last.png b/addons/web/static/src/img/pager_last.png
deleted file mode 100644
index 582eb9620a1..00000000000
Binary files a/addons/web/static/src/img/pager_last.png and /dev/null differ
diff --git a/addons/web/static/src/img/pager_next.png b/addons/web/static/src/img/pager_next.png
deleted file mode 100644
index 068fa1d980d..00000000000
Binary files a/addons/web/static/src/img/pager_next.png and /dev/null differ
diff --git a/addons/web/static/src/img/pager_previous.png b/addons/web/static/src/img/pager_previous.png
deleted file mode 100644
index 7cd2a0de240..00000000000
Binary files a/addons/web/static/src/img/pager_previous.png and /dev/null differ
diff --git a/addons/web/static/src/img/partner.png b/addons/web/static/src/img/partner.png
deleted file mode 100644
index 74b2414739e..00000000000
Binary files a/addons/web/static/src/img/partner.png and /dev/null differ
diff --git a/addons/web/static/src/img/pencil.gif b/addons/web/static/src/img/pencil.gif
deleted file mode 100644
index 6e9aa5ef659..00000000000
Binary files a/addons/web/static/src/img/pencil.gif and /dev/null differ
diff --git a/addons/web/static/src/img/product.png b/addons/web/static/src/img/product.png
deleted file mode 100644
index 1009191c180..00000000000
Binary files a/addons/web/static/src/img/product.png and /dev/null differ
diff --git a/addons/web/static/src/img/remove-shortcut.png b/addons/web/static/src/img/remove-shortcut.png
deleted file mode 100644
index 9bff03fe584..00000000000
Binary files a/addons/web/static/src/img/remove-shortcut.png and /dev/null differ
diff --git a/addons/web/static/src/img/search_reset.gif b/addons/web/static/src/img/search_reset.gif
deleted file mode 100644
index 9d4253e018b..00000000000
Binary files a/addons/web/static/src/img/search_reset.gif and /dev/null differ
diff --git a/addons/web/static/src/img/smiling_face.png b/addons/web/static/src/img/smiling_face.png
deleted file mode 100644
index ff1e070ff5b..00000000000
Binary files a/addons/web/static/src/img/smiling_face.png and /dev/null differ
diff --git a/addons/web/static/src/img/stock_person.png b/addons/web/static/src/img/stock_person.png
deleted file mode 100644
index 202cf0ee6c5..00000000000
Binary files a/addons/web/static/src/img/stock_person.png and /dev/null differ
diff --git a/addons/web/static/src/img/throbber-large.gif b/addons/web/static/src/img/throbber-large.gif
deleted file mode 100644
index 453b272979d..00000000000
Binary files a/addons/web/static/src/img/throbber-large.gif and /dev/null differ
diff --git a/addons/web/static/src/img/throbber.gif b/addons/web/static/src/img/throbber.gif
deleted file mode 100644
index ded8d36d486..00000000000
Binary files a/addons/web/static/src/img/throbber.gif and /dev/null differ
diff --git a/addons/web/static/src/img/toggle-a-bg.png b/addons/web/static/src/img/toggle-a-bg.png
deleted file mode 100644
index 207a348725b..00000000000
Binary files a/addons/web/static/src/img/toggle-a-bg.png and /dev/null differ
diff --git a/addons/web/static/src/img/ui/field_calendar.png b/addons/web/static/src/img/ui/field_calendar.png
deleted file mode 100644
index 5fdccf561ba..00000000000
Binary files a/addons/web/static/src/img/ui/field_calendar.png and /dev/null differ
diff --git a/addons/web/static/src/img/ui/group-expanded.png b/addons/web/static/src/img/ui/group-expanded.png
deleted file mode 100644
index ca76157826a..00000000000
Binary files a/addons/web/static/src/img/ui/group-expanded.png and /dev/null differ
diff --git a/addons/web/static/src/img/ui/group-folded.png b/addons/web/static/src/img/ui/group-folded.png
deleted file mode 100644
index 5fc4e533d1f..00000000000
Binary files a/addons/web/static/src/img/ui/group-folded.png and /dev/null differ
diff --git a/addons/web/static/src/img/view_empty_arrow.png b/addons/web/static/src/img/view_empty_arrow.png
deleted file mode 100644
index dc2b88a3c82..00000000000
Binary files a/addons/web/static/src/img/view_empty_arrow.png and /dev/null differ
diff --git a/addons/web/static/src/img/views-icons-a.png b/addons/web/static/src/img/views-icons-a.png
deleted file mode 100644
index 0be5b655e66..00000000000
Binary files a/addons/web/static/src/img/views-icons-a.png and /dev/null differ
diff --git a/addons/web/static/src/img/warning.png b/addons/web/static/src/img/warning.png
deleted file mode 100644
index 85c1718e877..00000000000
Binary files a/addons/web/static/src/img/warning.png and /dev/null differ
diff --git a/addons/web/static/src/js/apps.js b/addons/web/static/src/js/apps.js
index 364401d4281..16b3809c579 100644
--- a/addons/web/static/src/js/apps.js
+++ b/addons/web/static/src/js/apps.js
@@ -36,7 +36,7 @@ var Apps = AbstractAction.extend({
                 };
             });
             var ts = new Date().getTime();
-            i.src = _.str.sprintf('%s/web/static/src/img/sep-a.gif?%s', client.origin, ts);
+            i.src = _.str.sprintf('%s/web/static/img/sep-a.gif?%s', client.origin, ts);
             return def;
         };
         if (apps_client) {
diff --git a/addons/web/static/src/js/fields/basic_fields.js b/addons/web/static/src/js/fields/basic_fields.js
index d5fcec21399..b23ae3c4fdf 100644
--- a/addons/web/static/src/js/fields/basic_fields.js
+++ b/addons/web/static/src/js/fields/basic_fields.js
@@ -1953,7 +1953,7 @@ var FieldBinaryImage = AbstractFieldBinary.extend({
     }),
 
     template: 'FieldBinaryImage',
-    placeholder: "/web/static/src/img/placeholder.png",
+    placeholder: "/web/static/img/placeholder.png",
     events: _.extend({}, AbstractFieldBinary.prototype.events, {
         'click img': function () {
             if (this.mode === "readonly") {
@@ -2096,7 +2096,7 @@ var CharImageUrl = AbstractField.extend({
     className: 'o_field_image',
     description: _lt("Image"),
     supportedFieldTypes: ['char'],
-    placeholder: "/web/static/src/img/placeholder.png",
+    placeholder: "/web/static/img/placeholder.png",
 
     _renderReadonly: function () {
         var self = this;
diff --git a/addons/web/static/src/js/widgets/rainbow_man.js b/addons/web/static/src/js/widgets/rainbow_man.js
index f8b106445fa..ebf82e4ef63 100644
--- a/addons/web/static/src/js/widgets/rainbow_man.js
+++ b/addons/web/static/src/js/widgets/rainbow_man.js
@@ -33,7 +33,7 @@ var RainbowMan = Widget.extend({
         var rainbowDelay = {very_slow:8500, slow: 4500, medium: 3500, fast: 2000, no: false};
         this.options = _.defaults(options || {}, {
             fadeout: 'medium',
-            img_url: '/web/static/src/img/smile.svg',
+            img_url: '/web/static/img/smile.svg',
             message: _t('Well Done!'),
         });
         this.delay = rainbowDelay[this.options.fadeout];
diff --git a/addons/web/static/src/scss/form_view_extra.scss b/addons/web/static/src/scss/form_view_extra.scss
index 4260cf6a40f..1cf5a5db257 100644
--- a/addons/web/static/src/scss/form_view_extra.scss
+++ b/addons/web/static/src/scss/form_view_extra.scss
@@ -9,7 +9,7 @@ $o-td-label-padding-right: 8px;
     }
     .o_form_sheet_bg {
         border-bottom: 1px solid #ddd;
-        background: url(/web/static/src/img/form_sheetbg.png);
+        background: url(/web/static/img/form_sheetbg.png);
 
         > .o_form_sheet {
             min-width: $sheet-min-width;
diff --git a/addons/web/static/src/scss/mimetypes.scss b/addons/web/static/src/scss/mimetypes.scss
index 678116e12ab..10ad2fbc4a7 100644
--- a/addons/web/static/src/scss/mimetypes.scss
+++ b/addons/web/static/src/scss/mimetypes.scss
@@ -2,72 +2,72 @@
     display: inline-block;
     width: 38px;
     height: 38px;
-    background-image: url('/web/static/src/img/mimetypes/unknown.svg');
+    background-image: url('/web/static/img/mimetypes/unknown.svg');
     background-size: contain;
     background-repeat: no-repeat;
     background-position: center;
 
     &[data-mimetype^='image'] {
-        background-image: url('/web/static/src/img/mimetypes/image.svg');
+        background-image: url('/web/static/img/mimetypes/image.svg');
     }
     &[data-mimetype^='audio'] {
-        background-image: url('/web/static/src/img/mimetypes/audio.svg');
+        background-image: url('/web/static/img/mimetypes/audio.svg');
     }
     &[data-mimetype^='text'], &[data-mimetype$='rtf'] {
-        background-image: url('/web/static/src/img/mimetypes/text.svg');
+        background-image: url('/web/static/img/mimetypes/text.svg');
     }
     &[data-mimetype*='octet-stream'], &[data-mimetype*='download'], &[data-mimetype*='python'] {
-        background-image: url('/web/static/src/img/mimetypes/binary.svg');
+        background-image: url('/web/static/img/mimetypes/binary.svg');
     }
     &[data-mimetype^='video'], &[title$='.mp4'], &[title$='.avi'] {
-        background-image: url('/web/static/src/img/mimetypes/video.svg');
+        background-image: url('/web/static/img/mimetypes/video.svg');
     }
     &[data-mimetype$='archive'], &[data-mimetype$='compressed'], &[data-mimetype*='zip'], &[data-mimetype$='tar'], &[data-mimetype*='package'] {
-        background-image: url('/web/static/src/img/mimetypes/archive.svg');
+        background-image: url('/web/static/img/mimetypes/archive.svg');
     }
     &[data-mimetype='application/pdf'] {
-        background-image: url('/web/static/src/img/mimetypes/pdf.svg');
+        background-image: url('/web/static/img/mimetypes/pdf.svg');
     }
     &[data-mimetype^='text-master'], &[data-mimetype*='document'], &[data-mimetype*='msword'], &[data-mimetype*='wordprocessing'] {
-        background-image: url('/web/static/src/img/mimetypes/document.svg');
+        background-image: url('/web/static/img/mimetypes/document.svg');
     }
     &[data-mimetype*='application/xml'], &[data-mimetype$='html'] {
-        background-image: url('/web/static/src/img/mimetypes/web_code.svg');
+        background-image: url('/web/static/img/mimetypes/web_code.svg');
     }
     &[data-mimetype$='css'], &[data-mimetype$='less'], &[data-ext$='less'] {
-        background-image: url('/web/static/src/img/mimetypes/web_style.svg');
+        background-image: url('/web/static/img/mimetypes/web_style.svg');
     }
     &[data-mimetype*='-image'], &[data-mimetype*='diskimage'], &[data-ext$='dmg'] {
-        background-image: url('/web/static/src/img/mimetypes/disk.svg');
+        background-image: url('/web/static/img/mimetypes/disk.svg');
     }
     &[data-mimetype$='csv'], &[data-mimetype*='vc'], &[data-mimetype*='excel'], &[data-mimetype$='numbers'], &[data-mimetype$='calc'], &[data-mimetype*='mods'], &[data-mimetype*='spreadsheet'] {
-        background-image: url('/web/static/src/img/mimetypes/spreadsheet.svg');
+        background-image: url('/web/static/img/mimetypes/spreadsheet.svg');
     }
     &[data-mimetype^='key'] {
-        background-image: url('/web/static/src/img/mimetypes/certificate.svg');
+        background-image: url('/web/static/img/mimetypes/certificate.svg');
     }
     &[data-mimetype*='presentation'], &[data-mimetype*='keynote'], &[data-mimetype*='teacher'], &[data-mimetype*='slideshow'], &[data-mimetype*='powerpoint'] {
-        background-image: url('/web/static/src/img/mimetypes/presentation.svg');
+        background-image: url('/web/static/img/mimetypes/presentation.svg');
     }
     &[data-mimetype*='cert'], &[data-mimetype*='rules'], &[data-mimetype*='pkcs'], &[data-mimetype$='stl'], &[data-mimetype$='crl'] {
-        background-image: url('/web/static/src/img/mimetypes/certificate.svg');
+        background-image: url('/web/static/img/mimetypes/certificate.svg');
     }
     &[data-mimetype*='-font'], &[data-mimetype*='font-'], &[data-ext$='ttf'] {
-        background-image: url('/web/static/src/img/mimetypes/font.svg');
+        background-image: url('/web/static/img/mimetypes/font.svg');
     }
     &[data-mimetype*='-dvi'] {
-        background-image: url('/web/static/src/img/mimetypes/print.svg');
+        background-image: url('/web/static/img/mimetypes/print.svg');
     }
     &[data-mimetype*='script'], &[data-mimetype*='x-sh'], &[data-ext*='bat'], &[data-mimetype$='bat'], &[data-mimetype$='cgi'], &[data-mimetype$='-c'], &[data-mimetype*='java'], &[data-mimetype*='ruby'] {
-        background-image: url('/web/static/src/img/mimetypes/script.svg');
+        background-image: url('/web/static/img/mimetypes/script.svg');
     }
     &[data-mimetype*='javascript'] {
-        background-image: url('/web/static/src/img/mimetypes/javascript.svg');
+        background-image: url('/web/static/img/mimetypes/javascript.svg');
     }
     &[data-mimetype*='calendar'], &[data-mimetype$='ldif'] {
-        background-image: url('/web/static/src/img/mimetypes/calendar.svg');
+        background-image: url('/web/static/img/mimetypes/calendar.svg');
     }
     &[data-mimetype$='postscript'], &[data-mimetype$='cdr'], &[data-mimetype$='xara'], &[data-mimetype$='cgm'], &[data-mimetype$='graphics'], &[data-mimetype$='draw'], &[data-mimetype*='svg'] {
-        background-image: url('/web/static/src/img/mimetypes/vector.svg');
+        background-image: url('/web/static/img/mimetypes/vector.svg');
     }
 }
diff --git a/addons/web/static/src/scss/utils.scss b/addons/web/static/src/scss/utils.scss
index 0fcca801719..bc1d814b26f 100644
--- a/addons/web/static/src/scss/utils.scss
+++ b/addons/web/static/src/scss/utils.scss
@@ -110,7 +110,7 @@
         content: "";
         @include o-position-absolute(0, 0, 0, 0);
         z-index: -1;
-        background-image: url('/web/static/src/img/transparent.png');
+        background-image: url('/web/static/img/transparent.png');
         background-size: 10px auto;
         border-radius: inherit;
     }
@@ -433,5 +433,5 @@
     @include size(120px, 80px);
     margin-top: 30px;
     margin-bottom: 30px;
-    background: transparent url(/web/static/src/img/empty_folder.svg) no-repeat center;
+    background: transparent url(/web/static/img/empty_folder.svg) no-repeat center;
 }
diff --git a/addons/web/static/src/scss/views.scss b/addons/web/static/src/scss/views.scss
index bbf80732b6e..230274f8097 100644
--- a/addons/web/static/src/scss/views.scss
+++ b/addons/web/static/src/scss/views.scss
@@ -50,13 +50,13 @@
         .o_view_nocontent_smiling_face:before {
             @extend %o-nocontent-init-image;
             @include size(120px, 140px);
-            background: transparent url(/web/static/src/img/smiling_face.svg) no-repeat center;
+            background: transparent url(/web/static/img/smiling_face.svg) no-repeat center;
         }
 
         .o_view_nocontent_neutral_face:before {
             @extend %o-nocontent-init-image;
             @include size(120px, 140px);
-            background: transparent url(/web/static/src/img/neutral_face.svg) no-repeat center;
+            background: transparent url(/web/static/img/neutral_face.svg) no-repeat center;
         }
 
         .o_view_nocontent_empty_folder:before {
@@ -68,7 +68,7 @@
             margin-left: -$grid-gutter-width/2;
             margin-top: -$grid-gutter-width/2;
             padding: 100px 0 0 137px;
-            background: transparent url(/web/static/src/img/graph_background.png) no-repeat 0 0;
+            background: transparent url(/web/static/img/graph_background.png) no-repeat 0 0;
         }
     }
 }
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index c3655c8d47c..80a357c771c 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1647,7 +1647,7 @@
 <t t-name="Throbber">
     <div>
         <div class="oe_blockui_spin" style="height: 50px">
-            <img src="/web/static/src/img/spin.png" style="animation: fa-spin 1s infinite steps(12);" alt="Loading..."/>
+            <img src="/web/static/img/spin.png" style="animation: fa-spin 1s infinite steps(12);" alt="Loading..."/>
         </div>
         <br />
         <div class="oe_throbber_message" style="color:white"></div>
@@ -1708,7 +1708,7 @@
 <t t-name="UserMenu">
     <li class="o_user_menu">
         <a role="button" class="dropdown-toggle o-no-caret" data-toggle="dropdown" data-display="static" aria-expanded="false" href="#">
-            <img class="rounded-circle oe_topbar_avatar" t-att-src="_s + '/web/static/src/img/user_menu_avatar.png'" alt="User"/>
+            <img class="rounded-circle oe_topbar_avatar" t-att-src="_s + '/web/static/img/user_menu_avatar.png'" alt="User"/>
             <span class="oe_topbar_name"/>
         </a>
         <div class="dropdown-menu dropdown-menu-right" role="menu">
@@ -1780,7 +1780,7 @@
             </ul>
         </div>
         <div class="col-6">
-            <img class="img-fluid" t-att-src='_s + "/web/static/src/img/enterprise_upgrade.jpg"' draggable="false" alt="Upgrade to enterprise"/>
+            <img class="img-fluid" t-att-src='_s + "/web/static/img/enterprise_upgrade.jpg"' draggable="false" alt="Upgrade to enterprise"/>
         </div>
     </div>
 </t>
diff --git a/addons/web/static/tests/fields/basic_fields_tests.js b/addons/web/static/tests/fields/basic_fields_tests.js
index 125ab7f4d9c..eb6af34e037 100644
--- a/addons/web/static/tests/fields/basic_fields_tests.js
+++ b/addons/web/static/tests/fields/basic_fields_tests.js
@@ -2917,7 +2917,7 @@ QUnit.module('basic_fields', {
             res_id: 1,
             async mockRPC(route, args) {
                 const _super = this._super;
-                if (route === '/web/static/src/img/placeholder.png') {
+                if (route === '/web/static/img/placeholder.png') {
                     assert.step('call placeholder route');
                 }
                 return _super.apply(this, arguments);
diff --git a/addons/web/views/database_manager.html b/addons/web/views/database_manager.html
index adfd3efbe1e..3a8b82b2cd0 100644
--- a/addons/web/views/database_manager.html
+++ b/addons/web/views/database_manager.html
@@ -3,7 +3,7 @@
     <head>
         <meta http-equiv="content-type" content="text/html; charset=utf-8">
         <title>Odoo</title>
-        <link rel="shortcut icon" href="/web/static/src/img/favicon.ico" type="image/x-icon">
+        <link rel="shortcut icon" href="/web/static/img/favicon.ico" type="image/x-icon">
 
         <link rel="stylesheet" href="/web/static/lib/fontawesome/css/font-awesome.css">
         <link rel="stylesheet" href="/web/static/lib/bootstrap/css/bootstrap.css">
@@ -175,7 +175,7 @@
             <!-- Database List -->
             <div class="row">
                 <div class="col-lg-6 offset-lg-3 o_database_list">
-                    <img src="/web/static/src/img/logo2.png" class="img-fluid d-block mx-auto"/>
+                    <img src="/web/static/img/logo2.png" class="img-fluid d-block mx-auto"/>
                     {% if not list_db %}
                         <div class="alert alert-danger text-center">The database manager has been disabled by the administrator</div>
                     {% elif insecure and databases %}
diff --git a/addons/web/views/webclient_templates.xml b/addons/web/views/webclient_templates.xml
index 615884c5697..bfa2db4b417 100644
--- a/addons/web/views/webclient_templates.xml
+++ b/addons/web/views/webclient_templates.xml
@@ -13,7 +13,7 @@
                 <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
 
                 <title t-esc="title or 'Odoo'"/>
-                <link type="image/x-icon" rel="shortcut icon" t-att-href="x_icon or '/web/static/src/img/favicon.ico'"/>
+                <link type="image/x-icon" rel="shortcut icon" t-att-href="x_icon or '/web/static/img/favicon.ico'"/>
 
                 <script id="web.layout.odooscript" type="text/javascript">
                     var odoo = {
@@ -89,7 +89,7 @@
                 t-attf-href="http://www.odoo.com?utm_source=db&amp;utm_medium=#{_utm_medium}"
                 class="badge badge-light">
                 <img alt="Odoo"
-                        src="/web/static/src/img/odoo_logo_tiny.png"
+                        src="/web/static/img/odoo_logo_tiny.png"
                         style="height: 1em; vertical-align: baseline;"/>
             </a>
         </t>
diff --git a/addons/website/models/website.py b/addons/website/models/website.py
index 588a775cbe6..266367b8ddc 100644
--- a/addons/website/models/website.py
+++ b/addons/website/models/website.py
@@ -123,7 +123,7 @@ class Website(models.Model):
     robots_txt = fields.Html('Robots.txt', translate=False, groups='website.group_website_designer', sanitize=False)
 
     def _default_favicon(self):
-        img_path = get_resource_path('web', 'static/src/img/favicon.ico')
+        img_path = get_resource_path('web', 'static/img/favicon.ico')
         with tools.file_open(img_path, 'rb') as f:
             return base64.b64encode(f.read())
 
diff --git a/addons/website_event_meet_quiz/views/event_meet_templates.xml b/addons/website_event_meet_quiz/views/event_meet_templates.xml
index eed65d3bf70..a2d0dbbaec4 100644
--- a/addons/website_event_meet_quiz/views/event_meet_templates.xml
+++ b/addons/website_event_meet_quiz/views/event_meet_templates.xml
@@ -22,7 +22,7 @@
                 <b class="mr-2 text-muted" t-esc="visitor['position']"/>
                 <img class="rounded-circle float-left"
                     style="width: 32px; height: 32px; object-fit: cover;"
-                    t-att-src="image_data_uri(visitor['visitor'].partner_image) if visitor['visitor'].partner_image else '/web/static/src/img/user_placeholder.jpg'"
+                    t-att-src="image_data_uri(visitor['visitor'].partner_image) if visitor['visitor'].partner_image else '/web/static/img/user_placeholder.jpg'"
                     t-att-alt="visitor['visitor'].display_name"/>
                 <div class="o_we_leaderboard_name">
                     <span t-if="visitor['visitor'] == current_visitor and not visitor['visitor'].name" class="font-weight-bold">You</span>
diff --git a/addons/website_event_track_quiz/views/event_leaderboard_templates.xml b/addons/website_event_track_quiz/views/event_leaderboard_templates.xml
index 0b7229b5fe2..55b6cd2331e 100644
--- a/addons/website_event_track_quiz/views/event_leaderboard_templates.xml
+++ b/addons/website_event_track_quiz/views/event_leaderboard_templates.xml
@@ -58,7 +58,7 @@
             <div class="d-inline-block position-relative">
                 <img class="rounded-circle img-fluid"
                     style="width: 128px; height: 128px; object-fit: cover;"
-                    t-att-src="image_data_uri(visitor['visitor'].partner_image) if visitor['visitor'].partner_image else '/web/static/src/img/user_placeholder.jpg'"/>
+                    t-att-src="image_data_uri(visitor['visitor'].partner_image) if visitor['visitor'].partner_image else '/web/static/img/user_placeholder.jpg'"/>
                 <img class="position-absolute" t-attf-src="/website_profile/static/src/img/rank_#{visitor['position']}.svg" alt="User rank" style="bottom: 0; right: -10px"/>
             </div>
             <h3 t-if="visitor['visitor'] == current_visitor and not visitor['visitor'].name" class="mt-2 mb-0">You</h3>
@@ -78,7 +78,7 @@
         <img class="o_object_fit_cover rounded-circle o_wprofile_img_small"
         width="30"
         height="30"
-        t-att-src="image_data_uri(visitor['visitor'].partner_image) if visitor['visitor'].partner_image else '/web/static/src/img/user_placeholder.jpg'"/>
+        t-att-src="image_data_uri(visitor['visitor'].partner_image) if visitor['visitor'].partner_image else '/web/static/img/user_placeholder.jpg'"/>
     </td>
     <td class="align-middle w-md-75">
         <span t-if="visitor['visitor'] == current_visitor and not visitor['visitor'].name" class="font-weight-bold">You</span>
diff --git a/addons/website_livechat/views/website_livechat.xml b/addons/website_livechat/views/website_livechat.xml
index 70b7c77f652..f28618c1e0b 100644
--- a/addons/website_livechat/views/website_livechat.xml
+++ b/addons/website_livechat/views/website_livechat.xml
@@ -160,7 +160,7 @@
                                     <t t-foreach="channels" t-as="channel">
                                         <div t-attf-class="media#{' mt-3' if channel_index else ''}">
                                             <a t-attf-href="/livechat/channel/#{ slug(channel)}">
-                                                <img t-att-src="channel.image_128 and image_data_uri(channel.image_128) or '/web/static/src/img/placeholder.png'" t-att-alt="channel.name" class="o_image_64_cover"/>
+                                                <img t-att-src="channel.image_128 and image_data_uri(channel.image_128) or '/web/static/img/placeholder.png'" t-att-alt="channel.name" class="o_image_64_cover"/>
                                             </a>
                                             <div class="media-body h-100 my-auto">
                                                 <h4><t t-esc="channel.name"/></h4>
diff --git a/addons/website_profile/controllers/main.py b/addons/website_profile/controllers/main.py
index 6ad68d1b779..59028af3a63 100644
--- a/addons/website_profile/controllers/main.py
+++ b/addons/website_profile/controllers/main.py
@@ -36,7 +36,7 @@ class WebsiteProfile(http.Controller):
         return False
 
     def _get_default_avatar(self):
-        img_path = modules.get_module_resource('web', 'static/src/img', 'placeholder.png')
+        img_path = modules.get_module_resource('web', 'static/img', 'placeholder.png')
         with open(img_path, 'rb') as f:
             return base64.b64encode(f.read())
 
diff --git a/addons/website_profile/static/src/js/website_profile.js b/addons/website_profile/static/src/js/website_profile.js
index 62a507b63fd..b28dda0b3ca 100644
--- a/addons/website_profile/static/src/js/website_profile.js
+++ b/addons/website_profile/static/src/js/website_profile.js
@@ -107,7 +107,7 @@ publicWidget.registry.websiteProfileEditor = publicWidget.Widget.extend({
      */
     _onProfilePicClearClick: function (ev) {
         var $form = $(ev.currentTarget).closest('form');
-        $form.find('.o_forum_avatar_img').attr('src', '/web/static/src/img/placeholder.png');
+        $form.find('.o_forum_avatar_img').attr('src', '/web/static/img/placeholder.png');
         $form.append($('<input/>', {
             name: 'clear_image',
             id: 'forum_clear_image',
diff --git a/debian/copyright b/debian/copyright
index 97fba38cd89..f96573d186d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -378,27 +378,27 @@ Files: addons/web/static/lib/fontawesome/css/font-awesome.css
 Copyright: Dave Gandy
 License: MIT
 
-Files: addons/web/static/src/fonts/google/Montserrat/*
+Files: addons/web/static/fonts/google/Montserrat/*
 Copyright: 2011 The Montserrat Project Authors
 License: SIL-Open-Font-License
 
-Files: addons/web/static/src/fonts/google/Open_Sans/* addons/web/static/src/fonts/google/Roboto/*
+Files: addons/web/static/fonts/google/Open_Sans/* addons/web/static/fonts/google/Roboto/*
 Copyright: Unknown
 License: Apache-2.0
 
-Files: addons/web/static/src/fonts/google/Oswald/*
+Files: addons/web/static/fonts/google/Oswald/*
 Copyright: 2016 The Oswald Project Authors
 License: SIL-Open-Font-License 
 
-Files: addons/web/static/src/fonts/google/Raleway/*
+Files: addons/web/static/fonts/google/Raleway/*
 Copyright: 2010 Matt McInerney 2011 Pablo Impallari; 2011 Rodrigo Fuenzalida
 License: SIL-Open-Font-License
 
-Files: addons/web/static/src/fonts/lato/*
+Files: addons/web/static/fonts/lato/*
 Copyright: 2010-2011 tyPoland Lukasz Dziedzic
 License: SIL-Open-Font-License
 
-Files: addons/web/static/src/fonts/mnmliconsv21-webfont.*
+Files: addons/web/static/fonts/mnmliconsv21-webfont.*
 Copyright: Carlos Elas
 License: MIT
 
diff --git a/debian/lintian-overrides b/debian/lintian-overrides
index 8b83d3d336d..f66b9320b47 100644
--- a/debian/lintian-overrides
+++ b/debian/lintian-overrides
@@ -14,11 +14,11 @@ odoo: privacy-breach-generic usr/lib/python3/dist-packages/odoo/addons/website/t
 odoo: privacy-breach-generic usr/lib/python3/dist-packages/odoo/addons/website/tests/template_qweb_test.xml [<script type="text/javascript" src="http://test.external.link/javascript2.js">] (http://test.external.link/javascript2.js)
 
 # false positive: this is SIL, as per debian/copyright:396
-odoo: truetype-font-prohibits-installable-embedding [preview/print only] usr/lib/python3/dist-packages/odoo/addons/web/static/src/fonts/lato/Lato-BlaIta-webfont.ttf
-odoo: truetype-font-prohibits-installable-embedding [preview/print only] usr/lib/python3/dist-packages/odoo/addons/web/static/src/fonts/lato/Lato-BolIta-webfont.ttf
-odoo: truetype-font-prohibits-installable-embedding [preview/print only] usr/lib/python3/dist-packages/odoo/addons/web/static/src/fonts/lato/Lato-HaiIta-webfont.ttf
-odoo: truetype-font-prohibits-installable-embedding [preview/print only] usr/lib/python3/dist-packages/odoo/addons/web/static/src/fonts/lato/Lato-LigIta-webfont.ttf
-odoo: truetype-font-prohibits-installable-embedding [preview/print only] usr/lib/python3/dist-packages/odoo/addons/web/static/src/fonts/lato/Lato-RegIta-webfont.ttf
+odoo: truetype-font-prohibits-installable-embedding [preview/print only] usr/lib/python3/dist-packages/odoo/addons/web/static/fonts/lato/Lato-BlaIta-webfont.ttf
+odoo: truetype-font-prohibits-installable-embedding [preview/print only] usr/lib/python3/dist-packages/odoo/addons/web/static/fonts/lato/Lato-BolIta-webfont.ttf
+odoo: truetype-font-prohibits-installable-embedding [preview/print only] usr/lib/python3/dist-packages/odoo/addons/web/static/fonts/lato/Lato-HaiIta-webfont.ttf
+odoo: truetype-font-prohibits-installable-embedding [preview/print only] usr/lib/python3/dist-packages/odoo/addons/web/static/fonts/lato/Lato-LigIta-webfont.ttf
+odoo: truetype-font-prohibits-installable-embedding [preview/print only] usr/lib/python3/dist-packages/odoo/addons/web/static/fonts/lato/Lato-RegIta-webfont.ttf
 
 # only present in emails sent from the "digest" addon, and are not
 # served from the odoo instance itself. This addon is only enabled
diff --git a/debian/odoo.links b/debian/odoo.links
index ea389440844..d1562e02399 100644
--- a/debian/odoo.links
+++ b/debian/odoo.links
@@ -9,15 +9,15 @@ usr/share/fonts-font-awesome/fonts/fontawesome-webfont.ttf usr/lib/python3/dist-
 usr/share/fonts-font-awesome/fonts/fontawesome-webfont.woff usr/lib/python3/dist-packages/odoo/addons/web/static/lib/fontawesome/fonts/fontawesome-webfont.woff2
 usr/share/fonts-font-awesome/fonts/fontawesome-webfont.woff2 usr/lib/python3/dist-packages/odoo/addons/web/static/lib/fontawesome/fonts/fontawesome-webfont.woff
 usr/share/javascript/underscore/underscore.js usr/lib/python3/dist-packages/odoo/addons/web/static/lib/underscore/underscore.js
-usr/share/fonts/truetype/roboto/unhinted/RobotoTTF/Roboto-Black.ttf usr/lib/python3/dist-packages/odoo/addons/web/static/src/fonts/google/Roboto/Roboto-Black.ttf
-usr/share/fonts/truetype/roboto/unhinted/RobotoTTF/Roboto-BlackItalic.ttf usr/lib/python3/dist-packages/odoo/addons/web/static/src/fonts/google/Roboto/Roboto-BlackItalic.ttf
-usr/share/fonts/truetype/roboto/unhinted/RobotoTTF/Roboto-Bold.ttf usr/lib/python3/dist-packages/odoo/addons/web/static/src/fonts/google/Roboto/Roboto-Bold.ttf
-usr/share/fonts/truetype/roboto/unhinted/RobotoTTF/Roboto-BoldItalic.ttf usr/lib/python3/dist-packages/odoo/addons/web/static/src/fonts/google/Roboto/Roboto-BoldItalic.ttf
-usr/share/fonts/truetype/roboto/unhinted/RobotoTTF/Roboto-Italic.ttf usr/lib/python3/dist-packages/odoo/addons/web/static/src/fonts/google/Roboto/Roboto-Italic.ttf
-usr/share/fonts/truetype/roboto/unhinted/RobotoTTF/Roboto-Light.ttf usr/lib/python3/dist-packages/odoo/addons/web/static/src/fonts/google/Roboto/Roboto-Light.ttf
-usr/share/fonts/truetype/roboto/unhinted/RobotoTTF/Roboto-LightItalic.ttf usr/lib/python3/dist-packages/odoo/addons/web/static/src/fonts/google/Roboto/Roboto-LightItalic.ttf
-usr/share/fonts/truetype/roboto/unhinted/RobotoTTF/Roboto-Medium.ttf usr/lib/python3/dist-packages/odoo/addons/web/static/src/fonts/google/Roboto/Roboto-Medium.ttf
-usr/share/fonts/truetype/roboto/unhinted/RobotoTTF/Roboto-MediumItalic.ttf  usr/lib/python3/dist-packages/odoo/addons/web/static/src/fonts/google/Roboto/Roboto-MediumItalic.ttf 
-usr/share/fonts/truetype/roboto/unhinted/RobotoTTF/Roboto-Regular.ttf usr/lib/python3/dist-packages/odoo/addons/web/static/src/fonts/google/Roboto/Roboto-Regular.ttf
-usr/share/fonts/truetype/roboto/unhinted/RobotoTTF/Roboto-Thin.ttf usr/lib/python3/dist-packages/odoo/addons/web/static/src/fonts/google/Roboto/Roboto-Thin.ttf
-usr/share/fonts/truetype/roboto/unhinted/RobotoTTF/Roboto-ThinItalic.ttf usr/lib/python3/dist-packages/odoo/addons/web/static/src/fonts/google/Roboto/Roboto-ThinItalic.ttf
+usr/share/fonts/truetype/roboto/unhinted/RobotoTTF/Roboto-Black.ttf usr/lib/python3/dist-packages/odoo/addons/web/static/fonts/google/Roboto/Roboto-Black.ttf
+usr/share/fonts/truetype/roboto/unhinted/RobotoTTF/Roboto-BlackItalic.ttf usr/lib/python3/dist-packages/odoo/addons/web/static/fonts/google/Roboto/Roboto-BlackItalic.ttf
+usr/share/fonts/truetype/roboto/unhinted/RobotoTTF/Roboto-Bold.ttf usr/lib/python3/dist-packages/odoo/addons/web/static/fonts/google/Roboto/Roboto-Bold.ttf
+usr/share/fonts/truetype/roboto/unhinted/RobotoTTF/Roboto-BoldItalic.ttf usr/lib/python3/dist-packages/odoo/addons/web/static/fonts/google/Roboto/Roboto-BoldItalic.ttf
+usr/share/fonts/truetype/roboto/unhinted/RobotoTTF/Roboto-Italic.ttf usr/lib/python3/dist-packages/odoo/addons/web/static/fonts/google/Roboto/Roboto-Italic.ttf
+usr/share/fonts/truetype/roboto/unhinted/RobotoTTF/Roboto-Light.ttf usr/lib/python3/dist-packages/odoo/addons/web/static/fonts/google/Roboto/Roboto-Light.ttf
+usr/share/fonts/truetype/roboto/unhinted/RobotoTTF/Roboto-LightItalic.ttf usr/lib/python3/dist-packages/odoo/addons/web/static/fonts/google/Roboto/Roboto-LightItalic.ttf
+usr/share/fonts/truetype/roboto/unhinted/RobotoTTF/Roboto-Medium.ttf usr/lib/python3/dist-packages/odoo/addons/web/static/fonts/google/Roboto/Roboto-Medium.ttf
+usr/share/fonts/truetype/roboto/unhinted/RobotoTTF/Roboto-MediumItalic.ttf  usr/lib/python3/dist-packages/odoo/addons/web/static/fonts/google/Roboto/Roboto-MediumItalic.ttf 
+usr/share/fonts/truetype/roboto/unhinted/RobotoTTF/Roboto-Regular.ttf usr/lib/python3/dist-packages/odoo/addons/web/static/fonts/google/Roboto/Roboto-Regular.ttf
+usr/share/fonts/truetype/roboto/unhinted/RobotoTTF/Roboto-Thin.ttf usr/lib/python3/dist-packages/odoo/addons/web/static/fonts/google/Roboto/Roboto-Thin.ttf
+usr/share/fonts/truetype/roboto/unhinted/RobotoTTF/Roboto-ThinItalic.ttf usr/lib/python3/dist-packages/odoo/addons/web/static/fonts/google/Roboto/Roboto-ThinItalic.ttf
diff --git a/doc/reference/guidelines.rst b/doc/reference/guidelines.rst
index 09d8fbe1fd8..42de9acabc5 100644
--- a/doc/reference/guidelines.rst
+++ b/doc/reference/guidelines.rst
@@ -976,8 +976,8 @@ The convention is to organize the code according to the following structure:
   - *static/src*: the generic static source code folder
 
     - *static/src/css*: all css files
-    - *static/src/fonts*
-    - *static/src/img*
+    - *static/fonts*
+    - *static/img*
     - *static/src/js*
 
       - *static/src/js/tours*: end user tour files (tutorials, not tests)
diff --git a/doc/reference/reports.rst b/doc/reference/reports.rst
index 140f91024c1..6bd75398f57 100644
--- a/doc/reference/reports.rst
+++ b/doc/reference/reports.rst
@@ -295,7 +295,7 @@ Example::
 
     @font-face {
         font-family: 'MonixBold';
-        src: local('MonixBold'), local('MonixBold'), url(/your_module/static/src/fonts/MonixBold-Regular.otf) format('opentype');
+        src: local('MonixBold'), local('MonixBold'), url(/your_module/static/fonts/MonixBold-Regular.otf) format('opentype');
     }
 
     .h1-title-big {
diff --git a/odoo/addons/base/models/res_company.py b/odoo/addons/base/models/res_company.py
index db652a9f3c3..64a28f4dd9d 100644
--- a/odoo/addons/base/models/res_company.py
+++ b/odoo/addons/base/models/res_company.py
@@ -31,7 +31,7 @@ class Company(models.Model):
         return self.env.user.company_id.currency_id
 
     def _get_default_favicon(self, original=False):
-        img_path = get_resource_path('web', 'static/src/img/favicon.ico')
+        img_path = get_resource_path('web', 'static/img/favicon.ico')
         with tools.file_open(img_path, 'rb') as f:
             if original:
                 return base64.b64encode(f.read())
diff --git a/odoo/models.py b/odoo/models.py
index be9955de020..08750968a79 100644
--- a/odoo/models.py
+++ b/odoo/models.py
@@ -6303,7 +6303,7 @@ Fields:
 
     def _get_placeholder_filename(self, field=None):
         """ Returns the filename of the placeholder to use,
-            set on web/static/src/img by default, or the
+            set on web/static/img by default, or the
             complete path to access it (eg: module/path/to/image.png).
         """
         return 'placeholder.png'