diff --git a/packages/ezwebin_extension/ezextension/ezwebin/design/ezwebin/override/templates/embed/image.tpl b/packages/ezwebin_extension/ezextension/ezwebin/design/ezwebin/override/templates/embed/image.tpl
index f8f2e921..e9a02cd1 100644
--- a/packages/ezwebin_extension/ezextension/ezwebin/design/ezwebin/override/templates/embed/image.tpl
+++ b/packages/ezwebin_extension/ezextension/ezwebin/design/ezwebin/override/templates/embed/image.tpl
@@ -1,6 +1,9 @@
+{if is_set( $object_parameters.border )}
+ {def $border_values_array = $object_parameters.border|explode( ' ' )}
+{/if}
-
{if is_set( $link_parameters.href )}{attribute_view_gui attribute=$object.data_map.image image_class=$object_parameters.size href=$link_parameters.href|ezurl target=$link_parameters.target link_class=first_set( $link_parameters.class, '' ) link_id=first_set( $link_parameters['xhtml:id'], '' ) link_title=first_set( $link_parameters['xhtml:title'], '' ) border_size=first_set( $object_parameters.border_size, '0' ) border_color=first_set( $object_parameters.border_color, '' ) border_style=first_set( $object_parameters.border_style, 'solid' ) margin_size=first_set( $object_parameters.margin_size, '' )}{else}{attribute_view_gui attribute=$object.data_map.image image_class=$object_parameters.size border_size=first_set( $object_parameters.border_size, '0' ) border_color=first_set( $object_parameters.border_color, '' ) border_style=first_set( $object_parameters.border_style, 'solid' ) margin_size=first_set( $object_parameters.margin_size, '' )}{/if}
+
{if is_set( $link_parameters.href )}{attribute_view_gui attribute=$object.data_map.image image_class=$object_parameters.size href=$link_parameters.href|ezurl target=$link_parameters.target link_class=first_set( $link_parameters.class, '' ) link_id=first_set( $link_parameters['xhtml:id'], '' ) link_title=first_set( $link_parameters['xhtml:title'], '' ) border_size=first_set( $border_values_array[0]|int, $object_parameters.border_size, '0' ) border_color=first_set( $border_values_array[2], $object_parameters.border_color, '' ) border_style=first_set( $border_values_array[1], $object_parameters.border_style, 'solid' ) margin_size=first_set( $object_parameters.margin_size, '' )}{else}{attribute_view_gui attribute=$object.data_map.image image_class=$object_parameters.size border_size=first_set( $border_values_array[0]|int, $object_parameters.border_size, '0' ) border_color=first_set( $border_values_array[2], $object_parameters.border_color, '' ) border_style=first_set( $border_values_array[1], $object_parameters.border_style, 'solid' ) margin_size=first_set( $object_parameters.margin_size, '' )}{/if}
{if $object.data_map.caption.has_content}
{if is_set( $object.data_map.image.content[$object_parameters.size].width )}