diff --git a/app/src/androidTest/java/com/keepassdroid/tests/database/SprEngineTest.java b/app/src/androidTest/java/com/keepassdroid/tests/database/SprEngineTest.java
index 7e166c45c..2434d2da1 100644
--- a/app/src/androidTest/java/com/keepassdroid/tests/database/SprEngineTest.java
+++ b/app/src/androidTest/java/com/keepassdroid/tests/database/SprEngineTest.java
@@ -19,16 +19,12 @@
  */
 package com.keepassdroid.tests.database;
 
-import java.io.InputStream;
-import java.util.UUID;
-
 import android.content.Context;
 import android.content.res.AssetManager;
+import android.util.Base64;
 
 import androidx.test.platform.app.InstrumentationRegistry;
 
-import biz.source_code.base64Coder.Base64Coder;
-
 import com.keepassdroid.database.PwDatabaseV4;
 import com.keepassdroid.database.PwEntryV4;
 import com.keepassdroid.database.load.ImporterV4;
@@ -38,6 +34,9 @@
 import org.junit.Before;
 import org.junit.Test;
 
+import java.io.InputStream;
+import java.util.UUID;
+
 import static org.junit.Assert.assertEquals;
 
 public class SprEngineTest {
@@ -78,7 +77,7 @@ private UUID decodeUUID(String encoded) {
 			return PwDatabaseV4.UUID_ZERO;
 		}
 		
-		byte[] buf = Base64Coder.decode(encoded);
+		byte[] buf = Base64.decode(encoded, Base64.DEFAULT);
 		return Types.bytestoUUID(buf);
 	}
 
