diff --git a/ccm-cms/src/com/arsdigita/cms/CMSConfig.java b/ccm-cms/src/com/arsdigita/cms/CMSConfig.java
index 0ba0ac6b6..7da058806 100755
--- a/ccm-cms/src/com/arsdigita/cms/CMSConfig.java
+++ b/ccm-cms/src/com/arsdigita/cms/CMSConfig.java
@@ -587,12 +587,25 @@ public final class CMSConfig extends AbstractConfig {
             Parameter.REQUIRED,
             "");
 
+    /////////////////////////////////////////////////
+    // ImageBrowser Parameter
+    /////////////////////////////////////////////////
+    private final Parameter m_imageBrowserThumbnailMaxWidth = new IntegerParameter(
+            "com.arsdigita.cms.image_browser.thumbnail_max_width",
+            Parameter.REQUIRED,
+            50);
+    private final Parameter m_imageBrowserThumbnailMaxHeight = new IntegerParameter(
+            "com.arsdigita.cms.image_browser.thumbnail_max_height",
+            Parameter.REQUIRED,
+            50);
+    
     // ///////////////////////////////////////////
     // publishToFile package related parameter
     // ///////////////////////////////////////////
     // Moved to publishToFile.PublishToFileConfig as of version 6.0.2
     // private final Parameter m_disableItemPfs;
     // private final Parameter m_publishToFileClass;
+    
     /**
      * Constructor, but do NOT instantiate this class directly.
      *
@@ -674,7 +687,10 @@ public final class CMSConfig extends AbstractConfig {
         register(m_publishingFailureSender);
         register(m_publishingFailureReceiver);
 
-
+        // ImageBrowser
+        register(m_imageBrowserThumbnailMaxWidth);
+        register(m_imageBrowserThumbnailMaxHeight);
+        
         // publishToFile package related parameter
         // Moved to publishToFile.PublishToFileConfig as of version 6.0.2
         // register(m_disableItemPfs);
@@ -1105,4 +1121,13 @@ public final class CMSConfig extends AbstractConfig {
     public String getPublicationFailureReceiver() {
         return (String) get(m_publishingFailureReceiver);
     }
+
+    public Integer getImageBrowserThumbnailMaxWidth() {
+        return (Integer) get(m_imageBrowserThumbnailMaxWidth);
+    }
+
+    public Integer getImageBrowserThumbnailMaxHeight() {
+        return (Integer) get(m_imageBrowserThumbnailMaxHeight);
+    }
+
 }
diff --git a/ccm-cms/src/com/arsdigita/cms/CMSConfig_parameter.properties b/ccm-cms/src/com/arsdigita/cms/CMSConfig_parameter.properties
index 8c4471064..045ba11c5 100755
--- a/ccm-cms/src/com/arsdigita/cms/CMSConfig_parameter.properties
+++ b/ccm-cms/src/com/arsdigita/cms/CMSConfig_parameter.properties
@@ -269,6 +269,15 @@ cms.arsdigita.cms.lifecycle.threaded_publishing.notify_on_error.to.purpose = ema
 cms.arsdigita.cms.lifecycle.threaded_publishing.notify_on_error.to.example = webmaster@example.org
 cms.arsdigita.cms.lifecycle.threaded_publishing.notify_on_error.to.format = [String]
 
+com.arsdigita.cms.image_browser.thumbnail_max_width.title=Max thumbnails width for ImageBrowser
+com.arsdigita.cms.image_browser.thumbnail_max_width.purpose=Set the maximum width of the thumbnail in ImageBrowserr
+com.arsdigita.cms.image_browser.thumbnail_max_width.example=200
+com.arsdigita.cms.image_browser.thumbnail_max_width.format=[interger]
+
+com.arsdigita.cms.image_browser.thumbnail_max_height.title=Max thumbnails height for ImageBrowser
+com.arsdigita.cms.image_browser.thumbnail_max_height.purpose=Set the maximum height of the thumbnail in ImageBrowserr
+com.arsdigita.cms.image_browser.thumbnail_max_height.example=150
+com.arsdigita.cms.image_browser.thumbnail_max_height.format=[integer]
 
 com.arsdigita.cms.xx.title=
 com.arsdigita.cms.xx.purpose=
diff --git a/ccm-cms/src/com/arsdigita/cms/ui/ImageBrowser.java b/ccm-cms/src/com/arsdigita/cms/ui/ImageBrowser.java
index a95ab6a18..049db1b65 100755
--- a/ccm-cms/src/com/arsdigita/cms/ui/ImageBrowser.java
+++ b/ccm-cms/src/com/arsdigita/cms/ui/ImageBrowser.java
@@ -34,7 +34,6 @@ import com.arsdigita.cms.CMS;
 import com.arsdigita.cms.ImageAsset;
 import com.arsdigita.cms.SecurityManager;
 import com.arsdigita.cms.Service;
-// import com.arsdigita.cms.dispatcher.Utilities;
 import com.arsdigita.domain.DataObjectNotFoundException;
 import com.arsdigita.domain.DomainObjectFactory;
 import com.arsdigita.mimetypes.MimeType;
@@ -86,7 +85,8 @@ public class ImageBrowser extends Table {
      */
     public ImageBrowser(ImageBrowserModelBuilder b) {
         super(new BuilderAdapter(b), HEADERS);
-        setThumbnailSize(200, 150);
+        setThumbnailSize(CMS.getConfig().getImageBrowserThumbnailMaxWidth(),
+                         CMS.getConfig().getImageBrowserThumbnailMaxHeight());
         m_builder = b;
 
         getHeader().setDefaultRenderer(new DefaultTableCellRenderer(false));
@@ -114,7 +114,7 @@ public class ImageBrowser extends Table {
      * Set the thumbnail size
      * @param size  the size, in pixels, of the thumbnail images
      */
-    public void setThumbnailSize(int width, int height) {
+    public final void setThumbnailSize(int width, int height) {
         m_thumbSize = new Dimension(width, height);
     }
 
diff --git a/ccm-sci-bundle/bundles/demo/cfg/integration.properties b/ccm-sci-bundle/bundles/demo/cfg/integration.properties
index 627b51e60..be0bb4d17 100644
--- a/ccm-sci-bundle/bundles/demo/cfg/integration.properties
+++ b/ccm-sci-bundle/bundles/demo/cfg/integration.properties
@@ -73,6 +73,8 @@ com.arsdigita.cms.hide_udct_ui=true
 com.arsdigita.cms.use_section_categories=false
 com.arsdigita.cms.use_streamlined_creation=true
 
+com.arsdigita.cms.image_browser.thumbnail_max_width=200
+com.arsdigita.cms.image_browser.thumbnail_max_height=150
 
 # ccm-cms-types-event parameters
 com.arsdigita.cms.contenttypes.event.hide_cost=true
diff --git a/ccm-sci-bundle/bundles/devel/cfg/integration.properties b/ccm-sci-bundle/bundles/devel/cfg/integration.properties
index 9c3bcce1c..b46aa9fad 100644
--- a/ccm-sci-bundle/bundles/devel/cfg/integration.properties
+++ b/ccm-sci-bundle/bundles/devel/cfg/integration.properties
@@ -73,6 +73,8 @@ com.arsdigita.cms.hide_udct_ui=true
 com.arsdigita.cms.use_section_categories=false
 com.arsdigita.cms.use_streamlined_creation=true
 
+com.arsdigita.cms.image_browser.thumbnail_max_width=200
+com.arsdigita.cms.image_browser.thumbnail_max_height=150
 
 # ccm-cms-types-event parameters
 com.arsdigita.cms.contenttypes.event.hide_cost=true