diff --git a/retroshare-gui/src/gui/Identity/IdEditDialog.cpp b/retroshare-gui/src/gui/Identity/IdEditDialog.cpp
index ad46cc19b..5b7991c6f 100644
--- a/retroshare-gui/src/gui/Identity/IdEditDialog.cpp
+++ b/retroshare-gui/src/gui/Identity/IdEditDialog.cpp
@@ -577,7 +577,7 @@ void IdEditDialog::createId()
         QBuffer buffer(&ba);
 
         buffer.open(QIODevice::WriteOnly);
-        mAvatar.save(&buffer, "JPG"); // writes image into ba in PNG format
+        mAvatar.save(&buffer, "PNG"); // writes image into ba in PNG format
 
         params.mImage.copy((uint8_t *) ba.data(), ba.size());
     }
@@ -649,7 +649,7 @@ void IdEditDialog::updateId()
 		QBuffer buffer(&ba);
 
 		buffer.open(QIODevice::WriteOnly);
-        mAvatar.save(&buffer, "JPG"); // writes image into ba in PNG format
+        mAvatar.save(&buffer, "PNG"); // writes image into ba in PNG format
 
 		mEditGroup.mImage.copy((uint8_t *) ba.data(), ba.size());
 	}
diff --git a/retroshare-gui/src/gui/Posted/PostedGroupDialog.cpp b/retroshare-gui/src/gui/Posted/PostedGroupDialog.cpp
index b4791f5ca..b4b544810 100644
--- a/retroshare-gui/src/gui/Posted/PostedGroupDialog.cpp
+++ b/retroshare-gui/src/gui/Posted/PostedGroupDialog.cpp
@@ -105,7 +105,7 @@ void PostedGroupDialog::preparePostedGroup(RsPostedGroup &group, const RsGroupMe
 		QBuffer buffer(&ba);
 
 		buffer.open(QIODevice::WriteOnly);
-        pixmap.save(&buffer, "JPG"); // writes image into ba in PNG format
+        pixmap.save(&buffer, "PNG"); // writes image into ba in PNG format
 
 		group.mGroupImage.copy((uint8_t *) ba.data(), ba.size());
 	} else {
diff --git a/retroshare-gui/src/gui/TheWire/WireGroupDialog.cpp b/retroshare-gui/src/gui/TheWire/WireGroupDialog.cpp
index 29cba1d5c..139961640 100644
--- a/retroshare-gui/src/gui/TheWire/WireGroupDialog.cpp
+++ b/retroshare-gui/src/gui/TheWire/WireGroupDialog.cpp
@@ -109,7 +109,7 @@ void WireGroupDialog::prepareWireGroup(RsWireGroup &group, const RsGroupMetaData
 		QBuffer buffer(&ba);
 
 		buffer.open(QIODevice::WriteOnly);
-        pixmap.save(&buffer, "JPG"); // writes image into ba in PNG format
+        pixmap.save(&buffer, "PNG"); // writes image into ba in PNG format
 
 		group.mHeadshot.copy((uint8_t *) ba.data(), ba.size());
 	} else {
diff --git a/retroshare-gui/src/gui/chat/ChatWidget.cpp b/retroshare-gui/src/gui/chat/ChatWidget.cpp
index 868b6f150..880b5a640 100644
--- a/retroshare-gui/src/gui/chat/ChatWidget.cpp
+++ b/retroshare-gui/src/gui/chat/ChatWidget.cpp
@@ -1094,7 +1094,7 @@ void ChatWidget::addChatMsg(bool incoming, const QString &name, const RsGxsId gx
 			QImage image(icon.pixmap(height,height).toImage());
 			QByteArray byteArray;
 			QBuffer buffer(&byteArray);
-            image.save(&buffer, "JPG"); // writes the image in PNG format inside the buffer
+            image.save(&buffer, "PNG"); // writes the image in PNG format inside the buffer
 			QString iconBase64 = QString::fromLatin1(byteArray.toBase64().data());
 			strPreName = QString("<img src=\"data:image/png;base64,%1\" alt=\"[unsigned]\" />").arg(iconBase64);
 		}
diff --git a/retroshare-gui/src/gui/common/AvatarDialog.cpp b/retroshare-gui/src/gui/common/AvatarDialog.cpp
index 4da8b3b76..a657d2a1a 100644
--- a/retroshare-gui/src/gui/common/AvatarDialog.cpp
+++ b/retroshare-gui/src/gui/common/AvatarDialog.cpp
@@ -141,7 +141,7 @@ void AvatarDialog::getAvatar(QByteArray &avatar)
 	QBuffer buffer(&avatar);
 
 	buffer.open(QIODevice::WriteOnly);
-    pixmap.save(&buffer, "JPG"); // writes image into ba in PNG format
+    pixmap.save(&buffer, "PNG"); // writes image into ba in PNG format
 }
 
 void AvatarDialog::load()
diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelGroupDialog.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelGroupDialog.cpp
index e82795abf..8b9d8d881 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelGroupDialog.cpp
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelGroupDialog.cpp
@@ -120,7 +120,7 @@ void GxsChannelGroupDialog::prepareChannelGroup(RsGxsChannelGroup &group, const
 		QBuffer buffer(&ba);
 
 		buffer.open(QIODevice::WriteOnly);
-        pixmap.save(&buffer, "JPG"); // writes image into ba in PNG format
+        pixmap.save(&buffer, "PNG"); // writes image into ba in PNG format
 
 		group.mImage.copy((uint8_t *) ba.data(), ba.size());
 	} else {