diff --git a/app/src/main/java/org/shadowice/flocke/andotp/Utilities/EntryThumbnail.java b/app/src/main/java/org/shadowice/flocke/andotp/Utilities/EntryThumbnail.java
index 220666f3..eb0004a3 100644
--- a/app/src/main/java/org/shadowice/flocke/andotp/Utilities/EntryThumbnail.java
+++ b/app/src/main/java/org/shadowice/flocke/andotp/Utilities/EntryThumbnail.java
@@ -26,6 +26,7 @@ public class EntryThumbnail {
         Bitwarden(R.mipmap.bitwarden, AssetType.Bitmap),
         Cloudflare(R.drawable.ic_cloudflare),
         Coinbase(R.drawable.ic_coinbase),
+        CozyCloud(R.drawable.ic_cozycloud),
         DigitalOcean(R.drawable.ic_digital_ocean),
         Discord(R.drawable.ic_discord),
         Dropbox(R.drawable.ic_dropbox),
@@ -38,7 +39,9 @@ public class EntryThumbnail {
         Kickstarter(R.drawable.ic_kickstarter),
         LastPass(R.drawable.ic_lastpass),
         Mailgun(R.drawable.ic_mailgun),
+        Mastodon(R.drawable.ic_mastodon),
         Microsoft(R.drawable.ic_microsoft),
+        NextCloud(R.drawable.ic_nextcloud),
         Origin(R.drawable.ic_origin),
         PayPal(R.drawable.ic_paypal),
         ProtonMail(R.drawable.ic_protonmail),
diff --git a/app/src/main/res/drawable/ic_cozycloud.xml b/app/src/main/res/drawable/ic_cozycloud.xml
new file mode 100644
index 00000000..f7dcdc16
--- /dev/null
+++ b/app/src/main/res/drawable/ic_cozycloud.xml
@@ -0,0 +1,4 @@
+<vector android:height="191dp" android:viewportHeight="382.0"
+    android:viewportWidth="500.0" android:width="250dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#297ef2" android:pathData="M367.6,380.9L132.5,380.9C59.5,380.9 0.1,321.4 0.1,248.3c0,-34.8 13.4,-67.8 37.8,-92.7 21.3,-21.8 49,-35.4 78.8,-38.9 3.5,-29.9 17.1,-57.6 38.9,-78.9C180.5,13.4 213.3,0 248.1,0c34.8,0 67.7,13.4 92.6,37.8 21.7,21.3 35.2,48.8 38.8,78.6 67.4,6.1 120.5,62.9 120.5,132 0,73.1 -59.4,132.5 -132.4,132.5zM366.6,353.1h1c57.7,0 104.6,-47 104.6,-104.7 0,-57.7 -46.9,-104.7 -104.6,-104.7h-1c-7.5,0 -13.7,-6 -13.9,-13.6 -1.3,-56.4 -48.2,-102.3 -104.6,-102.3S144.9,73.7 143.6,130.1c-0.2,7.4 -6.1,13.4 -13.6,13.6 -56.3,1.3 -102.1,48.3 -102.1,104.7 0,57.8 46.9,104.7 104.6,104.7h0.9l0.3,-0c0.3,0 0.6,0 0.9,0L366.6,353.1zM316,240.4c-8.4,-5.4 -8.8,-15.5 -8.8,-15.9 -0.1,-2.7 -2.3,-4.9 -5,-4.8 -2.7,0.1 -4.9,2.3 -4.8,5 0,0.4 0.2,5.1 2.4,10.6 -29.7,28.2 -76.4,28.2 -106.2,0.2 2.3,-5.6 2.5,-10.4 2.5,-10.8 0.1,-2.7 -2.1,-4.9 -4.8,-5 -2.7,-0.1 -4.9,2.1 -5,4.8 0,0.4 -0.4,10.4 -8.8,15.9 -2.3,1.5 -2.9,4.6 -1.4,6.8 0.9,1.4 2.5,2.2 4.1,2.2 0.9,0 1.9,-0.3 2.7,-0.8 2.2,-1.4 4,-3 5.5,-4.7 16.5,14.9 37.4,22.4 58.3,22.4 21,0 41.9,-7.5 58.5,-22.5 1.5,1.7 3.3,3.4 5.6,4.8 0.8,0.5 1.8,0.8 2.7,0.8 1.6,0 3.2,-0.8 4.1,-2.2 1.5,-2.3 0.8,-5.3 -1.4,-6.8z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_mastodon.xml b/app/src/main/res/drawable/ic_mastodon.xml
new file mode 100644
index 00000000..61206cd1
--- /dev/null
+++ b/app/src/main/res/drawable/ic_mastodon.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="216dp"
+        android:height="232dp"
+        android:viewportWidth="216.4144"
+        android:viewportHeight="232.00977">
+    <path
+        android:pathData="M211.81,139.09c-3.18,16.37 -28.49,34.28 -57.56,37.75 -15.16,1.81 -30.08,3.47 -46,2.74 -26.03,-1.19 -46.56,-6.21 -46.56,-6.21 0,2.53 0.16,4.95 0.47,7.2 3.38,25.69 25.47,27.23 46.39,27.94 21.12,0.72 39.92,-5.21 39.92,-5.21l0.87,19.09s-14.77,7.93 -41.08,9.39c-14.51,0.8 -32.52,-0.37 -53.51,-5.92C9.23,213.82 1.41,165.31 0.21,116.09c-0.37,-14.61 -0.14,-28.39 -0.14,-39.92 0,-50.33 32.98,-65.08 32.98,-65.08C49.67,3.45 78.2,0.24 107.86,0h0.73c29.66,0.24 58.21,3.45 74.84,11.09 0,0 32.97,14.75 32.97,65.08 0,0 0.41,37.13 -4.6,62.92"
+        android:fillColor="#3088d4"/>
+    <path
+        android:pathData="M177.51,80.08v60.94h-24.14v-59.15c0,-12.47 -5.25,-18.8 -15.74,-18.8 -11.6,0 -17.42,7.51 -17.42,22.35v32.38H96.21V85.42c0,-14.85 -5.82,-22.35 -17.42,-22.35 -10.49,0 -15.74,6.33 -15.74,18.8v59.15H38.9V80.08c0,-12.45 3.17,-22.35 9.54,-29.67 6.57,-7.32 15.17,-11.08 25.85,-11.08 12.35,0 21.71,4.75 27.9,14.25l6.01,10.08 6.01,-10.08c6.18,-9.5 15.54,-14.25 27.9,-14.25 10.68,0 19.28,3.75 25.85,11.08 6.37,7.32 9.54,17.22 9.54,29.67"
+        android:fillColor="#fff"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_nextcloud.xml b/app/src/main/res/drawable/ic_nextcloud.xml
new file mode 100644
index 00000000..04f92681
--- /dev/null
+++ b/app/src/main/res/drawable/ic_nextcloud.xml
@@ -0,0 +1,52 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="133dp"
+        android:height="94dp"
+        android:viewportWidth="133.89203"
+        android:viewportHeight="94.62735">
+    <path
+        android:pathData="m67.03,10c-11.81,0 -21.81,8 -24.91,18.85 -2.7,-5.75 -8.54,-9.78 -15.26,-9.78 -9.25,0 -16.86,7.61 -16.86,16.86 0,9.25 7.61,16.86 16.86,16.86 6.73,0 12.57,-4.03 15.26,-9.78 3.1,10.84 13.11,18.85 24.91,18.85 11.72,0 21.67,-7.89 24.85,-18.61 2.75,5.62 8.51,9.54 15.15,9.54 9.25,0 16.86,-7.61 16.86,-16.86 0,-9.25 -7.61,-16.86 -16.86,-16.86 -6.63,0 -12.4,3.92 -15.15,9.54C88.71,17.88 78.75,10 67.03,10ZM67.03,19.9c8.91,0 16.03,7.12 16.03,16.03 0,8.91 -7.12,16.03 -16.03,16.03 -8.91,0 -16.03,-7.12 -16.03,-16.03 0,-8.91 7.12,-16.03 16.03,-16.03zM26.86,28.96c3.9,0 6.97,3.06 6.97,6.96 0,3.9 -3.06,6.97 -6.97,6.97 -3.9,0 -6.96,-3.06 -6.96,-6.97 0,-3.9 3.06,-6.96 6.96,-6.96zM107.03,28.96c3.9,0 6.97,3.06 6.97,6.96 0,3.9 -3.06,6.97 -6.97,6.97 -3.9,0 -6.96,-3.06 -6.96,-6.97 0,-3.9 3.06,-6.96 6.96,-6.96z"
+        android:strokeLineCap="butt"
+        android:fillAlpha="1"
+        android:fillType="nonZero"
+        android:strokeColor="#00000000"
+        android:fillColor="#0082c9"
+        android:strokeWidth="5.56589985"
+        android:strokeLineJoin="miter"
+        android:strokeAlpha="1"/>
+    <path
+        android:pathData="m39.11,73.76c2.78,0 4.33,1.98 4.33,4.94 0,0.28 -0.24,0.52 -0.52,0.52l-7.48,0c0.05,2.63 1.88,4.14 4,4.14 1.32,0 2.26,-0.56 2.73,-0.94 0.28,-0.19 0.52,-0.14 0.66,0.14l0.14,0.24c0.14,0.24 0.09,0.47 -0.14,0.66 -0.56,0.42 -1.79,1.13 -3.43,1.13 -3.06,0 -5.41,-2.21 -5.41,-5.41 0.05,-3.39 2.3,-5.41 5.13,-5.41zM41.98,78.18c-0.09,-2.16 -1.41,-3.25 -2.92,-3.25 -1.74,0 -3.25,1.13 -3.57,3.25l6.49,0z"
+        android:fillAlpha="1"
+        android:fillColor="#0082c9"/>
+    <path
+        android:pathData="m57.56,75.27 l0,-1.18 0,-2.45c0,-0.33 0.19,-0.52 0.52,-0.52l0.38,0c0.33,0 0.47,0.19 0.47,0.52l0,2.45 2.12,0c0.33,0 0.52,0.19 0.52,0.52l0,0.14c0,0.33 -0.19,0.47 -0.52,0.47l-2.12,0 0,5.17c0,2.4 1.46,2.68 2.26,2.73 0.42,0.05 0.56,0.14 0.56,0.52l0,0.28c0,0.33 -0.14,0.47 -0.56,0.47 -2.26,0 -3.62,-1.36 -3.62,-3.81l0,-5.32z"
+        android:fillAlpha="1"
+        android:fillColor="#0082c9"/>
+    <path
+        android:pathData="m68.33,73.76c1.79,0 2.92,0.75 3.43,1.18 0.24,0.19 0.28,0.42 0.05,0.71l-0.14,0.24c-0.19,0.28 -0.42,0.28 -0.71,0.09 -0.47,-0.33 -1.36,-0.94 -2.59,-0.94 -2.26,0 -4.05,1.69 -4.05,4.19 0,2.45 1.79,4.14 4.05,4.14 1.46,0 2.45,-0.66 2.92,-1.08 0.28,-0.19 0.47,-0.14 0.66,0.14l0.14,0.19c0.14,0.28 0.09,0.47 -0.14,0.71 -0.52,0.42 -1.79,1.32 -3.67,1.32 -3.06,0 -5.41,-2.21 -5.41,-5.41 0.05,-3.2 2.4,-5.46 5.46,-5.46z"
+        android:fillAlpha="1"
+        android:fillColor="#0082c9"/>
+    <path
+        android:pathData="m74.59,70.42c0,-0.33 -0.19,-0.52 0.14,-0.52l0.38,0c0.33,0 0.85,0.19 0.85,0.52l0,11.24c0,1.32 0.61,1.46 1.08,1.51 0.24,0 0.42,0.14 0.42,0.47l0,0.33c0,0.33 -0.14,0.52 -0.52,0.52 -0.85,0 -2.35,-0.28 -2.35,-2.54l0,-11.52z"
+        android:fillAlpha="1"
+        android:fillColor="#0082c9"/>
+    <path
+        android:pathData="m84.23,73.76c3.01,0 5.46,2.3 5.46,5.36 0,3.1 -2.45,5.46 -5.46,5.46 -3.01,0 -5.46,-2.35 -5.46,-5.46 0,-3.06 2.45,-5.36 5.46,-5.36zM84.23,83.36c2.21,0 4,-1.79 4,-4.23 0,-2.35 -1.79,-4.09 -4,-4.09 -2.21,0 -4.05,1.79 -4.05,4.09 0.05,2.4 1.83,4.23 4.05,4.23z"
+        android:fillAlpha="1"
+        android:fillColor="#0082c9"/>
+    <path
+        android:pathData="m107.7,73.76c2.49,0 3.39,2.07 3.39,2.07l0.05,0c0,0 -0.05,-0.33 -0.05,-0.8l0,-4.66c0,-0.33 -0.14,-0.52 0.19,-0.52l0.38,0c0.33,0 0.85,0.19 0.85,0.52l0,13.41c0,0.33 -0.14,0.52 -0.47,0.52l-0.33,0c-0.33,0 -0.52,-0.14 -0.52,-0.47l0,-0.8c0,-0.38 0.09,-0.66 0.09,-0.66l-0.05,0c0,0 -0.89,2.16 -3.57,2.16 -2.78,0 -4.52,-2.21 -4.52,-5.41 -0.09,-3.2 1.83,-5.36 4.56,-5.36zM107.75,83.36c1.74,0 3.34,-1.22 3.34,-4.19 0,-2.12 -1.08,-4.14 -3.29,-4.14 -1.83,0 -3.34,1.51 -3.34,4.14 0.05,2.54 1.36,4.19 3.29,4.19z"
+        android:fillAlpha="1"
+        android:fillColor="#0082c9"/>
+    <path
+        android:pathData="m21.86,84.35 l0.38,0c0.33,0 0.52,-0.19 0.52,-0.52l0,-10.1C22.75,72.13 24.49,70.99 26.47,70.99c1.98,0 3.72,1.14 3.72,2.74L30.19,83.83c0,0.33 0.19,0.52 0.52,0.52l0.38,0c0.33,0 0.47,-0.19 0.47,-0.52l0,-10.16c0,-2.68 -2.68,-4 -5.13,-4l0,0 0,0 0,0 0,0C24.07,69.67 21.39,70.99 21.39,73.67l0,10.16c0,0.33 0.14,0.52 0.47,0.52z"
+        android:fillAlpha="1"
+        android:fillColor="#0082c9"/>
+    <path
+        android:pathData="m100.37,74 l-0.38,0c-0.33,0 -0.52,0.19 -0.52,0.52l0,5.69c0,1.6 -1.03,3.06 -3.06,3.06 -1.98,0 -3.06,-1.46 -3.06,-3.06l0,-5.69c0,-0.33 -0.19,-0.52 -0.52,-0.52l-0.38,0c-0.33,0 -0.47,0.19 -0.47,0.52l0,6.07c0,2.68 1.98,4 4.42,4l0,0c0,0 0,0 0,0 0,0 0,0 0,0l0,0c2.45,0 4.42,-1.32 4.42,-4l0,-6.07c0.05,-0.33 -0.14,-0.52 -0.47,-0.52z"
+        android:fillAlpha="1"
+        android:fillColor="#0082c9"/>
+    <path
+        android:pathData="m53.8,73.92c-0.12,0.02 -0.23,0.1 -0.33,0.22l-1.9,2.27 -1.42,1.7 -2.16,-2.57 -1.17,-1.4c-0.11,-0.13 -0.23,-0.2 -0.35,-0.21 -0.12,-0.01 -0.25,0.04 -0.38,0.14l-0.29,0.24c-0.25,0.21 -0.24,0.45 -0.03,0.7l1.9,2.27 1.58,1.88 -2.31,2.76c-0,0 -0,0 -0,0.01l-1.17,1.39c-0.21,0.25 -0.19,0.52 0.06,0.73l0.29,0.24c0.25,0.21 0.48,0.16 0.69,-0.09l1.9,-2.27 1.42,-1.7 2.16,2.57c0,0 0,0 0,0l1.17,1.39c0.21,0.25 0.48,0.28 0.73,0.06l0.29,-0.24c0.25,-0.21 0.24,-0.45 0.03,-0.7l-1.9,-2.27 -1.58,-1.88 2.31,-2.76c0,-0 0,-0 0,-0.01l1.17,-1.39c0.21,-0.25 0.19,-0.52 -0.06,-0.73l-0.29,-0.24c-0.13,-0.11 -0.25,-0.15 -0.36,-0.13z"
+        android:fillAlpha="1"
+        android:fillColor="#0082c9"/>
+</vector>