diff --git a/css/lightbox_zoom_icon.css b/css/lightbox_zoom_icon.css
new file mode 100644
index 0000000..ad0fd5c
--- /dev/null
+++ b/css/lightbox_zoom_icon.css
@@ -0,0 +1,15 @@
+a.lightbox-processed {
+  position:relative;
+  float:left;
+  margin:5px;
+}
+
+a.lightbox-processed span { 
+  display:none;
+  background-image:url(../images/zoom-small.png); background-repeat:no-repeat;
+  width:32px;
+  height:32px;
+  position:absolute;
+  left:10px;
+  top:10px;
+}
\ No newline at end of file
diff --git a/images/zoom-small.png b/images/zoom-small.png
new file mode 100644
index 0000000..1675e60
Binary files /dev/null and b/images/zoom-small.png differ
diff --git a/js/lightbox_zoom.js b/js/lightbox_zoom.js
new file mode 100644
index 0000000..7ef202a
--- /dev/null
+++ b/js/lightbox_zoom.js
@@ -0,0 +1,8 @@
+$(document).ready(function(){
+    $("a.lightbox-processed").append("<span></span>");
+    $("a.lightbox-processed").hover(function(){
+        $(this).children("span").fadeIn(600);
+    },function(){
+        $(this).children("span").fadeOut(200);
+    });
+});
\ No newline at end of file
diff --git a/lightbox2.admin.inc b/lightbox2.admin.inc
index da3b8d0..9b8d91f 100644
--- a/lightbox2.admin.inc
+++ b/lightbox2.admin.inc
@@ -60,12 +60,20 @@ function lightbox2_general_settings_form() {
     '#default_value' => variable_get('lightbox2_use_alt_layout', FALSE),
   );
 
+  // Add checkbox for zoom icon..
+  $form['layout_fieldset']['lightbox2_use_alt_layout'] = array(
+    '#type' => 'checkbox',
+    '#title' => t('Use alternative layout'),
+    '#description' => t('Enabling this option alters the layout of the lightbox elements. In the alternative layout the navigational links appear under the image with the caption text, instead of being overlayed on the image itself.  This doesn\'t apply when using Lightbox Lite.'),
+    '#default_value' => variable_get('lightbox2_use_alt_layout', FALSE),
+  );
+
   // Add checkbox for force navigation display.
-  $form['layout_fieldset']['lightbox2_force_show_nav'] = array(
+  $form['layout_fieldset']['lightbox2_use_zoom_icon'] = array(
     '#type' => 'checkbox',
-    '#title' => t('Force visibility of navigation links'),
-    '#description' => t('When viewing grouped images, the navigational links to the next and previous images are only displayed when you hover over the image.  Checking this box forces these links to be displayed all the time.'),
-    '#default_value' => variable_get('lightbox2_force_show_nav', FALSE),
+    '#title' => t('Use zoom icon'),
+    '#description' => t('Enabling this option will give you a zoom icon on pictures processed with Lightbox2.'),
+    '#default_value' => variable_get('lightbox2_use_zoom_icon', FALSE),
   );
 
   // Show caption
diff --git a/lightbox2.module b/lightbox2.module
index 1be0864..4ca4adf 100644
--- a/lightbox2.module
+++ b/lightbox2.module
@@ -710,6 +710,9 @@ function lightbox2_add_files() {
     if ($enable_login || $enable_contact) {
       drupal_add_js($path .'/js/lightbox_modal.js', 'module', $js_location);
     }
+    if (variable_get('lightbox2_enable_video', FALSE)) {
+      drupal_add_js($path .'/js/lightbox_zoom.js', 'module', $js_location);
+    }
     drupal_add_js($path .'/js/lightbox.js', 'module', $js_location);
 
   }