diff --git a/addons/hr_timesheet/project_timesheet_view.xml b/addons/hr_timesheet/project_timesheet_view.xml
index bdc42f41141..85419987cdd 100644
--- a/addons/hr_timesheet/project_timesheet_view.xml
+++ b/addons/hr_timesheet/project_timesheet_view.xml
@@ -24,10 +24,11 @@
             <field name="name">Inherit project form : Invoicing Data</field>
             <field name="model">project.project</field>
             <field name="inherit_id" ref="project.edit_project"/>
+            <field name="priority">24</field>
             <field name="arch" type="xml">
-                <div name="button_box" position="inside">
+                <button name="toggle_active" position="before">
                     <button class="oe_stat_button" name="%(act_hr_timesheet_line_by_project)d" type="action" icon="fa-calendar" string="Timesheets" attrs="{'invisible': [('allow_timesheets', '=', False)]}"/>
-                </div>
+                </button>
                 <field name="user_id" position="after">
                     <field name="subtask_project_id" groups="base.group_no_one" attrs="{'invisible': [('allow_timesheets', '=', False)]}"/>
                 </field>
@@ -126,16 +127,23 @@
             <field name="name">project.project.timesheet.kanban.inherited</field>
             <field name="model">project.project</field>
             <field name="inherit_id" ref="project.view_project_kanban"/>
+            <field name="priority">24</field>
             <field name="arch" type="xml">
                 <field name="use_tasks" position="after">
                     <field name="allow_timesheets" invisible="1"/>
                 </field>
-                <xpath expr="//div[contains(@class, 'o_kanban_manage_reports')]" position="inside">
+                <xpath expr="//div[contains(@class, 'o_kanban_manage_reports')]/div[last()]" position="after">
                     <div attrs="{'invisible': [('allow_timesheets', '=', False)]}">
                         <a name="%(act_hr_timesheet_line_by_project)d" type="action">Timesheets</a>
                     </div>
                 </xpath>
-
+                <xpath expr="//div[contains(@class, 'o_project_kanban_box')]/div[last()]" position="before">
+                    <div attrs="{'invisible': [('allow_timesheets', '=', False)]}" class="o_project_kanban_box">
+                        <a t-if="record.allow_timesheets.raw_value" name="%(act_hr_timesheet_line_by_project)d" type="action">
+                            <span class="o_label">Timesheets</span>
+                        </a>
+                    </div>
+                </xpath>
             </field>
         </record>
 
diff --git a/addons/project/views/project_views.xml b/addons/project/views/project_views.xml
index f30e9926861..35117f0708e 100644
--- a/addons/project/views/project_views.xml
+++ b/addons/project/views/project_views.xml
@@ -76,13 +76,13 @@
                 <sheet string="Project">
                     <field name="analytic_account_id" invisible="1" required="0"/>
                     <div class="oe_button_box" name="button_box" groups="base.group_user">
-                         <button class="oe_stat_button" type="action" attrs="{'invisible':[('use_tasks','=', False)]}"
+                        <button  class="oe_stat_button" name="attachment_tree_view" type="object" icon="fa-files-o">
+                            <field string="Documents" name="doc_count" widget="statinfo"/>
+                        </button>
+                        <button class="oe_stat_button" type="action" attrs="{'invisible':[('use_tasks','=', False)]}"
                             name="%(act_project_project_2_project_task_all)d" icon="fa-tasks">
                             <field string="Tasks" name="task_count" widget="statinfo" options="{'label_field': 'label_tasks'}"/>
                         </button>
-                        <button  class="oe_stat_button" name="attachment_tree_view"  type="object" icon="fa-files-o">
-                            <field string="Documents" name="doc_count" widget="statinfo"/>
-                        </button>
                         <button name="toggle_active" type="object"
                                 confirm="(Un)archiving a project automatically (un)archives its tasks and issues. Do you want to proceed?"
                                 class="oe_stat_button" icon="fa-archive">
@@ -243,7 +243,8 @@
                                                 <span><i class="fa fa-envelope"></i> <t t-esc="record.alias_id.value"/></span>
                                             </div>
                                         </div>
-                                    </div><div class="o_kanban_card_manage_pane o_invisible">
+                                    </div>
+                                    <div class="o_kanban_card_manage_pane o_invisible">
                                         <div class="o_kanban_card_manage_section o_kanban_manage_reports">
                                             <div groups="project.group_project_manager">
                                                 <a type="edit">Settings</a>
