diff --git a/oc-admin/controller/settings/media.php b/oc-admin/controller/settings/media.php
index c98612590d..555030bd31 100644
--- a/oc-admin/controller/settings/media.php
+++ b/oc-admin/controller/settings/media.php
@@ -53,18 +53,21 @@ function doModel()
                     $forceJPEG         = Params::getParam('force_jpeg');
                     $use_imagick       = Params::getParam('use_imagick');
                     $type_watermark    = Params::getParam('watermark_type');
-                    $watermark_color   = Params::getParam('watermark_text_color');
-                    $watermark_text    = Params::getParam('watermark_text');
+                    $watermark_text       = Params::getParam('watermark_text');
+                    $watermark_text_size  = Params::getParam('watermark_text_size');
+                    $watermark_text_color = Params::getParam('watermark_text_color');
 
                     switch ($type_watermark) {
                         case 'none':
-                            $iUpdated += osc_set_preference('watermark_text_color', '');
                             $iUpdated += osc_set_preference('watermark_text', '');
+                            $iUpdated += osc_set_preference('watermark_text_size', '');
+                            $iUpdated += osc_set_preference('watermark_text_color', '');
                             $iUpdated += osc_set_preference('watermark_image', '');
                         break;
                         case 'text':
-                            $iUpdated += osc_set_preference('watermark_text_color', $watermark_color);
                             $iUpdated += osc_set_preference('watermark_text', $watermark_text);
+                            $iUpdated += osc_set_preference('watermark_text_size', $watermark_text_size);
+                            $iUpdated += osc_set_preference('watermark_text_color', $watermark_text_color);
                             $iUpdated += osc_set_preference('watermark_image', '');
                             $iUpdated += osc_set_preference('watermark_place', Params::getParam('watermark_text_place'));
                         break;
@@ -91,8 +94,9 @@ function doModel()
                                     $error .= _m('There was a problem uploading the watermark image')."<br />";
                                 }
                             }
-                            $iUpdated += osc_set_preference('watermark_text_color', '');
                             $iUpdated += osc_set_preference('watermark_text', '');
+                            $iUpdated += osc_set_preference('watermark_text_size', '');
+                            $iUpdated += osc_set_preference('watermark_text_color', '');
                             $iUpdated += osc_set_preference('watermark_place', Params::getParam('watermark_image_place'));
                         break;
                         default:
diff --git a/oc-admin/themes/modern/settings/media.php b/oc-admin/themes/modern/settings/media.php
index 63297814af..868858e0f1 100644
--- a/oc-admin/themes/modern/settings/media.php
+++ b/oc-admin/themes/modern/settings/media.php
@@ -272,6 +272,12 @@ function customPageTitle($string) {
                             <input type="text" class="large" name="watermark_text" value="<?php echo osc_esc_html( osc_watermark_text() ); ?>" />
                         </div>
                     </div>
+                    <div class="form-row">
+                        <div class="form-label"><?php _e('Size'); ?></div>
+                        <div class="form-controls">
+                            <input type="text" class="large" name="watermark_text_size" value="<?php echo osc_esc_html( osc_watermark_text_size() ); ?>" />
+                        </div>
+                    </div>
                     <div class="form-row">
                         <div class="form-label"><?php _e('Color'); ?></div>
                         <div class="form-controls">
diff --git a/oc-includes/osclass/ItemActions.php b/oc-includes/osclass/ItemActions.php
index 33057ef55f..85815f8c69 100755
--- a/oc-includes/osclass/ItemActions.php
+++ b/oc-includes/osclass/ItemActions.php
@@ -1390,7 +1390,7 @@ public function uploadItemResources($aResources,$itemId)
                             $size = explode('x', osc_normal_dimensions());
                             $img = ImageResizer::fromFile($tmpName)->autoRotate()->resizeTo($size[0], $size[1]);
                             if( osc_is_watermark_text() ) {
-                                $img->doWatermarkText(osc_watermark_text(), osc_watermark_text_color());
+                                $img->doWatermarkText(osc_watermark_text(), osc_watermark_text_color(), osc_watermark_text_size());
                             } else if ( osc_is_watermark_image() ){
                                 $img->doWatermarkImage();
                             }
diff --git a/oc-includes/osclass/classes/ImageProcessing.php b/oc-includes/osclass/classes/ImageProcessing.php
index 0afa156e2f..dc5f3bf251 100755
--- a/oc-includes/osclass/classes/ImageProcessing.php
+++ b/oc-includes/osclass/classes/ImageProcessing.php
@@ -248,14 +248,14 @@ public function show() {
             }
         }
 
