diff --git a/addons/subscription/subscription_view.xml b/addons/subscription/subscription_view.xml
index c2cffdc1bfa..839dffd1b63 100644
--- a/addons/subscription/subscription_view.xml
+++ b/addons/subscription/subscription_view.xml
@@ -15,9 +15,9 @@
             <field name="arch" type="xml">
                 <form string="Subscriptions" version="7.0">
                 <header>
-                    <button name="set_process" states="draft" string="Process" type="object"/>
-                    <button name="set_done" states="running" string="Stop" type="object"/>
-                    <button name="set_draft" states="done" string="Set to Draft" type="object"/>
+                    <button name="set_process" states="draft" string="Process" type="object" class="oe_form_button_active_flow"/>
+                    <button name="set_done" states="running" string="Stop" type="object" class="oe_form_button_active_flow"/>
+                    <button name="set_draft" states="done" string="Set to Draft" type="object" class="oe_form_button_return_flow"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,running"/>
                 </header>
                 <sheet>
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index cc9158aa23c..5f115a997be 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -21,8 +21,8 @@
                 <form string="Survey" version="7.0">
                 <header>
                     <button name="survey_open" string="Open" states="cancel,close" type="object"/>
-                    <button name="survey_close" string="Close" states="open" type="object"/>
-                    <button name="survey_cancel" string="Cancel" states="open" type="object"/>
+                    <button name="survey_close" string="Close" states="open" type="object" class="oe_form_button_active_flow"/>
+                    <button name="survey_cancel" string="Cancel" states="open" type="object" class="oe_form_button_return_flow"/>
                     <field name="state" widget="statusbar" statusbar_visible="open,close"/>
                 </header>
                 <sheet>
@@ -1058,9 +1058,9 @@
             <field name="arch" type="xml">
                 <form version="7.0">
                 <header>
-                    <button name="survey_req_draft" string="Set to Draft" states="cancel,done" type="object"/>
-                    <button name="survey_req_waiting_answer" string="Waiting Answer" states="draft" type="object"/>
-                    <button name="survey_req_done" string="Done" states="waiting_answer" type="object"/>
+                    <button name="survey_req_draft" string="Set to Draft" states="cancel,done" type="object" class="oe_form_button_return_flow"/>
+                    <button name="survey_req_waiting_answer" string="Waiting Answer" states="draft" type="object" class="oe_form_button_active_flow"/>
+                    <button name="survey_req_done" string="Done" states="waiting_answer" type="object" class="oe_form_button_active_flow"/>
                     <button name="survey_req_cancel" string="Cancel" states="waiting_answer" type="object"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,waiting_answer"/>
                 </header>