diff --git a/admin/include/functions_metadata.php b/admin/include/functions_metadata.php
index f5bae4c2a..4bc41c483 100644
--- a/admin/include/functions_metadata.php
+++ b/admin/include/functions_metadata.php
@@ -191,14 +191,13 @@ function get_sync_metadata($infos)
 
     $xmlget = simplexml_load_string($xml);
     $xmlattributes = $xmlget->attributes();
-    $width = (string) $xmlattributes->width; 
-    $height = (string) $xmlattributes->height;
+    $width = (int) $xmlattributes->width; 
+    $height = (int) $xmlattributes->height;
     $vb = (string) $xmlattributes->viewBox;
 
-
     $infos['is_svg'] = $is_svg;
 
-    if (isset($width))
+    if (isset($width) and $width != "")
     {
       $infos['width'] = $width;
     } elseif (isset($vb))
@@ -206,7 +205,7 @@ function get_sync_metadata($infos)
       $infos['width'] = explode(" ", $vb)[2];
     }
 
-    if (isset($height))
+    if (isset($height) and $height != "")
     {
       $infos['height'] = $height;
     } elseif (isset($vb))
diff --git a/themes/default/template/picture_content.tpl b/themes/default/template/picture_content.tpl
index 436e4aa91..fbc2a8e2e 100644
--- a/themes/default/template/picture_content.tpl
+++ b/themes/default/template/picture_content.tpl
@@ -4,7 +4,7 @@
 {footer_script}var error_icon = "{$ROOT_URL}{$themeconf.icon_dir}/errors_small.png"{/footer_script}
 {/if}
 
-<img {if $current.is_svg}src="{$current.path}"{elseif $current.selected_derivative->is_cached()}src="{$current.selected_derivative->get_url()}"{$current.selected_derivative->get_size_htm()}{else}src="{$ROOT_URL}{$themeconf.img_dir}/ajax_loader.gif" data-src="{$current.selected_derivative->get_url()}"{/if} alt="{$ALT_IMG}" id="theMainImage" usemap="#map{$current.selected_derivative->get_type()}" title="{if isset($COMMENT_IMG)}{$COMMENT_IMG|@strip_tags:false|@replace:'"':' '}{else}{$current.TITLE_ESC} - {$ALT_IMG}{/if}">
+<img {if $current.is_svg}src="{$current.path}" style="{if $current.width < 150}min-width: 200px; {else} max-width:{$current.width}; {/if} {if $current.height < 150} min-height: 200px;{else} max-height: {$current.height} {/if}" {elseif $current.selected_derivative->is_cached()}src="{$current.selected_derivative->get_url()}"{$current.selected_derivative->get_size_htm()}{else}src="{$ROOT_URL}{$themeconf.img_dir}/ajax_loader.gif" data-src="{$current.selected_derivative->get_url()}"{/if} alt="{$ALT_IMG}" id="theMainImage" usemap="#map{$current.selected_derivative->get_type()}" title="{if isset($COMMENT_IMG)}{$COMMENT_IMG|@strip_tags:false|@replace:'"':' '}{else}{$current.TITLE_ESC} - {$ALT_IMG}{/if}">
 
 {foreach from=$current.unique_derivatives item=derivative key=derivative_type}{strip}
 <map name="map{$derivative->get_type()}">