diff --git a/distributions/LibreELEC/LibreELEC_40x40.png b/distributions/LibreELEC/LibreELEC_40x40.png
new file mode 100644
index 0000000000..503f2e15fc
Binary files /dev/null and b/distributions/LibreELEC/LibreELEC_40x40.png differ
diff --git a/projects/RPi/options b/projects/RPi/options
index 8bbb15b602..e45d32a7f9 100644
--- a/projects/RPi/options
+++ b/projects/RPi/options
@@ -63,7 +63,7 @@
     NOOBS_HEX="2,3,4,5,6,7,8,9,d,e,f,10,11,12,14,19,0092,0093"
 
   # NOOBS supported model versions
-    NOOBS_SUPPORTED_MODELS="'Pi Model','Pi Compute Module','Pi Zero'"
+    NOOBS_SUPPORTED_MODELS='"Pi Model","Pi Compute Module","Pi Zero"'
 
 ################################################################################
 # setup build defaults
diff --git a/projects/RPi2/options b/projects/RPi2/options
index f719f4a677..ccca477e3c 100644
--- a/projects/RPi2/options
+++ b/projects/RPi2/options
@@ -63,7 +63,7 @@
     NOOBS_HEX="1040,1041,2082"
 
   # NOOBS supported model versions
-    NOOBS_SUPPORTED_MODELS="'Pi 2','Pi 3'"
+    NOOBS_SUPPORTED_MODELS='"Pi 2","Pi 3"'
 
 ################################################################################
 # setup build defaults
diff --git a/scripts/image b/scripts/image
index b66ea2a052..9d774264ff 100755
--- a/scripts/image
+++ b/scripts/image
@@ -449,7 +449,11 @@ fi
     # create release dir
       mkdir -p $RELEASE_DIR/${DISTRONAME}_${PROJECT}
 
-      cp -PR $DISTRO_DIR/$DISTRO/${DISTRONAME}.png $RELEASE_DIR/${DISTRONAME}_${PROJECT}/${DISTRONAME}_${PROJECT}.png
+      if [ -f $DISTRO_DIR/$DISTRO/${DISTRONAME}_40x40.png ]; then
+        cp -PR $DISTRO_DIR/$DISTRO/${DISTRONAME}_40x40.png $RELEASE_DIR/${DISTRONAME}_${PROJECT}/${DISTRONAME}_${PROJECT}.png
+      else
+        cp -PR $DISTRO_DIR/$DISTRO/${DISTRONAME}.png $RELEASE_DIR/${DISTRONAME}_${PROJECT}/${DISTRONAME}_${PROJECT}.png
+      fi
       cp -PR $ROOT/config/noobs/os.json $RELEASE_DIR/${DISTRONAME}_${PROJECT}
       cp -PR $ROOT/config/noobs/partition_setup.sh $RELEASE_DIR/${DISTRONAME}_${PROJECT}
       cp -PR $ROOT/config/noobs/partitions.json $RELEASE_DIR/${DISTRONAME}_${PROJECT}