diff --git a/app/src/main/java/biz/source_code/base64Coder/Base64Coder.java b/app/src/main/java/biz/source_code/base64Coder/Base64Coder.java
deleted file mode 100644
index 9054587d5..000000000
--- a/app/src/main/java/biz/source_code/base64Coder/Base64Coder.java
+++ /dev/null
@@ -1,225 +0,0 @@
-// Copyright 2003-2010 Christian d'Heureuse, Inventec Informatik AG, Zurich, Switzerland
-// www.source-code.biz, www.inventec.ch/chdh
-//
-// This module is multi-licensed and may be used under the terms
-// of any of the following licenses:
-//
-//  EPL, Eclipse Public License, http://www.eclipse.org/legal
-//  LGPL, GNU Lesser General Public License, http://www.gnu.org/licenses/lgpl.html
-//  AL, Apache License, http://www.apache.org/licenses
-//  BSD, BSD License, http://www.opensource.org/licenses/bsd-license.php
-//
-// Please contact the author if you need another license.
-// This module is provided "as is", without warranties of any kind.
-
-package biz.source_code.base64Coder;
-
-/**
-* A Base64 encoder/decoder.
-*
-* <p>
-* This class is used to encode and decode data in Base64 format as described in RFC 1521.
-*
-* <p>
-* Project home page: <a href="http://www.source-code.biz/base64coder/java/">www.source-code.biz/base64coder/java</a><br>
-* Author: Christian d'Heureuse, Inventec Informatik AG, Zurich, Switzerland<br>
-* Multi-licensed: EPL / LGPL / AL / BSD.
-*/
-public class Base64Coder {
-
-// The line separator string of the operating system.
-private static final String systemLineSeparator = System.getProperty("line.separator");
-
-// Mapping table from 6-bit nibbles to Base64 characters.
-private static char[]    map1 = new char[64];
-   static {
-      int i=0;
-      for (char c='A'; c<='Z'; c++) map1[i++] = c;
-      for (char c='a'; c<='z'; c++) map1[i++] = c;
-      for (char c='0'; c<='9'; c++) map1[i++] = c;
-      map1[i++] = '+'; map1[i++] = '/'; }
-
-// Mapping table from Base64 characters to 6-bit nibbles.
-private static byte[]    map2 = new byte[128];
-   static {
-      for (int i=0; i<map2.length; i++) map2[i] = -1;
-      for (int i=0; i<64; i++) map2[map1[i]] = (byte)i; }
-
-/**
-* Encodes a string into Base64 format.
-* No blanks or line breaks are inserted.
-* @param s  A String to be encoded.
-* @return   A String containing the Base64 encoded data.
-*/
-public static String encodeString (String s) {
-   return new String(encode(s.getBytes())); }
-
-/**
-* Encodes a byte array into Base 64 format and breaks the output into lines of 76 characters.
-* This method is compatible with <code>sun.misc.BASE64Encoder.encodeBuffer(byte[])</code>.
-* @param in  An array containing the data bytes to be encoded.
-* @return    A String containing the Base64 encoded data, broken into lines.
-*/
-public static String encodeLines (byte[] in) {
-   return encodeLines(in, 0, in.length, 76, systemLineSeparator); }
-
-/**
-* Encodes a byte array into Base 64 format and breaks the output into lines.
-* @param in            An array containing the data bytes to be encoded.
-* @param iOff          Offset of the first byte in <code>in</code> to be processed.
-* @param iLen          Number of bytes to be processed in <code>in</code>, starting at <code>iOff</code>.
-* @param lineLen       Line length for the output data. Should be a multiple of 4.
-* @param lineSeparator The line separator to be used to separate the output lines.
-* @return              A String containing the Base64 encoded data, broken into lines.
-*/
-public static String encodeLines (byte[] in, int iOff, int iLen, int lineLen, String lineSeparator) {
-   int blockLen = (lineLen*3) / 4;
-   if (blockLen <= 0) throw new IllegalArgumentException();
-   int lines = (iLen+blockLen-1) / blockLen;
-   int bufLen = ((iLen+2)/3)*4 + lines*lineSeparator.length();
-   StringBuilder buf = new StringBuilder(bufLen);
-   int ip = 0;
-   while (ip < iLen) {
-      int l = Math.min(iLen-ip, blockLen);
-      buf.append (encode(in, iOff+ip, l));
-      buf.append (lineSeparator);
-      ip += l; }
-   return buf.toString(); }
-
-/**
-* Encodes a byte array into Base64 format.
-* No blanks or line breaks are inserted in the output.
-* @param in  An array containing the data bytes to be encoded.
-* @return    A character array containing the Base64 encoded data.
-*/
-public static char[] encode (byte[] in) {
-   return encode(in, 0, in.length); }
-
-/**
-* Encodes a byte array into Base64 format.
-* No blanks or line breaks are inserted in the output.
-* @param in    An array containing the data bytes to be encoded.
-* @param iLen  Number of bytes to process in <code>in</code>.
-* @return      A character array containing the Base64 encoded data.
-*/
-public static char[] encode (byte[] in, int iLen) {
-   return encode(in, 0, iLen); }
-
-/**
-* Encodes a byte array into Base64 format.
-* No blanks or line breaks are inserted in the output.
-* @param in    An array containing the data bytes to be encoded.
-* @param iOff  Offset of the first byte in <code>in</code> to be processed.
-* @param iLen  Number of bytes to process in <code>in</code>, starting at <code>iOff</code>.
-* @return      A character array containing the Base64 encoded data.
-*/
-public static char[] encode (byte[] in, int iOff, int iLen) {
-   int oDataLen = (iLen*4+2)/3;       // output length without padding
-   int oLen = ((iLen+2)/3)*4;         // output length including padding
-   char[] out = new char[oLen];
-   int ip = iOff;
-   int iEnd = iOff + iLen;
-   int op = 0;
-   while (ip < iEnd) {
-      int i0 = in[ip++] & 0xff;
-      int i1 = ip < iEnd ? in[ip++] & 0xff : 0;
-      int i2 = ip < iEnd ? in[ip++] & 0xff : 0;
-      int o0 = i0 >>> 2;
-      int o1 = ((i0 &   3) << 4) | (i1 >>> 4);
-      int o2 = ((i1 & 0xf) << 2) | (i2 >>> 6);
-      int o3 = i2 & 0x3F;
-      out[op++] = map1[o0];
-      out[op++] = map1[o1];
-      out[op] = op < oDataLen ? map1[o2] : '='; op++;
-      out[op] = op < oDataLen ? map1[o3] : '='; op++; }
-   return out; }
-
-/**
-* Decodes a string from Base64 format.
-* No blanks or line breaks are allowed within the Base64 encoded input data.
-* @param s  A Base64 String to be decoded.
-* @return   A String containing the decoded data.
-* @throws   IllegalArgumentException If the input is not valid Base64 encoded data.
-*/
-public static String decodeString (String s) {
-   return new String(decode(s)); }
-
-/**
-* Decodes a byte array from Base64 format and ignores line separators, tabs and blanks.
-* CR, LF, Tab and Space characters are ignored in the input data.
-* This method is compatible with <code>sun.misc.BASE64Decoder.decodeBuffer(String)</code>.
-* @param s  A Base64 String to be decoded.
-* @return   An array containing the decoded data bytes.
-* @throws   IllegalArgumentException If the input is not valid Base64 encoded data.
-*/
-public static byte[] decodeLines (String s) {
-   char[] buf = new char[s.length()];
-   int p = 0;
-   for (int ip = 0; ip < s.length(); ip++) {
-      char c = s.charAt(ip);
-      if (c != ' ' && c != '\r' && c != '\n' && c != '\t')
-         buf[p++] = c; }
-   return decode(buf, 0, p); }
-
-/**
-* Decodes a byte array from Base64 format.
-* No blanks or line breaks are allowed within the Base64 encoded input data.
-* @param s  A Base64 String to be decoded.
-* @return   An array containing the decoded data bytes.
-* @throws   IllegalArgumentException If the input is not valid Base64 encoded data.
-*/
-public static byte[] decode (String s) {
-   return decode(s.toCharArray()); }
-
-/**
-* Decodes a byte array from Base64 format.
-* No blanks or line breaks are allowed within the Base64 encoded input data.
-* @param in  A character array containing the Base64 encoded data.
-* @return    An array containing the decoded data bytes.
-* @throws    IllegalArgumentException If the input is not valid Base64 encoded data.
-*/
-public static byte[] decode (char[] in) {
-   return decode(in, 0, in.length); }
-
-/**
-* Decodes a byte array from Base64 format.
-* No blanks or line breaks are allowed within the Base64 encoded input data.
-* @param in    A character array containing the Base64 encoded data.
-* @param iOff  Offset of the first character in <code>in</code> to be processed.
-* @param iLen  Number of characters to process in <code>in</code>, starting at <code>iOff</code>.
-* @return      An array containing the decoded data bytes.
-* @throws      IllegalArgumentException If the input is not valid Base64 encoded data.
-*/
-public static byte[] decode (char[] in, int iOff, int iLen) {
-   if (iLen%4 != 0) throw new IllegalArgumentException ("Length of Base64 encoded input string is not a multiple of 4.");
-   while (iLen > 0 && in[iOff+iLen-1] == '=') iLen--;
-   int oLen = (iLen*3) / 4;
-   byte[] out = new byte[oLen];
-   int ip = iOff;
-   int iEnd = iOff + iLen;
-   int op = 0;
-   while (ip < iEnd) {
-      int i0 = in[ip++];
-      int i1 = in[ip++];
-      int i2 = ip < iEnd ? in[ip++] : 'A';
-      int i3 = ip < iEnd ? in[ip++] : 'A';
-      if (i0 > 127 || i1 > 127 || i2 > 127 || i3 > 127)
-         throw new IllegalArgumentException ("Illegal character in Base64 encoded data.");
-      int b0 = map2[i0];
-      int b1 = map2[i1];
-      int b2 = map2[i2];
-      int b3 = map2[i3];
-      if (b0 < 0 || b1 < 0 || b2 < 0 || b3 < 0)
-         throw new IllegalArgumentException ("Illegal character in Base64 encoded data.");
-      int o0 = ( b0       <<2) | (b1>>>4);
-      int o1 = ((b1 & 0xf)<<4) | (b2>>>2);
-      int o2 = ((b2 &   3)<<6) |  b3;
-      out[op++] = (byte)o0;
-      if (op<oLen) out[op++] = (byte)o1;
-      if (op<oLen) out[op++] = (byte)o2; }
-   return out; }
-
-// Dummy constructor.
-private Base64Coder() {}
-
-} // end class Base64Coder
\ No newline at end of file
diff --git a/app/src/main/java/com/keepassdroid/biometric/BiometricHelper.java b/app/src/main/java/com/keepassdroid/biometric/BiometricHelper.java
index b345e0a86..2f020eb1d 100644
--- a/app/src/main/java/com/keepassdroid/biometric/BiometricHelper.java
+++ b/app/src/main/java/com/keepassdroid/biometric/BiometricHelper.java
@@ -21,11 +21,12 @@
 
 import android.app.KeyguardManager;
 import android.content.Context;
