diff --git a/application/language/en-GB/config_lang.php b/application/language/en-GB/config_lang.php
index 158a93cb3..bdf7af024 100644
--- a/application/language/en-GB/config_lang.php
+++ b/application/language/en-GB/config_lang.php
@@ -135,6 +135,11 @@ $lang["config_general_configuration"] = "General Configuration";
 $lang["config_giftcard_number"] = "Gift Card Number";
 $lang["config_giftcard_random"] = "Generate Random";
 $lang["config_giftcard_series"] = "Generate in Series";
+$lang["config_image_allowed_file_types"] = "Allowed file types";
+$lang["config_image_max_height_tooltip"] = "Maximum allowed height of image uploads in pixels (px).";
+$lang["config_image_max_size_tooltip"] = "Maximum allowed file size of image uploads in kilobytes (kb).";
+$lang["config_image_max_width_tooltip"] = "Maximum allowed width of image uploads in pixels (px).";
+$lang["config_image_restrictions"] = "Image Upload Restrictions";
 $lang["config_include_hsn"] = "Include Support for HSN Codes";
 $lang["config_info"] = "Information";
 $lang["config_info_configuration"] = "Shop Information";
diff --git a/application/language/en-US/config_lang.php b/application/language/en-US/config_lang.php
index 8f89e8bdb..e7d9ea4c6 100644
--- a/application/language/en-US/config_lang.php
+++ b/application/language/en-US/config_lang.php
@@ -135,6 +135,11 @@ $lang["config_general_configuration"] = "General Configuration";
 $lang["config_giftcard_number"] = "Gift Card Number";
 $lang["config_giftcard_random"] = "Generate Random";
 $lang["config_giftcard_series"] = "Generate in Series";
+$lang["config_image_allowed_file_types"] = "Allowed file types";
+$lang["config_image_max_height_tooltip"] = "Maximum allowed height of image uploads in pixels (px).";
+$lang["config_image_max_size_tooltip"] = "Maximum allowed file size of image uploads in kilobytes (kb).";
+$lang["config_image_max_width_tooltip"] = "Maximum allowed width of image uploads in pixels (px).";
+$lang["config_image_restrictions"] = "Image Upload Restrictions";
 $lang["config_include_hsn"] = "Include Support for HSN Codes";
 $lang["config_info"] = "Information";
 $lang["config_info_configuration"] = "Store Information";
diff --git a/application/views/configs/general_config.php b/application/views/configs/general_config.php
index e84edcfc7..77882894a 100644
--- a/application/views/configs/general_config.php
+++ b/application/views/configs/general_config.php
@@ -25,14 +25,14 @@
 							'value' => $this->config->item('default_sales_discount'))); ?>
 						<span class="input-group-btn">
 							<?php echo form_checkbox(array(
-								'id' => 'default_sales_discount_type', 
-								'name' => 'default_sales_discount_type', 
-								'value' => 1, 
+								'id' => 'default_sales_discount_type',
+								'name' => 'default_sales_discount_type',
+								'value' => 1,
 								'data-toggle' => 'toggle',
-								'data-size' => 'normal', 
-								'data-onstyle' => 'success', 
-								'data-on' => '<b>'.$this->config->item('currency_symbol').'</b>', 
-								'data-off' => '<b>%</b>', 
+								'data-size' => 'normal',
+								'data-onstyle' => 'success',
+								'data-on' => '<b>'.$this->config->item('currency_symbol').'</b>',
+								'data-off' => '<b>%</b>',
 								'checked' => $this->config->item('default_sales_discount_type'))); ?>
 						</span>
 					</div>
@@ -122,9 +122,80 @@
 							<?php echo form_dropdown('notify_horizontal_position', array(
 									'left' => $this->lang->line('config_left'),
 									'center' => $this->lang->line('config_center'),
-									'right' => $this->lang->line('config_right')
-								),
-								$this->config->item('notify_horizontal_position'), array('class' => 'form-control input-sm')); ?>
+									'right' => $this->lang->line('config_right')),
+									$this->config->item('notify_horizontal_position'), array('class' => 'form-control input-sm')); ?>
+						</div>
+					</div>
+				</div>
+			</div>
+
+			<div class="form-group form-group-sm">
+				<?php echo form_label($this->lang->line('config_image_restrictions'), 'image_restrictions', array('class' => 'control-label col-xs-2')); ?>
+				<div class="col-sm-10">
+					<div class="form-group form-group-sm row">
+						<div class='col-sm-2'>
+							<div class='input-group'>
+								<span class="input-group-addon input-sm"><span class="glyphicon glyphicon-resize-horizontal"></span></span>
+								<?php echo form_input(array(
+									'name' => 'max_image_width',
+									'id' => 'max_image_width',
+									'class' => 'form-control input-sm required',
+									'type' => 'number',
+									'min' => 128,
+									'max' => 3840,
+									'value' => $this->config->item('max_image_width'),
+									'data-toggle' => 'tooltip',
+									'data-placement' => 'top',
+									'title' => $this->lang->line('config_image_max_width_tooltip')));
+								?>
+							</div>
+						</div>
+						<div class='col-sm-2'>
+							<div class='input-group'>
+								<span class="input-group-addon input-sm"><span class="glyphicon glyphicon-resize-vertical"></span></span>
+								<?php echo form_input(array(
+									'name' => 'max_image_height',
+									'id' => 'max_image_height',
+									'class' => 'form-control input-sm required',
+									'type' => 'number',
+									'min' => 128,
+									'max' => 3840,
+									'value' => $this->config->item('max_image_height'),
+									'data-toggle' => 'tooltip',
+									'data-placement' => 'top',
+									'title' => $this->lang->line('config_image_max_height_tooltip')));
+								?>
+							</div>
+						</div>
+						<div class='col-sm-2'>
+							<div class='input-group'>
+								<span class="input-group-addon input-sm"><span class="glyphicon glyphicon-hdd"></span></span>
+								<?php echo form_input(array(
+									'name' => 'max_image_size',
+									'id' => 'max_image_size',
+									'class' => 'form-control input-sm required',
+									'type' => 'number',
+									'min' => 128,
+									'max' => 2048,
+									'value' => $this->config->item('max_image_size'),
+									'data-toggle' => 'tooltip',
+									'data-placement' => 'top',
+									'title' => $this->lang->line('config_image_max_size_tooltip')));
+								?>
+							</div>
+						</div>
+						<div class='col-sm-4'>
+							<div class='input-group'>
+								<span class="input-group-addon input-sm"><?php echo $this->lang->line('config_image_allowed_file_types');?></span>
+								<?php echo form_multiselect('image_allowed_types[]', array('jpg','jpeg','gif','svg','webp','bmp','png','tif','tiff'), array_keys($selected_image_allowed_types), array(
+									'id'=>'image_allowed_types',
+									'class'=>'selectpicker show-menu-arrow',
+									'data-none-selected-text'=>$this->lang->line('common_none_selected_text'),
+									'data-selected-text-format'=>'count > 1',
+									'data-style'=>'btn-default btn-sm',
+									'data-width'=>'100%'));
+								?>
+							</div>
 						</div>
 					</div>
 				</div>
