Index: sites/all/modules/hide_submit/hide_submit_admin_settings.js
===================================================================
--- sites/all/modules/hide_submit/hide_submit_admin_settings.js	(revision 4935)
+++ sites/all/modules/hide_submit/hide_submit_admin_settings.js	(revision 4937)
@@ -1,18 +1,19 @@
 // $id$
-function hs_toggle( use_custom_link ) {
-    img="#edit-hide-submit-custom-image-link-wrapper";
-    if ( use_custom_link ) { 
-        $(img).show(); 
+Drupal.behaviors.hide_submit_admin_settings = function(context) {
+  function hs_toggle(use_custom_link) {
+    $img = $("#edit-hide-submit-custom-image-link-wrapper", context);
+    if (use_custom_link) {
+      $img.show();
     }
     else {
-        $(img).hide(); 
+      $img.hide();
     }
+  }
+  var $toggleCustomImage = $("#edit-hide-submit-toggle-custom-image", context);
+  $toggleCustomImage.each(function() {
+    hs_toggle($(this).attr("checked"));
+  });
+  $toggleCustomImage.click(function() {
+    hs_toggle($(this).attr("checked"));
+  });
 }
-$(document).ready(function() {
-    $("#edit-hide-submit-toggle-custom-image").each(function() {
-        hs_toggle ($(this).attr("checked"));
-        $(this).click(function() {
-            hs_toggle ( $(this).attr("checked") );
-        });
-    });
-});
\ No newline at end of file
Index: sites/all/modules/hide_submit/hide_submit.module
===================================================================
--- sites/all/modules/hide_submit/hide_submit.module	(revision 4935)
+++ sites/all/modules/hide_submit/hide_submit.module	(revision 4937)
@@ -320,13 +320,7 @@
 /**
 * Get javascript code for injection
 */
-function _hide_submit_get_javascript_settings() {
-    
-    // Set base path for local image, none for external
-    $image = _hide_submit_get_image(); 
-    $image = (url($image) == $image) ? $image : (base_path() . $image);
-    $image = check_url($image);
-    
+function _hide_submit_get_javascript_settings() {   
     // Assemble jQuery selector 
     $selector = 'input:submit:not(.'. HIDE_SUBMIT_EXCLUDE_CLASS .')';
     $selector .= implode("", explode("\r\n", filter_xss_admin(variable_get('hide_submit_attribute_filter', ''))));
@@ -358,7 +352,6 @@
    // Add Message and image only when needed
    if ($mode == 'hide') {
        $settings['hide_submit']['message'] = filter_xss_admin( _hide_submit_clean_for_javascript( _hide_submit_get_message() ) );
-       $settings['hide_submit']['image']   = $image;
    }
 
   return $settings;
Index: sites/all/modules/hide_submit/hide_submit.js
===================================================================
--- sites/all/modules/hide_submit/hide_submit.js	(revision 4935)
+++ sites/all/modules/hide_submit/hide_submit.js	(revision 4937)
@@ -1,61 +1,50 @@
 // $Id: hide_submit.js,v 1.1.2.3 2010/01/11 18:56:53 optalgin Exp $
-
-// Hide button and siblings
-function hide_submit_button(obj, message) {
-    $(obj).siblings('input:submit').hide(); 
-    $(obj).hide(); 
-    $(message).insertAfter(obj);
-}
-
-// Disable button and siblings
-function disable_submit_button(obj) {
-    $(obj).siblings('input:submit').attr("disabled", "disabled");
-    $(obj).attr("disabled", "disabled");
-
+Drupal.behaviors.hide_submit = function(context) {
+  // Hide button and siblings
+  function hide_submit_button(obj, message, context) {
+    $(obj, context).hide().siblings('input:submit').hide().end().after(message);
+  }
+  // Disable button and siblings
+  function disable_submit_button(obj, context) {
+    var $obj = $(obj, context);
     // Workaround for comment-form and node-form
     // inject missing "op" for preview or delete etc.
-    $("#edit-hide-submit-fake-op").attr("name", "op");
-    $("#edit-hide-submit-fake-op").attr("value", $(obj).attr("value"));            
-    $(obj).parents("form").submit()
-}
-
-$(document).ready(function() {
-
-    var settings = Drupal.settings.hide_submit;
-
-    if (settings.dbg) {
-        // For debugging, this addtion to the script will paint included and excluded buttons
-        $('input:submit').css({border:'6px red solid'}); 
-        $(settings.selector).css({border:'6px green solid'});
+    $("#edit-hide-submit-fake-op", context)
+      .attr("name", "op")
+      .attr("value", $obj.attr("value"));
+    $obj
+      .attr("disabled", "disabled")
+      .siblings('input:submit').attr("disabled", "disabled")
+      .parents("form").submit();
+  }
+  var settings = Drupal.settings.hide_submit;
+  if (settings.dbg) {
+    // For debugging, this addtion to the script will paint included and excluded buttons
+    $('input:submit', context).css({border:'6px red solid'});
+    $(settings.selector, context).css({border:'6px green solid'});
+  }
+  // Hide buttons and inject message
+  if (settings.mode == 'hide') {
+    $(settings.selector, context).click(function() {
+      hide_submit_button(this, settings.message, context);
+    })
+    // Submit when ENTER is pressed
+    if (settings.keypress) {
+      $(settings.selector, context).keypress(function() {
+        $(this).parents("form").submit();
+        hide_submit_button(this, settings.message, context);
+      })
     }
-    
-    // Hide buttons and inject message
-    if (settings.mode == 'hide') {
-
-        jQuery("<img>").attr("src",settings.image);
-        
-        $(settings.selector).click(function() {
-            hide_submit_button(this, settings.message);
-        })  
-
-        // Submit when ENTER is pressed
-        if (settings.keypress) {
-            $(settings.selector).keypress(function() {
-                $(this).parents("form").submit();
-                hide_submit_button(this, settings.message);
-            })  
-        }
-    } 
-    else { // mode == 'disable' 
-        $(settings.selector).click(function() {
-            disable_submit_button(this);
-        });
-        
-        // Submit when ENTER is pressed
-        if (settings.keypress) {
-            $(settings.selector).keypress(function() {
-                disable_submit_button(this);
-            });
-        }
+  }
+  else { // mode == 'disable'
+    $(settings.selector, context).click(function() {
+      disable_submit_button(this, context);
+    });
+    // Submit when ENTER is pressed
+    if (settings.keypress) {
+      $(settings.selector, context).keypress(function() {
+        disable_submit_button(this, context);
+      });
     }
-})
\ No newline at end of file
+  }
+}