+import android.security.keystore.KeyProperties;
+import android.util.Base64;
 
 import androidx.biometric.BiometricManager;
 import androidx.biometric.BiometricPrompt;
 import androidx.core.os.CancellationSignal;
-import android.security.keystore.KeyProperties;
 
 import com.keepassdroid.compat.KeyGenParameterSpecCompat;
 import com.keepassdroid.compat.KeyguardManagerCompat;
@@ -41,8 +42,6 @@
 import javax.crypto.SecretKey;
 import javax.crypto.spec.IvParameterSpec;
 
-import biz.source_code.base64Coder.Base64Coder;
-
 public class BiometricHelper {
 
     private static final String ALIAS_KEY = "example-key";
@@ -167,11 +166,11 @@ public void encryptData(final String value) {
         try {
             // actual do encryption here
             byte[] encrypted = cipher.doFinal(value.getBytes());
-            final String encryptedValue = new String(Base64Coder.encode(encrypted));
+            final String encryptedValue = new String(Base64.encodeToString(encrypted, Base64.DEFAULT));
 
             // passes updated iv spec on to callback so this can be stored for decryption
             final IvParameterSpec spec = cipher.getParameters().getParameterSpec(IvParameterSpec.class);
-            final String ivSpecValue = new String(Base64Coder.encode(spec.getIV()));
+            final String ivSpecValue = new String(Base64.encode(spec.getIV(), Base64.DEFAULT));
             biometricCallback.handleEncryptedResult(encryptedValue, ivSpecValue);
 
         } catch (final Exception e) {
@@ -215,7 +214,7 @@ private void initDecryptKey(
         final SecretKey key = (SecretKey) keyStore.getKey(ALIAS_KEY, null);
 
         // important to restore spec here that was used for decryption
-        final byte[] iv = Base64Coder.decode(ivSpecValue);
+        final byte[] iv = Base64.decode(ivSpecValue, Base64.DEFAULT);
         final IvParameterSpec spec = new IvParameterSpec(iv);
         cipher.init(Cipher.DECRYPT_MODE, key, spec);
         cryptoInitOk = true;
@@ -232,7 +231,7 @@ public void decryptData(final String encryptedValue) {
         }
         try {
             // actual decryption here
-            final byte[] encrypted = Base64Coder.decode(encryptedValue);
+            final byte[] encrypted = Base64.decode(encryptedValue, Base64.DEFAULT);
             byte[] decrypted = cipher.doFinal(encrypted);
             final String decryptedString = new String(decrypted);
 
diff --git a/app/src/main/java/com/keepassdroid/database/PwDatabaseV4.java b/app/src/main/java/com/keepassdroid/database/PwDatabaseV4.java
index 29e7b782d..560b14c8b 100644
--- a/app/src/main/java/com/keepassdroid/database/PwDatabaseV4.java
+++ b/app/src/main/java/com/keepassdroid/database/PwDatabaseV4.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2017 Brian Pellin.
+ * Copyright 2010-2020 Brian Pellin.
  *     
  * This file is part of KeePassDroid.
  *
@@ -19,6 +19,7 @@
  */
 package com.keepassdroid.database;
 
+import android.util.Base64;
 import android.webkit.URLUtil;
 
 import com.keepassdroid.collections.VariantDictionary;
@@ -53,8 +54,6 @@
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 
-import biz.source_code.base64Coder.Base64Coder;
-
 
 public class PwDatabaseV4 extends PwDatabase {
 
@@ -254,7 +253,7 @@ protected byte[] loadXmlKeyFile(InputStream keyInputStream) {
 								Node text = children2.item(k);
 								if (text.getNodeType() == Node.TEXT_NODE) {
 									Text txt = (Text) text;
-									return Base64Coder.decode(txt.getNodeValue());
+									return Base64.decode(txt.getNodeValue(), Base64.DEFAULT);
 								}
 							}
 						}
diff --git a/app/src/main/java/com/keepassdroid/database/load/ImporterV4.java b/app/src/main/java/com/keepassdroid/database/load/ImporterV4.java
index ff6b7dbd7..5c6943676 100644
--- a/app/src/main/java/com/keepassdroid/database/load/ImporterV4.java
+++ b/app/src/main/java/com/keepassdroid/database/load/ImporterV4.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009-2018 Brian Pellin.
+ * Copyright 2009-2020 Brian Pellin.
  *     
  * This file is part of KeePassDroid.
  *
@@ -19,6 +19,8 @@
  */
 package com.keepassdroid.database.load;
 
+import android.util.Base64;
+
 import com.keepassdroid.UpdateStatus;
 import com.keepassdroid.crypto.CipherFactory;
 import com.keepassdroid.crypto.PwStreamCipherFactory;
@@ -48,6 +50,7 @@
 import com.keepassdroid.utils.Util;
 
 import org.spongycastle.crypto.StreamCipher;
+import org.spongycastle.jcajce.provider.symmetric.ARC4;
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
 import org.xmlpull.v1.XmlPullParserFactory;
@@ -73,8 +76,6 @@
 import javax.crypto.Cipher;
 import javax.crypto.NoSuchPaddingException;
 
-import biz.source_code.base64Coder.Base64Coder;
-
 import static com.keepassdroid.database.PwDatabaseV4XML.*;
 
 public class ImporterV4 extends Importer {
@@ -405,7 +406,7 @@ private KdbContext ReadXmlElement(KdbContext ctx, XmlPullParser xpp) throws XmlP
 			} else if ( name.equalsIgnoreCase(ElemHeaderHash) ) {
 				String encodedHash = ReadString(xpp);
 				if (!EmptyUtils.isNullOrEmpty(encodedHash) && (hashOfHeader != null)) {
-					byte[] hash = Base64Coder.decode(encodedHash);
+					byte[] hash = Base64.decode(encodedHash, Base64.DEFAULT);
 					if (!Arrays.equals(hash, hashOfHeader)) {
 						throw new InvalidDBException();
 					}
@@ -500,7 +501,7 @@ private KdbContext ReadXmlElement(KdbContext ctx, XmlPullParser xpp) throws XmlP
 			} else if ( name.equalsIgnoreCase(ElemCustomIconItemData) ) {
 				String strData = ReadString(xpp);
 				if ( strData != null && strData.length() > 0 ) {
-					customIconData = Base64Coder.decode(strData);
+					customIconData = Base64.decode(strData, Base64.DEFAULT);
 				} else {
 					assert(false);
 				}
@@ -923,7 +924,7 @@ private Date ReadTime(XmlPullParser xpp) throws IOException, XmlPullParserExcept
 		Date utcDate = null;
 
 		if (version >= PwDbHeaderV4.FILE_VERSION_32_4) {
-			byte[] buf = Base64Coder.decode(sDate);
+			byte[] buf = Base64.decode(sDate, Base64.DEFAULT);
 			if (buf.length != 8) {
 				byte[] buf8 = new byte[8];
 				System.arraycopy(buf, 0, buf8, 0, Math.min(buf.length, 8));
@@ -988,8 +989,7 @@ private UUID ReadUuid(XmlPullParser xpp) throws IOException, XmlPullParserExcept
 			return PwDatabaseV4.UUID_ZERO;
 		}
 		
-		// TODO: Switch to framework Base64 once API level 8 is the minimum
-		byte[] buf = Base64Coder.decode(encoded);
+		byte[] buf = Base64.decode(encoded, Base64.DEFAULT);
 		
 		return Types.bytestoUUID(buf);
 	}
@@ -1081,7 +1081,7 @@ private ProtectedBinary ReadProtectedBinary(XmlPullParser xpp) throws XmlPullPar
 		String base64 = ReadString(xpp);
 		if ( base64.length() == 0 ) return ProtectedBinary.EMPTY;
 		
-		byte[] data = Base64Coder.decode(base64);
+		byte[] data = Base64.decode(base64, Base64.DEFAULT);
 		
 		if (compressed) {
 			data = MemUtil.decompress(data);
@@ -1123,7 +1123,7 @@ private byte[] ProcessNode(XmlPullParser xpp) throws XmlPullParserException, IOE
 				String encrypted = ReadStringRaw(xpp);
 				
 				if ( encrypted.length() > 0 ) {
-					buf = Base64Coder.decode(encrypted);
+					buf = Base64.decode(encrypted, Base64.DEFAULT);
 					byte[] plainText = new byte[buf.length];
 					
 					randomStream.processBytes(buf, 0, buf.length, plainText, 0);
diff --git a/app/src/main/java/com/keepassdroid/database/save/PwDbV4Output.java b/app/src/main/java/com/keepassdroid/database/save/PwDbV4Output.java
index 2cb350801..60ff9e852 100644
--- a/app/src/main/java/com/keepassdroid/database/save/PwDbV4Output.java
+++ b/app/src/main/java/com/keepassdroid/database/save/PwDbV4Output.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2017 Brian Pellin.
+ * Copyright 2013-2020 Brian Pellin.
  *     
  * This file is part of KeePassDroid.
  *
@@ -19,6 +19,7 @@
  */
 package com.keepassdroid.database.save;
 
+import android.util.Base64;
 import android.util.Xml;
 
 import com.keepassdroid.crypto.CipherFactory;
@@ -74,8 +75,6 @@
 import javax.crypto.Cipher;
 import javax.crypto.CipherOutputStream;
 
-import biz.source_code.base64Coder.Base64Coder;
-
 import static com.keepassdroid.database.PwDatabaseV4XML.AttrCompressed;
 import static com.keepassdroid.database.PwDatabaseV4XML.AttrId;
 import static com.keepassdroid.database.PwDatabaseV4XML.AttrProtected;
@@ -322,7 +321,7 @@ private void writeMeta() throws IllegalArgumentException, IllegalStateException,
 		writeObject(ElemGenerator, mPM.localizedAppName);
 		
 		if (hashOfHeader != null) {
-			writeObject(ElemHeaderHash, String.valueOf(Base64Coder.encode(hashOfHeader)));
+			writeObject(ElemHeaderHash, Base64.encodeToString(hashOfHeader, Base64.DEFAULT));
 		}
 		
 		writeObject(ElemDbName, mPM.name, true);
@@ -527,15 +526,15 @@ private void subWriteValue(ProtectedBinary value) throws IllegalArgumentExceptio
 
 				byte[] encoded = new byte[valLength];
 				randomStream.processBytes(buffer, 0, valLength, encoded, 0);
-				xml.text(String.valueOf(Base64Coder.encode(encoded)));
+				xml.text(Base64.encodeToString(encoded, Base64.DEFAULT));
 
 			} else {
 				if (mPM.compressionAlgorithm == PwCompressionAlgorithm.Gzip) {
 					xml.attribute(null, AttrCompressed, ValTrue);
 					byte[] compressData = MemUtil.compress(buffer);
-					xml.text(String.valueOf(Base64Coder.encode(compressData)));
+					xml.text(Base64.encodeToString(compressData, Base64.DEFAULT));
 				} else {
-					xml.text(String.valueOf(Base64Coder.encode(buffer)));
+					xml.text(Base64.encodeToString(buffer, Base64.DEFAULT));
 				}
 
 			}
@@ -566,7 +565,7 @@ private void writeObject(String name, Date value) throws IllegalArgumentExceptio
 			DateTime dt = new DateTime(value);
 			long seconds = DateUtil.convertDateToKDBX4Time(dt);
 			byte[] buf = LEDataOutputStream.writeLongBuf(seconds);
-			String b64 = new String(Base64Coder.encode(buf));
+			String b64 = Base64.encodeToString(buf, Base64.DEFAULT);
 			writeObject(name, b64);
 		}
 
@@ -593,7 +592,7 @@ else if (value) {
 	
 	private void writeObject(String name, UUID uuid) throws IllegalArgumentException, IllegalStateException, IOException {
 		byte[] data = Types.UUIDtoBytes(uuid);
-		writeObject(name, String.valueOf(Base64Coder.encode(data)));
+		writeObject(name, Base64.encodeToString(data, Base64.DEFAULT));
 	}
 	
 	private void writeObject(String name, String keyName, String keyValue, String valueName, String valueValue) throws IllegalArgumentException, IllegalStateException, IOException {
@@ -677,7 +676,7 @@ else if (key.equals(PwDefsV4.NOTES_FIELD)) {
 			if (valLength > 0) {
 				byte[] encoded = new byte[valLength];
 				randomStream.processBytes(data, 0, valLength, encoded, 0);
-				xml.text(String.valueOf(Base64Coder.encode(encoded)));
+				xml.text(Base64.encodeToString(encoded, Base64.DEFAULT));
 			}
 		}
 		else {
@@ -790,7 +789,7 @@ private void writeCustomIconList() throws IllegalArgumentException, IllegalState
 			xml.startTag(null, ElemCustomIconItem);
 			
 			writeObject(ElemCustomIconItemID, icon.uuid);
-			writeObject(ElemCustomIconItemData, String.valueOf(Base64Coder.encode(icon.imageData)));
+			writeObject(ElemCustomIconItemData, Base64.encodeToString(icon.imageData, Base64.DEFAULT));
 			
 			xml.endTag(null, ElemCustomIconItem);
 		}