-        public function doWatermarkText($text, $color = 'ff0000') {
+        public function doWatermarkText($text, $color = 'ff0000', $fontsize = '30') {
             $this->_watermarked = true;
             $this->_font = osc_apply_filter('watermark_font_path', LIB_PATH . "osclass/assets/fonts/Arial.ttf");
             if(osc_use_imagick()) {
                 $draw = new ImagickDraw();
                 $draw->setFillColor("#".$color);
                 $draw->setFont($this->_font);
-                $draw->setFontSize( 30 );
+                $draw->setFontSize( $fontsize );
                 $metrics = $this->im->queryFontMetrics($draw, $text);
                 switch(osc_watermark_place()) {
                     case 'tl':
@@ -289,7 +289,7 @@ public function doWatermarkText($text, $color = 'ff0000') {
                 }
                 $color  = $this->_imageColorAllocateHex($color);
                 $offset = $this->_calculateOffset($text);
-                imagettftext($this->im, 20, 0, $offset['x'], $offset['y'], $color, $this->_font , html_entity_decode($text, null, "UTF-8"));
+                imagettftext($this->im, $fontsize, 0, $offset['x'], $offset['y'], $color, $this->_font , html_entity_decode($text, null, "UTF-8"));
             }
             return $this;
         }
diff --git a/oc-includes/osclass/helpers/hPreference.php b/oc-includes/osclass/helpers/hPreference.php
index e419f34bf2..5fe7b86343 100755
--- a/oc-includes/osclass/helpers/hPreference.php
+++ b/oc-includes/osclass/helpers/hPreference.php
@@ -1017,21 +1017,30 @@ function osc_is_watermark_image() {
     }
 
     /**
-     * Return watermark text color
+     * Return watermark text
      *
      * @return string
      */
-    function osc_watermark_text_color() {
-        return getPreference('watermark_text_color');
+    function osc_watermark_text() {
+        return getPreference('watermark_text');
     }
 
     /**
-     * Return watermark text
+     * Return watermark text size
      *
      * @return string
      */
-    function osc_watermark_text() {
-        return getPreference('watermark_text');
+    function osc_watermark_text_size() {
+        return getPreference('watermark_text_size');
+    }
+
+    /**
+     * Return watermark text color
+     *
+     * @return string
+     */
+    function osc_watermark_text_color() {
+        return getPreference('watermark_text_color');
     }
 
     /**
diff --git a/oc-includes/osclass/installer/basic_data.sql b/oc-includes/osclass/installer/basic_data.sql
index 37454316c0..91b1d5950a 100755
--- a/oc-includes/osclass/installer/basic_data.sql
+++ b/oc-includes/osclass/installer/basic_data.sql
@@ -125,6 +125,7 @@ INSERT INTO /*TABLE_PREFIX*/t_preference VALUES
     ,('osclass', 'marketCategories', '', 'STRING')
     ,('osclass', 'marketDataUpdate', '0', 'INTEGER')
     ,('osclass', 'watermark_text', '', 'STRING')
+    ,('osclass', 'watermark_text_size', '30', 'STRING')
     ,('osclass', 'watermark_text_color', '', 'STRING')
     ,('osclass', 'watermark_place', 'centre', 'STRING')
     ,('osclass', 'watermark_image', '', 'STRING')
diff --git a/oc-includes/osclass/upgrade-funcs.php b/oc-includes/osclass/upgrade-funcs.php
index 5d076adda7..a2c23c8c00 100755
--- a/oc-includes/osclass/upgrade-funcs.php
+++ b/oc-includes/osclass/upgrade-funcs.php
@@ -513,6 +513,10 @@
         osc_set_preference('marketURL', 'http://market.osclass.org/api/v2/');
     }
 
+    if(osc_version() < 357) {
+        osc_set_preference('watermark_text_size', '30');
+    }
+
     osc_changeVersionTo(357);
 
     if(!defined('IS_AJAX') || !IS_AJAX) {