diff --git a/app/src/main/java/com/tangem/presentation/activity/EmptyWalletActivity.kt b/app/src/main/java/com/tangem/presentation/activity/EmptyWalletActivity.kt
index 1f466e6d82..f20c3a6ca8 100644
--- a/app/src/main/java/com/tangem/presentation/activity/EmptyWalletActivity.kt
+++ b/app/src/main/java/com/tangem/presentation/activity/EmptyWalletActivity.kt
@@ -30,6 +30,7 @@ import com.tangem.tangemcard.util.Util
 import com.tangem.util.LOG
 import com.tangem.wallet.R
 import kotlinx.android.synthetic.main.activity_empty_wallet.*
+import kotlinx.android.synthetic.main.layout_tangem_card.*
 import javax.inject.Inject
 
 class EmptyWalletActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, CardProtocol.Notifications {
@@ -62,6 +63,8 @@ class EmptyWalletActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, Card
 
         ctx = TangemContext.loadFromBundle(this, intent.extras)
 
+
+
         tvIssuer.text = ctx.card!!.issuerDescription
 
         if (ctx.card!!.tokenSymbol.length > 1) {
@@ -71,7 +74,7 @@ class EmptyWalletActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, Card
             tvBlockchain.text = ctx.blockchainName
 
         tvCardID.text = ctx.card!!.cidDescription
-        imgBlockchain.setImageResource(ctx.blockchain.getImageResource(this, ctx.card!!.tokenSymbol))
+        ivTangemCard.setImageBitmap(App.localStorage.getCardArtworkBitmap(ctx.card))
 
         if (ctx.card!!.useDefaultPIN1()) {
             imgPIN.setImageResource(R.drawable.unlock_pin1)
diff --git a/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt b/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt
index 5a563102ba..449d9d26c0 100644
--- a/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt
+++ b/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt
@@ -52,6 +52,8 @@ import com.tangem.util.LOG
 import com.tangem.util.UtilHelper
 import com.tangem.wallet.R
 import kotlinx.android.synthetic.main.fr_loaded_wallet.*
+import kotlinx.android.synthetic.main.layout_btn_details.*
+import kotlinx.android.synthetic.main.layout_tangem_card.*
 import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
 import java.io.InputStream
diff --git a/app/src/main/res/layout/activity_empty_wallet.xml b/app/src/main/res/layout/activity_empty_wallet.xml
index 5ebe26e93a..5505168234 100644
--- a/app/src/main/res/layout/activity_empty_wallet.xml
+++ b/app/src/main/res/layout/activity_empty_wallet.xml
@@ -9,168 +9,202 @@
     tools:context="com.tangem.presentation.activity.EmptyWalletActivity"
     tools:ignore="contentDescription">
 
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_marginBottom="20dp"
-        android:layout_marginTop="20dp">
+    <include
+        android:id="@+id/loCard"
+        layout="@layout/layout_tangem_card"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
-        <LinearLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginEnd="8dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/loCard">
+
+        <TextView
+            android:id="@+id/textView6"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
-            android:background="@color/white"
+            android:fontFamily="@font/maax"
             android:gravity="center_vertical"
-            android:orientation="vertical"
-            android:padding="8dp">
+            android:text="@string/wallet_has_not_been_yet_created"
+            android:textAlignment="center"
+            android:textSize="@dimen/text_size_1_small"
+            app:layout_constraintBottom_toTopOf="@+id/btnNewWallet"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:layout_editor_absoluteX="8dp" />
+
+        <androidx.appcompat.widget.AppCompatButton
+            android:id="@+id/btnNewWallet"
+            style="@style/AppTheme.RoundedCornerMaterialButton"
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            android:layout_margin="32dp"
+            android:layout_marginStart="8dp"
+            android:layout_marginEnd="8dp"
+            android:fontFamily="@font/saira_condensed_bold"
+            android:text="@string/create_wallet"
+            android:textSize="@dimen/text_size_large"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/textView6" />
+
+        <include
+            android:id="@+id/include2"
+            layout="@layout/layout_btn_details"
+            android:layout_width="150dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="8dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginEnd="8dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/btnNewWallet" />
+
+        <LinearLayout
+            android:id="@+id/linearLayout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="8dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginEnd="8dp"
+            android:orientation="horizontal"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/include2">
 
             <TextView
-                android:layout_width="match_parent"
+                android:layout_width="@dimen/empty_wallet_left_col_width"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
+                android:layout_marginStart="@dimen/empty_wallet_left_col_margin"
                 android:fontFamily="@font/maax"
-                android:gravity="center_vertical"
-                android:text="@string/wallet_has_not_been_yet_created"
-                android:textAlignment="center"
+                android:text="@string/blockchain"
+                android:textColor="@color/primary_dark"
                 android:textSize="@dimen/text_size_1_small" />
 
-            <androidx.appcompat.widget.AppCompatButton
-                android:id="@+id/btnNewWallet"
-                style="@style/AppTheme.RoundedCornerMaterialButton"
-                android:layout_width="match_parent"
-                android:layout_height="50dp"
-                android:layout_margin="32dp"
-                android:fontFamily="@font/saira_condensed_bold"
-                android:text="@string/create_wallet"
-                android:textSize="@dimen/text_size_large" />
-
-            <LinearLayout
-                android:layout_width="match_parent"
+            <TextView
+                android:id="@+id/tvBlockchain"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:orientation="horizontal">
-
-                <TextView
-                    android:layout_width="@dimen/empty_wallet_left_col_width"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="@dimen/empty_wallet_left_col_margin"
-                    android:fontFamily="@font/maax"
-                    android:text="@string/blockchain"
-                    android:textColor="@color/primary_dark"
-                    android:textSize="@dimen/text_size_1_small" />
-
-                <TextView
-                    android:id="@+id/tvBlockchain"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:fontFamily="@font/maax"
-                    android:textColor="@color/primary_dark"
-                    android:textSize="@dimen/text_size_1_small"
-                    android:textStyle="normal|bold"
-                    tools:text="12345" />
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal">
-
-                <TextView
-                    android:layout_width="@dimen/empty_wallet_left_col_width"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="@dimen/empty_wallet_left_col_margin"
-                    android:fontFamily="@font/maax"
-                    android:text="@string/issuer"
-                    android:textColor="@color/primary_dark"
-                    android:textSize="@dimen/text_size_1_small" />
-
-                <TextView
-                    android:id="@+id/tvIssuer"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:fontFamily="@font/maax"
-                    android:textColor="@color/primary_dark"
-                    android:textSize="@dimen/text_size_1_small"
-                    android:textStyle="normal|bold"
-                    tools:text="5555" />
-
-            </LinearLayout>
+                android:fontFamily="@font/maax"
+                android:textColor="@color/primary_dark"
+                android:textSize="@dimen/text_size_1_small"
+                android:textStyle="normal|bold"
+                tools:text="Bitcoin" />
 
         </LinearLayout>
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"
-            android:layout_alignParentEnd="true"
-            android:orientation="vertical">
+            android:layout_marginStart="8dp"
+            android:layout_marginTop="24dp"
+            android:layout_marginEnd="8dp"
+            android:orientation="horizontal"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="@+id/linearLayout">
 
             <TextView
-                android:id="@+id/tvCardID"
-                android:layout_width="match_parent"
+                android:layout_width="@dimen/empty_wallet_left_col_width"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/empty_wallet_left_col_margin"
+                android:fontFamily="@font/maax"
+                android:text="@string/issuer"
+                android:textColor="@color/primary_dark"
+                android:textSize="@dimen/text_size_1_small" />
+
+            <TextView
+                android:id="@+id/tvIssuer"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:fontFamily="@font/maax"
-                android:text="@string/no_data_string_1"
-                android:textAlignment="center"
                 android:textColor="@color/primary_dark"
                 android:textSize="@dimen/text_size_1_small"
-                android:textStyle="normal|bold" />
-
-            <TextView
-                android:id="@+id/textView5"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:fontFamily="@font/maax"
-                android:text="@string/scan_again_to_verify_the_card"
-                android:textAlignment="center"
-                android:textColor="@android:color/darker_gray"
-                android:textSize="@dimen/text_size_small" />
+                android:textStyle="normal|bold"
+                tools:text="TANGEM" />
 
         </LinearLayout>
 
-        <ImageView
-            android:id="@+id/imgBlockchain"
-            android:layout_width="32dp"
-            android:layout_height="32dp"
-            android:layout_alignParentEnd="true"
-            android:layout_alignParentTop="true"
-            android:layout_marginEnd="8dp"
-            android:layout_marginTop="8dp"
-            android:src="@drawable/tangem_logo_small_new" />
 
-        <ImageView
-            android:id="@+id/imgPIN"
-            android:layout_width="24dp"
-            android:layout_height="24dp"
-            android:layout_alignParentBottom="true"
-            android:layout_alignParentStart="false"
-            android:layout_margin="8dp"
-            android:layout_marginEnd="4dp"
-            android:layout_toStartOf="@+id/imgPIN2orSecurityDelay"
-            android:src="@drawable/unlock_pin1" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
-        <ImageView
-            android:id="@+id/imgPIN2orSecurityDelay"
-            android:layout_width="24dp"
-            android:layout_height="24dp"
-            android:layout_alignParentBottom="true"
-            android:layout_alignParentEnd="true"
-            android:layout_alignParentStart="false"
-            android:layout_marginBottom="8dp"
-            android:layout_marginEnd="8dp"
-            android:src="@drawable/unlock_pin2" />
+    <LinearLayout
+        android:id="@+id/linearLayout2"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentBottom="true"
+        android:layout_marginBottom="8dp"
+        android:orientation="vertical"
+        app:layout_constraintBottom_toBottomOf="parent">
 
-        <ImageView
-            android:id="@+id/imgDeveloperVersion"
-            android:layout_width="24dp"
-            android:layout_height="24dp"
-            android:layout_alignParentBottom="true"
-            android:layout_alignParentStart="true"
-            android:layout_marginBottom="8dp"
-            android:layout_marginStart="8dp"
-            android:src="@drawable/ic_developer_version" />
+        <TextView
+            android:id="@+id/tvCardID"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:fontFamily="@font/maax"
+            android:text="@string/no_data_string_1"
+            android:textAlignment="center"
+            android:textColor="@color/primary_dark"
+            android:textSize="@dimen/text_size_1_small"
+            android:textStyle="normal|bold" />
 
-    </RelativeLayout>
+        <TextView
+            android:id="@+id/textView5"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:fontFamily="@font/maax"
+            android:text="@string/scan_again_to_verify_the_card"
+            android:textAlignment="center"
+            android:textColor="@android:color/darker_gray"
+            android:textSize="@dimen/text_size_small" />
+
+    </LinearLayout>
+
+    <ImageView
+        android:id="@+id/imgPIN"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:layout_alignParentStart="false"
+        android:layout_alignParentBottom="true"
+        android:layout_margin="8dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginBottom="8dp"
+        android:layout_toStartOf="@+id/imgPIN2orSecurityDelay"
+        android:src="@drawable/unlock_pin1"
+        app:layout_constraintBottom_toBottomOf="@+id/linearLayout2"
+        app:layout_constraintEnd_toStartOf="@+id/imgPIN2orSecurityDelay" />
+
+    <ImageView
+        android:id="@+id/imgPIN2orSecurityDelay"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:layout_alignParentStart="false"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentBottom="true"
+        android:layout_marginEnd="8dp"
+        android:layout_marginBottom="8dp"
+        android:src="@drawable/unlock_pin2"
+        app:layout_constraintBottom_toBottomOf="@+id/linearLayout2"
+        app:layout_constraintEnd_toEndOf="@+id/linearLayout2" />
+
+    <ImageView
+        android:id="@+id/imgDeveloperVersion"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentBottom="true"
+        android:layout_marginStart="8dp"
+        android:layout_marginBottom="8dp"
+        android:src="@drawable/ic_developer_version"
+        app:layout_constraintBottom_toBottomOf="@+id/linearLayout2"
+        app:layout_constraintStart_toStartOf="parent" />
 
     <ProgressBar
         android:id="@+id/progressBar"
diff --git a/app/src/main/res/layout/fr_loaded_wallet.xml b/app/src/main/res/layout/fr_loaded_wallet.xml
index 72018a0a82..a33055a297 100644
--- a/app/src/main/res/layout/fr_loaded_wallet.xml
+++ b/app/src/main/res/layout/fr_loaded_wallet.xml
@@ -29,60 +29,9 @@
             android:background="@color/white"
             android:orientation="vertical">
 
-            <RelativeLayout
+            <include
                 android:id="@+id/loCard"
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:maxHeight="200dp"
-                android:padding="3dp"
-                app:layout_constraintHeight_max="200dp"
-                app:layout_constraintTop_toTopOf="parent">
-
-                <ImageView
-                    android:id="@+id/ivTangemCard"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    tools:src="@drawable/card_default" />
-
-                <RelativeLayout
-                    android:id="@+id/rlProgressBar"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_centerHorizontal="true"
-                    android:elevation="3dp"
-                    android:padding="5dp"
-                    android:visibility="gone"
-                    tools:visibility="visible">
-
-                    <TextView
-                        android:id="@+id/textView10"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:alpha="0.75"
-                        android:background="@color/white" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_centerInParent="true"
-                        android:alpha="1"
-                        android:fontFamily="@font/maaxmedium"
-                        android:text="@string/verifying"
-                        android:textColor="@color/colorPrimary"
-                        android:textSize="10sp"
-                        android:textStyle="bold" />
-
-                    <ProgressBar
-                        android:layout_width="@dimen/size_progress_bar_big"
-                        android:layout_height="@dimen/size_progress_bar_big"
-                        android:layout_centerInParent="true"
-                        android:alpha="1"
-                        android:elevation="1dp"
-                        android:progressTint="@color/colorPrimary" />
-
-                </RelativeLayout>
-
-            </RelativeLayout>
+                layout="@layout/layout_tangem_card" />
 
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
@@ -345,22 +294,7 @@
         android:paddingBottom="10dp"
         app:layout_constraintBottom_toBottomOf="parent">
 
-        <androidx.appcompat.widget.AppCompatButton
-            android:id="@+id/btnDetails"
-            style="@style/AppTheme.RoundedCornerMaterialButton"
-            android:layout_width="0dp"
-            android:layout_height="34dp"
-            android:layout_marginTop="5dp"
-            android:layout_marginBottom="5dp"
-            android:layout_weight="1"
-            android:backgroundTint="@color/white"
-            android:drawableStart="@drawable/ic_settings_black_24dp"
-            android:elevation="15dp"
-            android:fontFamily="@font/saira_condensed_bold"
-            android:paddingLeft="20dp"
-            android:paddingRight="20dp"
-            android:text="@string/details"
-            android:textColor="@color/primary_dark" />
+        <include layout="@layout/layout_btn_details" />
 
         <androidx.appcompat.widget.AppCompatButton
             android:id="@+id/btnNewScan"
diff --git a/app/src/main/res/layout/layout_btn_details.xml b/app/src/main/res/layout/layout_btn_details.xml
new file mode 100644
index 0000000000..34de9aff03
--- /dev/null
+++ b/app/src/main/res/layout/layout_btn_details.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.appcompat.widget.AppCompatButton xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/btnDetails"
+    style="@style/AppTheme.RoundedCornerMaterialButton"
+    android:layout_width="0dp"
+    android:layout_height="34dp"
+    android:layout_marginTop="5dp"
+    android:layout_marginBottom="5dp"
+    android:layout_weight="1"
+    android:backgroundTint="@color/white"
+    android:drawableStart="@drawable/ic_settings_black_24dp"
+    android:elevation="15dp"
+    android:fontFamily="@font/saira_condensed_bold"
+    android:paddingLeft="20dp"
+    android:paddingRight="20dp"
+    android:text="@string/details"
+    android:textColor="@color/primary_dark"
+    tools:showIn="@layout/fr_loaded_wallet" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/layout_tangem_card.xml b/app/src/main/res/layout/layout_tangem_card.xml
new file mode 100644
index 0000000000..888dc223b7
--- /dev/null
+++ b/app/src/main/res/layout/layout_tangem_card.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/loCard"
+    android:layout_width="match_parent"
+    android:layout_height="0dp"
+    android:maxHeight="200dp"
+    android:padding="3dp"
+    app:layout_constraintHeight_max="200dp"
+    app:layout_constraintTop_toTopOf="parent"
+    tools:showIn="@layout/fr_loaded_wallet">
+
+    <ImageView
+        android:id="@+id/ivTangemCard"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        tools:src="@drawable/card_default" />
+
+    <RelativeLayout
+        android:id="@+id/rlProgressBar"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_centerHorizontal="true"
+        android:elevation="3dp"
+        android:padding="5dp"
+        android:visibility="gone"
+        tools:visibility="visible">
+
+        <TextView
+            android:id="@+id/textView10"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:alpha="0.75"
+            android:background="@color/white" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:alpha="1"
+            android:fontFamily="@font/maaxmedium"
+            android:text="@string/verifying"
+            android:textColor="@color/colorPrimary"
+            android:textSize="12sp"
+            android:textStyle="bold" />
+
+        <ProgressBar
+            android:layout_width="@dimen/size_progress_bar_big"
+            android:layout_height="@dimen/size_progress_bar_big"
+            android:layout_centerInParent="true"
+            android:alpha="1"
+            android:elevation="1dp"
+            android:progressTint="@color/colorPrimary" />
+
+    </RelativeLayout>
+
+</RelativeLayout>
\ No newline at end of file