diff --git a/app/src/main/java/com/kunzisoft/keepass/database/file/input/DatabaseInputKDB.kt b/app/src/main/java/com/kunzisoft/keepass/database/file/input/DatabaseInputKDB.kt
index 49f886f68..857d1c0cc 100644
--- a/app/src/main/java/com/kunzisoft/keepass/database/file/input/DatabaseInputKDB.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/database/file/input/DatabaseInputKDB.kt
@@ -20,6 +20,7 @@
 
 package com.kunzisoft.keepass.database.file.input
 
+import android.graphics.Color
 import com.kunzisoft.encrypt.HashManager
 import com.kunzisoft.keepass.database.crypto.EncryptionAlgorithm
 import com.kunzisoft.keepass.database.element.DateInstant
@@ -311,7 +312,13 @@ class DatabaseInputKDB(cacheDirectory: File,
                                 var color: Int? = null
                                 entry.getBinary(mDatabase.attachmentPool)
                                     ?.getInputDataStream(mDatabase.binaryCache)?.use {
-                                        color = it.read()
+                                        val reverseColor = UnsignedInt(it.readBytes4ToUInt()).toKotlinInt()
+                                        color = Color.argb(
+                                            Color.alpha(255),
+                                            Color.blue(reverseColor),
+                                            Color.green(reverseColor),
+                                            Color.red(reverseColor)
+                                        )
                                     }
                                 mDatabase.color = color
                             }
diff --git a/app/src/main/java/com/kunzisoft/keepass/database/file/output/DatabaseOutputKDB.kt b/app/src/main/java/com/kunzisoft/keepass/database/file/output/DatabaseOutputKDB.kt
index 5a6fde286..07cd964b7 100644
--- a/app/src/main/java/com/kunzisoft/keepass/database/file/output/DatabaseOutputKDB.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/database/file/output/DatabaseOutputKDB.kt
@@ -19,6 +19,7 @@
  */
 package com.kunzisoft.keepass.database.file.output
 
+import android.graphics.Color
 import com.kunzisoft.encrypt.HashManager
 import com.kunzisoft.keepass.database.crypto.EncryptionAlgorithm
 import com.kunzisoft.keepass.database.element.database.DatabaseKDB
@@ -47,9 +48,6 @@ class DatabaseOutputKDB(private val mDatabaseKDB: DatabaseKDB,
     private var mGroupList = mutableListOf<GroupKDB>()
     private var mEntryList = mutableListOf<EntryKDB>()
 
-    private var mDefaultUsernameAdded = false
-    private var mDatabaseColorAdded = false
-
     @Throws(DatabaseOutputException::class)
     fun getFinalKey(header: DatabaseHeader): ByteArray? {
         try {
@@ -216,7 +214,6 @@ class DatabaseOutputKDB(private val mDatabaseKDB: DatabaseKDB,
     private fun clearParser() {
         mGroupList.clear()
         mEntryList.clear()
-        mDefaultUsernameAdded = false
     }
 
     private fun sortNodesForOutput() {
@@ -235,24 +232,14 @@ class DatabaseOutputKDB(private val mDatabaseKDB: DatabaseKDB,
         mGroupList.add(group)
 
         for (childEntry in group.getChildEntries()) {
-            if (childEntry.isMetaStreamDefaultUsername()
-                && mDatabaseKDB.defaultUserName.isNotEmpty()) {
-                setDefaultUsername(childEntry)
-                mEntryList.add(childEntry)
-                mDefaultUsernameAdded = true
-            } else if (childEntry.isMetaStreamDatabaseColor()
-                && mDatabaseKDB.color != null) {
-                setDatabaseColor(childEntry)
-                mEntryList.add(childEntry)
-                mDatabaseColorAdded = true
-            } else {
+            if (!childEntry.isMetaStreamDefaultUsername()
+                && !childEntry.isMetaStreamDatabaseColor()) {
                 mEntryList.add(childEntry)
             }
         }
 
         // Add MetaStream
-        if (!mDefaultUsernameAdded
-            && mDatabaseKDB.defaultUserName.isNotEmpty()) {
+        if (mDatabaseKDB.defaultUserName.isNotEmpty()) {
             val metaEntry = EntryKDB().apply {
                 setMetaStreamDefaultUsername()
                 setDefaultUsername(this)
@@ -260,8 +247,7 @@ class DatabaseOutputKDB(private val mDatabaseKDB: DatabaseKDB,
             mDatabaseKDB.addEntryTo(metaEntry, group)
             mEntryList.add(metaEntry)
         }
-        if (!mDatabaseColorAdded
-            && mDatabaseKDB.color != null) {
+        if (mDatabaseKDB.color != null) {
             val metaEntry = EntryKDB().apply {
                 setMetaStreamDatabaseColor()
                 setDatabaseColor(this)
@@ -288,7 +274,16 @@ class DatabaseOutputKDB(private val mDatabaseKDB: DatabaseKDB,
         val binaryData = mDatabaseKDB.buildNewAttachment()
         entryKDB.putBinary(binaryData, mDatabaseKDB.attachmentPool)
         BufferedOutputStream(binaryData.getOutputDataStream(mDatabaseKDB.binaryCache)).use { outputStream ->
-            outputStream.write(mDatabaseKDB.color!!)
+            var reversColor = Color.BLACK
+            mDatabaseKDB.color?.let {
+                reversColor = Color.argb(
+                    Color.alpha(255),
+                    Color.blue(it),
+                    Color.green(it),
+                    Color.red(it)
+                )
+            }
+            outputStream.write4BytesUInt(UnsignedInt(reversColor))
         }
     }