diff --git a/templates/djangocms_picture/default/picture.html b/templates/djangocms_picture/default/picture.html
index 158fe4a..5e1dcd8 100644
--- a/templates/djangocms_picture/default/picture.html
+++ b/templates/djangocms_picture/default/picture.html
@@ -1,6 +1,6 @@
 {% load thumbnail %}
 
-<div class="picture reveal_container{% if not instance.width and not instance.height %} full{% endif %}">
+<div class="picture reveal_container{% if not instance.width and not instance.height %} full{% endif %}{% if instance.width == 1 %} full_width{% endif %}">
     {% if picture_link %}
         <a href="{{ picture_link }}"
                 {% if instance.link_target %} target="{{ instance.link_target }}"{% endif %}
@@ -26,7 +26,7 @@
     {% endif %}{% endspaceless %}"
                 {% if instance.picture.default_alt_text and not instance.attributes.alt %}
              alt="{{ instance.picture.default_alt_text }}"{% endif %}
-                {% if instance.width %} width="{{ instance.width }}"{% endif %}
+                {% if instance.width > 1 %} width="{{ instance.width }}"{% endif %}
                 {% if instance.height %} height="{{ instance.height }}"{% endif %}
                 {{ instance.attributes_str }}
         >