@@ -272,10 +273,12 @@
                                             <t t-esc="record.task_needaction_count.raw_value"/>
                                         </a>
                                     </div>
-                                    <a t-if="record.doc_count.raw_value" class="o_project_kanban_box" name="attachment_tree_view" type="object">
-                                        <span class="o_value"><t t-esc="record.doc_count.value"/></span>
-                                        <span class="o_label">Documents</span>
-                                    </a>
+                                    <div t-if="record.doc_count.raw_value" class="o_project_kanban_box">
+                                        <a name="attachment_tree_view" type="object">
+                                            <span class="o_value"><t t-esc="record.doc_count.value"/></span>
+                                            <span class="o_label">Documents</span>
+                                        </a>
+                                    </div>
                                 </div>
                             </div>
                         </t>
diff --git a/addons/project_issue/views/project_project_views.xml b/addons/project_issue/views/project_project_views.xml
index 6a875a7254a..e9a86f2be13 100644
--- a/addons/project_issue/views/project_project_views.xml
+++ b/addons/project_issue/views/project_project_views.xml
@@ -17,27 +17,29 @@
         <field name="name">project.project.kanban.inherited</field>
         <field name="model">project.project</field>
         <field name="inherit_id" ref="project.view_project_kanban"/>
+        <field name="priority">16</field>
         <field name="arch" type="xml">
             <field name="use_tasks" position="after">
                 <field name="use_issues"/>
                 <field name="issue_ids" invisible="1"/>
                 <field name="issue_needaction_count" invisible="1"/>
             </field>
-            <xpath expr="//div/a[contains(@class, 'o_project_kanban_box')]" position="after">
-                <a t-if="record.use_issues.raw_value" class="o_project_kanban_box" name="%(act_project_project_2_project_issue_all)d" type="action">
-                    <span class="o_value"><t t-raw="record.issue_ids.raw_value.length"/></span>
-                    <span class="o_label"><field name="label_issues"/></span>
-                    <a t-if="record.issue_needaction_count.raw_value" class="o_needaction" name="%(act_project_project_2_project_issue_all)d" type="action" context="{'search_default_message_needaction': 1}">
-                        <t t-esc="record.issue_needaction_count.raw_value"/>
-                    </a>
-                </a>
-            </xpath>
-            <xpath expr="//div[contains(@class, 'o_kanban_manage_reports')]" position="inside">
+            <xpath expr="//div[contains(@class, 'o_kanban_manage_reports')]/div[last()]" position="after">
                 <div attrs="{'invisible': [('use_issues', '=', False)]}">
                     <a name="%(action_project_issue_report_filtered)d" type="action">Issues</a>
                 </div>
             </xpath>
-
+            <xpath expr="//div[contains(@class, 'o_project_kanban_box')]/div[last()]" position="before">
+                <div attrs="{'invisible': [('use_issues', '=', False)]}" class="o_project_kanban_box">
+                    <a name="%(act_project_project_2_project_issue_all)d" type="action">
+                        <span class="o_value"><t t-raw="record.issue_ids.raw_value.length"/></span>
+                        <span class="o_label"><field name="label_issues"/></span>
+                        <a t-if="record.issue_needaction_count.raw_value" class="o_needaction" name="%(act_project_project_2_project_issue_all)d" type="action" context="{'search_default_message_needaction': 1}">
+                            <t t-esc="record.issue_needaction_count.raw_value"/>
+                        </a>
+                    </a>
+                </div>
+            </xpath>
         </field>
     </record>
 
@@ -58,12 +60,12 @@
                     <field name="label_issues" class="oe_inline oe_input_align" attrs="{'invisible': [('use_issues', '=', False)]}"/>
                 </div>
             </xpath>
-            <div name="button_box" position="inside">
+            <button name="toggle_active" position="before">
                 <button class="oe_stat_button" type="action" attrs="{'invisible':[('use_issues','=', False)]}"
                     name="%(act_project_project_2_project_issue_all)d" icon="fa-bug">
                     <field string="Issues" name="issue_count" widget="statinfo" options="{'label_field': 'label_issues'}"/>
                 </button>
-            </div>
+            </button>
         </field>
    </record>
 </odoo>