diff --git a/web/jQuery/CXM_jquery_datatable_translation.anubis b/web/jQuery/CXM_jquery_datatable_translation.anubis
index 2a4ed82..69d74b8 100644
--- a/web/jQuery/CXM_jquery_datatable_translation.anubis
+++ b/web/jQuery/CXM_jquery_datatable_translation.anubis
@@ -14,7 +14,7 @@ public define String
     String  language,
     String  web_dir
   )=
-  with lang_file = web_dir+"/public/js/jquery/plug-in/DataTables-1.10.7/translation/"+language+".txt",
+  with lang_file = web_dir+"/public/js/jquery/plug-in/DataTables/translation/"+language+".txt",
   with file = if file_exists(lang_file) then 
                 language 
               else
@@ -22,7 +22,7 @@ public define String
                 "en",
                 
   "\"oLanguage\": {
-                \"sUrl\": \"/js/jquery/plug-in/DataTables-1.10.7/translation/"+file+".txt\"
+                \"sUrl\": \"/js/jquery/plug-in/DataTables/translation/"+file+".txt\"
             }".
             
   
diff --git a/web/jQuery/ui-addon/datetimepicker.anubis b/web/jQuery/ui-addon/datetimepicker.anubis
index d3d8070..427833e 100644
--- a/web/jQuery/ui-addon/datetimepicker.anubis
+++ b/web/jQuery/ui-addon/datetimepicker.anubis
@@ -23,42 +23,49 @@ read calexium_lib/web/CXM_jquery.anubis
     ]
   .
 
+public define String
+  datetimepicker_init_js
+  (
+    String lang,
+    Bool   add_icon
+  ) = "// Datetimepicker\n
+       $.datetimepicker.setLocale('"+lang+"');
+       $('.datepicker').datetimepicker({timepicker:false,format:'d/m/Y'});
+       $('.datetimepicker').datetimepicker({format:'Y-m-d H:i'});
+       $('.timepicker').datetimepicker({datepicker:false,format:'H:i',step:5});
+      " + if add_icon then "
+       var items_add_func = function (index) {
+          var icon_file = 'icon_calendar.gif';
+          var dt_picker = $(this);
+
+          if (dt_picker.hasClass('timepicker')) {
+            icon_file = 'icon_clock.gif';
+          }
+                                      
+          var icon = $('<img src=\"icons/16x16/'+icon_file+'\"/>');
+                                      
+          icon.click(function () { dt_picker.datetimepicker('show'); });
+          icon.hover(function() { $(this).css('cursor','pointer'); });
+          dt_picker.after(icon);
+       };
+                                  
+       $('.datepicker').each(items_add_func);
+       $('.datetimepicker').each(items_add_func);
+       $('.timepicker').each(items_add_func);
+      " else "".
 
 /* Initialize jQuery datetimepicker */
 public define List(HTML_Head_Tag)
   jq_datetimepicker_init
   (
-    String  lang,
+    String lang,
     Bool add_icon
   )
   =
     [
       css(css_file("js/jquery/plug-in/datetimepicker/datetimepicker.css")),
       js(js_file("js/jquery/plug-in/datetimepicker/datetimepicker.min.js")),
-      js_inline(jquery_ready("// Datetimepicker\n
-                               $('.datepicker').datetimepicker({lang:'"+lang+"',timepicker:false,format:'d/m/Y'});
-                               $('.datetimepicker').datetimepicker({lang:'"+lang+"',format:'Y-m-d H:i'});
-                               $('.timepicker').datetimepicker({lang:'"+lang+"',datepicker:false,format:'H:i',step:5});
-                               " + if add_icon then "
-                                  var items_add_func = function (index) {
-                                      var icon_file = 'icon_calendar.gif';
-                                      var dt_picker = $(this);
-                                      
-                                      if (dt_picker.hasClass('timepicker')) {
-                                        icon_file = 'icon_clock.gif';
-                                      }
-                                      
-                                      var icon = $('<img src=\"icons/16x16/'+icon_file+'\"/>');
-                                      
-                                      icon.click(function () { dt_picker.datetimepicker('show'); });
-                                      icon.hover(function() { $(this).css('cursor','pointer'); });
-                                      dt_picker.after(icon);
-                                    };
-                                  
-                                  $('.datepicker').each(items_add_func);
-                                  $('.datetimepicker').each(items_add_func);
-                                  $('.timepicker').each(items_add_func);
-                                " else ""))
+      js_inline(jquery_ready(datetimepicker_init_js(lang, add_icon)))
     ]
   .
 
diff --git a/web/widgets/button.anubis b/web/widgets/button.anubis
index 4d80261..1486024 100644
--- a/web/widgets/button.anubis
+++ b/web/widgets/button.anubis
@@ -120,7 +120,7 @@ public define HTML_Partial_Content
   with uid = generate_random_string(20),
 
   partial_content([js(js_file("js/cxm/cxm.js")), js_inline(jquery_ready(img_button_confirm_js(uid, dlg_title, dlg_text, dlg_ok, dlg_cancel)))],
-              image(img_button_confirm_image_attrs(core_attrs, uid, actioner), img_path, "")).
+              literal("<img " + format_attrs(img_button_confirm_image_attrs(core_attrs, uid, actioner)) + " src=\"" + img_path + "\"></img>")).
 
 public define HTML_Partial_Content
   img_button_confirm
@@ -149,21 +149,21 @@ public define String
 
   "<script type=\"text/javascript\">" + jquery_ready(img_button_confirm_js(uid, dlg_title, dlg_text, dlg_ok, dlg_cancel)) + "</script>" +
   "<img " + format_attrs(img_button_confirm_image_attrs(core_attrs, uid, actioner)) + " src=\"" + img_path + "\"></img>".
-  
+
 public define String
   img_button_confirm
   (
-    String          img_path,
-    List(CoreAttrs) core_attrs,
-    String          dlg_title_js_escaped,
-    String          dlg_text_js_escaped,
-    String          dlg_ok_js_escaped,
-    String          dlg_cancel_js_escaped,
-    String          dlg_ok_js_script
+    String img_path,
+    String inline_img_attrb,
+    String dlg_title_js_escaped,
+    String dlg_text_js_escaped,
+    String dlg_ok_js_escaped,
+    String dlg_cancel_js_escaped,
+    String dlg_ok_js_script
   ) =
   with uid    = generate_random_string(10),
   "<script type=\"text/javascript\">$(document).ready(function(){CalexiumToolBox.data.confirm_dialog['" + uid + "'] = {title:" + dlg_title_js_escaped + ",text:" + dlg_text_js_escaped + ",ok:" + dlg_ok_js_escaped + ",cancel:" + dlg_cancel_js_escaped +
-   "};});</script><img " + format_attrs(core_attrs) + " id=\"" + uid + "\" style=\"cursor:pointer\" onclick=\"CalexiumToolBox.make_confirm_dialog(this," + dlg_ok_js_script + ");\"  src=\"" + img_path + "\"></img>".
+   "};});</script><img " + inline_img_attrb + " id=\"" + uid + "\" style=\"cursor:pointer\" onclick=\"CalexiumToolBox.make_confirm_dialog(this," + dlg_ok_js_script + ");\"  src=\"" + img_path + "\"></img>".
 
 public define String
   img_button_confirm
--
libgit2 0.21.4