diff --git a/js/pages/backoffice/toolbox.js b/js/pages/backoffice/toolbox.js
index ae29f3ed02..aff7140329 100644
--- a/js/pages/backoffice/toolbox.js
+++ b/js/pages/backoffice/toolbox.js
@@ -372,6 +372,8 @@ CombodoModal.OpenConfirmationModal = function(oOptions, aData) {
 		title: Dict.S('UI:Modal:DefaultConfirmationTitle'),
 		content: '',
 		do_not_show_again_pref_key: null,
+		callback_on_confirm: null,
+		callback_on_cancel: null,
 		extra_options: {
 			callback_on_modal_close: function () {
 				$(this).dialog( "destroy" ); // destroy dialog object
@@ -446,7 +448,7 @@ CombodoModal.OpenInformativeModal = function(sMessage, sSeverity, oOptions) {
 		buttons: {
 			ok: {
 				text: Dict.S('UI:Button:Ok'),
-				// classes: ['ibo-is-regular', 'ibo-is-neutral'],
+				classes: ['ibo-is-regular', 'ibo-is-neutral'],
 				callback_on_click: function () {
 					$(this).dialog('close');
 				}
diff --git a/templates/base/components/datatable/row-actions/handler.js.twig b/templates/base/components/datatable/row-actions/handler.js.twig
index 86cbf5195c..f2e8ff3a6b 100644
--- a/templates/base/components/datatable/row-actions/handler.js.twig
+++ b/templates/base/components/datatable/row-actions/handler.js.twig
@@ -40,13 +40,11 @@
             CombodoModal.OpenConfirmationModal({
                 title: sTitle,
                 content: sMessage,
+                callback_on_confirm: ActionRowFunction{{ oUIBlock.GetId() }}{{ loop.index0 }},
                 buttons: {
                     confirm: {
                         text: sLabel,
-                        classes: [sConfirmButtonClass],
-                        callback_on_click:{
-                            ActionRowFunction{{ oUIBlock.GetId() }}{{ loop.index0 }}
-                        }
+                        classes: [sConfirmButtonClass]
                     }
                 },
                 {% if aAction.confirmation.do_not_show_again_pref_key is defined %}