diff --git a/sites/all/modules/contrib/lightbox2/js/lightbox.js b/sites/all/modules/contrib/lightbox2/js/lightbox.js
index b5af5bb..dd11e5b 100644
--- a/sites/all/modules/contrib/lightbox2/js/lightbox.js
+++ b/sites/all/modules/contrib/lightbox2/js/lightbox.js
@@ -1078,8 +1078,10 @@ Lightbox = {
 
   // setStyles()
   setStyles: function(item, styles) {
-    item.width = Lightbox.iframe_width;
-    item.height = Lightbox.iframe_height;
+    //item.width = Lightbox.iframe_width;
+    //item.height = Lightbox.iframe_height;
+    item.width = (jQuery(window).width()) * (Lightbox.iframe_width/100);
+    item.height = (jQuery(window).height()) * (Lightbox.iframe_height/100);
     item.scrolling = "auto";
 
     if (!styles) return item;
diff --git a/sites/all/modules/contrib/lightbox2/lightbox2.admin.inc b/sites/all/modules/contrib/lightbox2/lightbox2.admin.inc
index fef1644..f8f48d2 100644
--- a/sites/all/modules/contrib/lightbox2/lightbox2.admin.inc
+++ b/sites/all/modules/contrib/lightbox2/lightbox2.admin.inc
@@ -450,6 +450,12 @@ function lightbox2_general_settings_form() {
     '#collapsible' => TRUE,
     '#collapsed' => TRUE,
   );
+    $form['advanced_options']['iframe_settings'] = array(
+    '#type' => 'fieldset',
+    '#title' => t('Iframe settings'),
+    '#collapsible' => TRUE,
+    '#collapsed' => TRUE,
+  );
   // Add checkbox for overlay opacity.
   for ($i = 0; $i < 10; $i++) {
     $opacity_options["0.$i"] = "0.$i";
@@ -472,6 +478,23 @@ function lightbox2_general_settings_form() {
     '#description' => t('Enter a hexadecimal color value for the overlay.  For example <code>000</code> or <code>000000</code> for black).'),
     '#default_value' => variable_get('lightbox2_overlay_color', '000'),
   );
+  $form['advanced_options']['iframe_settings']['lightbox2_default_frame_width'] = array(
+    '#type' => 'textfield',
+    '#title' => t('iFrame width'),
+    '#size' => 6,
+    '#maxlength' => 6,
+    '#description' => t('Set desired iframe width in percents. Do not put "%" symbol.'),
+    '#default_value' => variable_get('lightbox2_default_frame_width', 50),
+  );
+
+  $form['advanced_options']['iframe_settings']['lightbox2_default_frame_height'] = array(
+    '#type' => 'textfield',
+    '#title' => t('iFrame height'),
+    '#size' => 6,
+    '#maxlength' => 6,
+    '#description' => t('Set desired iframe height in percents. Do not put "%" symbol.'),
+    '#default_value' => variable_get('lightbox2_default_frame_height', 50),
+  );
 
 
   // Define animation settings fieldset.
@@ -545,6 +568,16 @@ function lightbox2_general_settings_form_validate($form, &$form_state) {
     $fadein_speed = $form_state['values']['lightbox2_fadein_speed'];
     $slide_down_speed = $form_state['values']['lightbox2_slidedown_speed'];
     $flv_player_path = $form_state['values']['lightbox2_flv_player_path'];
+    $overlay_frame_width = $form_state['values']['lightbox2_default_frame_width'];
+    $overlay_frame_height = $form_state['values']['lightbox2_default_frame_height'];
+
+    if (!empty($overlay_frame_width) && (!is_numeric($overlay_frame_width) || $overlay_frame_width < 10 || $overlay_frame_width > 100)) {
+      form_set_error('lightbox2_default_frame_width', t('You must enter a proper value for Iframe width. Use only numbers from 10 to 100. Do not use "%" symbol.'));
+    }
+
+    if (!empty($overlay_frame_height) && (!is_numeric($overlay_frame_height) || $overlay_frame_height < 10 || $overlay_frame_height > 100)) {
+      form_set_error('lightbox2_default_frame_height', t('You must enter a proper value Iframe height. Use only numbers from 10 to 100. Do not use "%" symbol.'));
+    }
 
     if (!empty($flv_player_path) && $form_state['values']['lightbox2_enable_video']) {
       if (strpos($flv_player_path, base_path()) === 0) {
diff --git a/sites/all/modules/contrib/lightbox2/lightbox2.module b/sites/all/modules/contrib/lightbox2/lightbox2.module
index f7d4b97..e809a76 100644
--- a/sites/all/modules/contrib/lightbox2/lightbox2.module
+++ b/sites/all/modules/contrib/lightbox2/lightbox2.module
@@ -742,8 +742,8 @@ function lightbox2_add_files() {
     'pause_on_previous_click' => variable_get('lightbox2_slideshow_pause_on_previous_click', TRUE),
     'loop_slides' => variable_get('lightbox2_loop_slides', FALSE),
     // Iframe settings.
-    'iframe_width' => (int)variable_get('lightbox2_default_frame_width', 600),
-    'iframe_height' => (int)variable_get('lightbox2_default_frame_height', 400),
+    'iframe_width' => (int)variable_get('lightbox2_default_frame_width', 50),
+    'iframe_height' => (int)variable_get('lightbox2_default_frame_height', 50),
     'iframe_border' => (int)variable_get('lightbox2_frame_border', 1),
     // Video settings.
     'enable_video' => $enable_video,
@@ -936,7 +936,7 @@ function lightbox2_field_formatter_info() {
 
 /**
  * Implements hook_field_formatter_view().
- * 
+ *
  * Temporarily a (pretty much) straight copy of image's
  */
 function lightbox2_field_formatter_view($entity_type, $entity, $field, $instance, $langcode, $items, $display) {
@@ -1174,7 +1174,7 @@ function lightbox2_theme($existing, $type, $theme, $path) {
       }
     }
   }
-  
+
   // Additional Insert theme functions.
   if (module_exists('insert')) {
     // Theme functions in lightbox2.insert.inc.