diff --git a/fp-plugins/photoswipe/photoswipefunctions.class.php b/fp-plugins/photoswipe/photoswipefunctions.class.php
index 5bd4410..ab9fc6f 100644
--- a/fp-plugins/photoswipe/photoswipefunctions.class.php
+++ b/fp-plugins/photoswipe/photoswipefunctions.class.php
@@ -58,10 +58,10 @@ class PhotoSwipeFunctions {
 		// for usage in HTML attributes, we need to remove quotes and HTML tags from the title
 		$titleForAttributes = isset($attr ['title']) ? htmlentities(strip_tags($attr ['title'])) : '';
 
-		// image may float, according the the given float attribute
-		$float = ' class="thumbnail nofloat" ';
+		// image may float, according the the given float attribute - if not given, use "nofloat" class
+		$floatClasses = 'thumbnail nofloat';
 		if (isset($attr ['float'])) {
-			$float = ' class="thumbnail float' . $attr ['float'] . '"';
+			$floatClasses = 'float' . $attr ['float'];
 		}
 
 		// to get the HTML code for preview image, we use the Flatpress standard function do_bbcode_img()
@@ -78,28 +78,34 @@ class PhotoSwipeFunctions {
 		$previewHtml .= ' itemprop="thumbnail" title="' . $titleForAttributes . '">';
 
 		// PhotoSwipe needs to know the dimensions of the image - so we read them
-		$imgsize = getimagesize($imgPathRel);
+		$imgsize = @getimagesize($imgPathRel);
+		$datasizeAttr = ($imgsize === false) ? '' : 'data-size="' . $imgsize [0] . 'x' . $imgsize [1] . '" ';
+
+		// set max width of the figure according to the width attribute
+		$styleAttr = isset($attr ['width']) ? ' style="width:' . $attr ['width'] . 'px" ' : '';
 
 		// now lets assemble the whole HTML code - including the overlay HTML, if not inserted into the DOM before
 		$imgHtml = self::getPhotoSwipeOverlay() . //
-		'<div class="photoswipe">
-				<figure ' . //
+		'<div ' . //
+		'class="photoswipe ' . $floatClasses . '"' . $styleAttr . //
+		'>' . //
+		'<figure ' . //
 		'itemprop="associatedMedia" ' . //
 		'itemscope ' . //
 		'itemtype="http://schema.org/ImageObject" ' . //
 		'data-index="' . self::$lastusedDataIndex . '" ' . //
-		$float . ' ' . //
+		'class="' . $floatClasses . '" ' . //
 		'>' . //
 		'<a ' . //
 		'href="' . $imgUrl . '" ' . //
 		'itemprop="contentUrl" ' . //
-		'data-size="' . $imgsize [0] . 'x' . $imgsize [1] . '" ' . //
+		$datasizeAttr . //
 		'data-index="' . self::$lastusedDataIndex . '" ' . //
 		'title="' . htmlentities($title) . '" ' . //
 		'>' . //
 		$previewHtml . //
 		'</a>' . //
-		'<figcaption>' . $title . '</figcaption>' . //
+		'<figcaption' . $styleAttr . '>' . $title . '</figcaption>' . //
 		'</figure>' . //
 		'</div>';
 
diff --git a/fp-plugins/photoswipe/res/photoswipe-4.1.1/photoswipe.css b/fp-plugins/photoswipe/res/photoswipe-4.1.1/photoswipe.css
index 26d9e3f..d2df090 100644
--- a/fp-plugins/photoswipe/res/photoswipe-4.1.1/photoswipe.css
+++ b/fp-plugins/photoswipe/res/photoswipe-4.1.1/photoswipe.css
@@ -199,23 +199,22 @@ div.photoswipe figcaption {
 	text-align:center;
 }
 
-div.photoswipe figure.floatleft {
+div.floatleft {
 	float:left;
 	margin:0 1em 1em 0;
 }
-div.photoswipe figure.floatleft img.floatleft {
+div.floatleft img.floatleft {
 	float:none;
 }
-div.photoswipe figure.floatright {
+div.floatright {
 	float:right;
 	margin:0 0 1em 1em;
 }
-div.photoswipe figure.floatright img.floatright {
+div.floatright img.floatright {
 	float:none;
 }
 .img-gallery div.photoswipe figure {
 	display:inline-block;
-	width:140px;
 	vertical-align: top;
 	text-align:center;
 	margin:.5em 1em 0 0;