@@ -138,7 +209,7 @@
 						'id' => 'gcaptcha_enable',
 						'value' => 'gcaptcha_enable',
 						'checked' => $this->config->item('gcaptcha_enable'))); ?>
-					&nbsp
+					&nbsp;
 					<label class="control-label">
 						<a href="https://www.google.com/recaptcha/admin" target="_blank">
 							<span class="glyphicon glyphicon-info-sign" data-toggle="tooltip" data-placement="right" title="<?php echo $this->lang->line('config_gcaptcha_tooltip'); ?>"></span>
@@ -173,34 +244,37 @@
 				<?php echo form_label($this->lang->line('config_suggestions_layout'), 'suggestions_layout', array('class' => 'control-label col-xs-2')); ?>
 				<div class="col-sm-10">
 					<div class="form-group form-group-sm row">
-						<label class="control-label col-sm-1"><?php echo $this->lang->line('config_suggestions_first_column').' '; ?></label>
-						<div class='col-sm-2'>
-							<?php echo form_dropdown('suggestions_first_column', array(
-								'name' => $this->lang->line('items_name'),
-								'item_number' => $this->lang->line('items_number_information'),
-								'unit_price' => $this->lang->line('items_unit_price')
-							),
-							$this->config->item('suggestions_first_column'), array('class' => 'form-control input-sm')); ?>
+						<div class='col-sm-3'>
+							<div class='input-group'>
+								<span class="input-group-addon input-sm"><?php echo $this->lang->line('config_suggestions_first_column'); ?></span>
+								<?php echo form_dropdown('suggestions_first_column', array(
+									'name' => $this->lang->line('items_name'),
+									'item_number' => $this->lang->line('items_number_information'),
+									'unit_price' => $this->lang->line('items_unit_price')),
+									$this->config->item('suggestions_first_column'), array('class' => 'form-control input-sm')); ?>
+							</div>
 						</div>
-						<label class="control-label col-sm-1"><?php echo $this->lang->line('config_suggestions_second_column').' '; ?></label>
-						<div class='col-sm-2'>
-							<?php echo form_dropdown('suggestions_second_column', array(
+						<div class='col-sm-3'>
+							<div class='input-group'>
+								<span class="input-group-addon input-sm"><?php echo $this->lang->line('config_suggestions_second_column'); ?></span>
+								<?php echo form_dropdown('suggestions_second_column', array(
 									'' => $this->lang->line('config_none'),
 									'name' => $this->lang->line('items_name'),
 									'item_number' => $this->lang->line('items_number_information'),
-									'unit_price' => $this->lang->line('items_unit_price')
-							),
-							$this->config->item('suggestions_second_column'), array('class' => 'form-control input-sm')); ?>
+									'unit_price' => $this->lang->line('items_unit_price')),
+									$this->config->item('suggestions_second_column'), array('class' => 'form-control input-sm')); ?>
+							</div>
 						</div>
-						<label class="control-label col-sm-1"><?php echo $this->lang->line('config_suggestions_third_column').' '; ?></label>
-						<div class='col-sm-2'>
-							<?php echo form_dropdown('suggestions_third_column', array(
+						<div class='col-sm-3'>
+							<div class='input-group'>
+								<span class="input-group-addon input-sm"><?php echo $this->lang->line('config_suggestions_second_column'); ?></span>
+								<?php echo form_dropdown('suggestions_third_column', array(
 									'' => $this->lang->line('config_none'),
 									'name' => $this->lang->line('items_name'),
 									'item_number' => $this->lang->line('items_number_information'),
-									'unit_price' => $this->lang->line('items_unit_price')
-						),
-							$this->config->item('suggestions_third_column'), array('class' => 'form-control input-sm')); ?>
+									'unit_price' => $this->lang->line('items_unit_price')),
+									$this->config->item('suggestions_third_column'), array('class' => 'form-control input-sm')); ?>
+							</div>
 						</div>
 					</div>
 				</div>