diff --git a/addons/gamification/goal.py b/addons/gamification/goal.py
index e713ce57854..b78f59a1de0 100644
--- a/addons/gamification/goal.py
+++ b/addons/gamification/goal.py
@@ -262,6 +262,8 @@ class gamification_goal_plan(osv.Model):
     def action_cancel(self, cr, uid, ids, context=None):
         return self.write(cr, uid, ids, {'state': 'draft'}, context=context)
 
+    def action_reset(self, cr, uid, ids, context=None):
+        return self.write(cr, uid, ids, {'state': 'inprogress'}, context=context)
 
 
 class gamification_goal_planline(osv.Model):
diff --git a/addons/gamification/view/goal.xml b/addons/gamification/view/goal.xml
index 76db7c82a4e..fe2ba27bca3 100644
--- a/addons/gamification/view/goal.xml
+++ b/addons/gamification/view/goal.xml
@@ -31,9 +31,9 @@
             <field name="arch" type="xml">
                 <form string="Goal" version="7.0">
                     <header>
-                        <button string="Mark as Reached" type="object" name="action_reach" states="inprogress"/>
-                        <button string="Mark as Failed" type="object" name="action_fail" states="inprogress"/>
-                        <button string="Cancel Completion" type="object" name="action_cancel" states="failed,reached"/>
+                        <button string="Goal Reached" type="object" name="action_reach" states="inprogress" class="oe_highlight"/>
+                        <button string="Goal Failed" type="object" name="action_fail" states="inprogress"/>
+                        <button string="Reset Completion" type="object" name="action_cancel" states="failed,reached"/>
                         <field name="state" widget="statusbar" statusbar_visible="inprogress" />
                     </header>
                     <sheet>
diff --git a/addons/gamification/view/plan.xml b/addons/gamification/view/plan.xml
index a89ef258599..bbc5c1b34e9 100644
--- a/addons/gamification/view/plan.xml
+++ b/addons/gamification/view/plan.xml
@@ -27,9 +27,10 @@
             <field name="arch" type="xml">
                 <form string="Goal types" version="7.0">
                     <header>
-                        <button string="Start Plan" type="object" name="action_start" states="draft"/>
-                        <button string="Close Plan" type="object" name="action_close" states="inprogress"/>
+                        <button string="Start Plan" type="object" name="action_start" states="draft" class="oe_highlight"/>
+                        <button string="Close Plan" type="object" name="action_close" states="inprogress" class="oe_highlight"/>
                         <button string="Cancel Plan" type="object" name="action_cancel" states="inprogress"/>
+                        <button string="Reset Plan" type="object" name="action_reset" states="done"/>
                         <field name="state" widget="statusbar"/>
                     </header>
                     <sheet>