diff --git a/.idea/misc.xml b/.idea/misc.xml
index 703e5d4b89..cd2f3a654d 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -5,6 +5,41 @@
       <configuration PROFILE_NAME="Debug" CONFIG_NAME="Debug" />
     </configurations>
   </component>
+  <component name="NullableNotNullManager">
+    <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
+    <option name="myDefaultNotNull" value="androidx.annotation.NonNull" />
+    <option name="myNullables">
+      <value>
+        <list size="10">
+          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
+          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
+          <item index="2" class="java.lang.String" itemvalue="javax.annotation.CheckForNull" />
+          <item index="3" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
+          <item index="4" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
+          <item index="5" class="java.lang.String" itemvalue="androidx.annotation.Nullable" />
+          <item index="6" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNullable" />
+          <item index="7" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.Nullable" />
+          <item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableDecl" />
+          <item index="9" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableType" />
+        </list>
+      </value>
+    </option>
+    <option name="myNotNulls">
+      <value>
+        <list size="9">
+          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
+          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
+          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
+          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
+          <item index="4" class="java.lang.String" itemvalue="androidx.annotation.NonNull" />
+          <item index="5" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNonNull" />
+          <item index="6" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.NonNull" />
+          <item index="7" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullDecl" />
+          <item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullType" />
+        </list>
+      </value>
+    </option>
+  </component>
   <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
diff --git a/app/src/main/java/com/tangem/domain/wallet/cardano/CardanoEngine.java b/app/src/main/java/com/tangem/domain/wallet/cardano/CardanoEngine.java
index b89be36848..8561f4c0ff 100644
--- a/app/src/main/java/com/tangem/domain/wallet/cardano/CardanoEngine.java
+++ b/app/src/main/java/com/tangem/domain/wallet/cardano/CardanoEngine.java
@@ -15,10 +15,10 @@ import com.tangem.domain.wallet.Base58;
 import com.tangem.domain.wallet.CoinData;
 import com.tangem.domain.wallet.CoinEngine;
 import com.tangem.domain.wallet.TangemContext;
-import com.tangem.tangemcard.data.TangemCard;
-import com.tangem.tangemcard.reader.CardProtocol;
-import com.tangem.tangemcard.tasks.SignTask;
-import com.tangem.tangemcard.util.Util;
+import com.tangem.tangemcommon.data.TangemCard;
+import com.tangem.tangemcommon.reader.CardProtocol;
+import com.tangem.tangemcommon.tasks.SignTask;
+import com.tangem.tangemcommon.util.Util;
 import com.tangem.util.DecimalDigitsInputFilter;
 import com.tangem.wallet.R;
 
diff --git a/tangemserver-android/src/main/java/com/tangem/tangemserver/android/data/LocalStorage.kt b/tangemserver-android/src/main/java/com/tangem/tangemserver/android/data/LocalStorage.kt
index 7d4d6c3a10..5f5ce53f51 100644
--- a/tangemserver-android/src/main/java/com/tangem/tangemserver/android/data/LocalStorage.kt
+++ b/tangemserver-android/src/main/java/com/tangem/tangemserver/android/data/LocalStorage.kt
@@ -49,7 +49,7 @@ class LocalStorage
             artworks = HashMap()
         }
 
-        if (artworks.count() == 0) {
+        if (artworks.count() < 21) {
 //          forceSave=true only on the last one
             putResourceArtworkToCatalog(R.drawable.card_default, false)
             putResourceArtworkToCatalog(R.drawable.card_default_nft, false)
diff --git a/tangemserver-android/src/main/res/drawable/card_ff32.png b/tangemserver-android/src/main/res/drawable/card_ff32.png
new file mode 100644
index 0000000000..3e0cd61995
Binary files /dev/null and b/tangemserver-android/src/main/res/drawable/card_ff32.png differ