diff --git a/changelog b/changelog
index 75cbe2a..9aedcbb 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,11 @@
+---------------
+    0.2.2
+---------------
+-fixed crash when parsing config file under Win32
+-fixed loss of entry icons when saving a database which 
+ was not created with KeePassX (no KPX_CUSTOM_ICONS metastream)
+
+
 ---------------
     0.2.1
 ---------------
diff --git a/src/PwManager.cpp b/src/PwManager.cpp
index 03d2b4e..bb80ff6 100755
--- a/src/PwManager.cpp
+++ b/src/PwManager.cpp
@@ -651,6 +651,7 @@ bool CGroup::ReadGroupField(quint16 FieldType, quint32 FieldSize, quint8 *pData)
 		break;
 	case 0x0007:
 		memcpyFromLEnd32(&ImageID, (char*)pData);
+		OldImgID=ImageID;
 		break;
 	case 0x0008:
 		memcpyFromLEnd16(&Level, (char*)pData);
@@ -691,6 +692,7 @@ switch(FieldType)
 		break;
 	case 0x0003:
 		memcpyFromLEnd32(&ImageID, (char*)pData);
+		OldImgID=ImageID;
 		break;
 	case 0x0004:
 		Title=QString::fromUtf8((char*)pData);