diff --git a/app/build.gradle b/app/build.gradle
index 9e5f759c91..84ff54610c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -15,7 +15,7 @@ android {
         applicationId "com.tangem.wallet"
         minSdkVersion 21
         targetSdkVersion 27
-        versionCode 56
+        versionCode 57
         versionName "0.88.1." + generateVersionName()
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
@@ -41,7 +41,6 @@ android {
 }
 
 dependencies {
-    implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'com.android.support:appcompat-v7:27.1.1'
     implementation 'com.android.support:design:27.1.1'
diff --git a/app/src/main/java/com/tangem/presentation/fragment/VerifyCard.kt b/app/src/main/java/com/tangem/presentation/fragment/VerifyCard.kt
index aa5b0dfb9b..09c9eac59f 100644
--- a/app/src/main/java/com/tangem/presentation/fragment/VerifyCard.kt
+++ b/app/src/main/java/com/tangem/presentation/fragment/VerifyCard.kt
@@ -67,7 +67,7 @@ class VerifyCard : Fragment(), NfcAdapter.ReaderCallback {
 
         updateViews()
 
-        swipe_container.setOnRefreshListener { swipe_container.isRefreshing = false }
+        srlVerifyCard.setOnRefreshListener { srlVerifyCard.isRefreshing = false }
 
         // set listeners
         fabMenu.setOnClickListener { showMenu(fabMenu) }
@@ -219,7 +219,7 @@ class VerifyCard : Fragment(), NfcAdapter.ReaderCallback {
             }
             REQUEST_CODE_SEND_PAYMENT -> {
                 if (resultCode == Activity.RESULT_OK) {
-                    swipe_container.isRefreshing = true
+                    srlVerifyCard.isRefreshing = true
                     card!!.clearInfo()
                     updateViews()
                 }
diff --git a/app/src/main/res/layout/fr_loaded_wallet.xml b/app/src/main/res/layout/fr_loaded_wallet.xml
index 71f5277515..c2ff7668e6 100644
--- a/app/src/main/res/layout/fr_loaded_wallet.xml
+++ b/app/src/main/res/layout/fr_loaded_wallet.xml
@@ -175,7 +175,8 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginBottom="10dp"
-                        android:layout_marginRight="4dp"
+                        android:layout_marginEnd="4dp"
+                        android:layout_marginStart="4dp"
                         android:fontFamily="@font/maax"
                         android:textAlignment="center"
                         android:textColor="@android:color/black"
diff --git a/app/src/main/res/layout/fr_verify_card.xml b/app/src/main/res/layout/fr_verify_card.xml
index 27f1194a3f..f8bcb01758 100644
--- a/app/src/main/res/layout/fr_verify_card.xml
+++ b/app/src/main/res/layout/fr_verify_card.xml
@@ -11,7 +11,7 @@
     tools:showIn="@layout/activity_verify_card">
 
     <android.support.v4.widget.SwipeRefreshLayout
-        android:id="@+id/swipe_container"
+        android:id="@+id/srlVerifyCard"
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_marginBottom="8dp"
@@ -29,9 +29,9 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="@color/white"
-                android:layout_marginStart="16dp"
                 android:layout_marginEnd="16dp"
+                android:layout_marginStart="16dp"
+                android:background="@color/white"
                 android:orientation="vertical">
 
                 <RelativeLayout
@@ -481,6 +481,7 @@
                         android:id="@+id/tvValidationNode"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:layout_marginBottom="5dp"
                         android:fontFamily="@font/maax"
                         android:textColor="@color/primary_dark"
                         android:textSize="@dimen/text_size_2_small"
@@ -506,6 +507,7 @@
                         android:id="@+id/tvInputs"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:layout_marginBottom="5dp"
                         android:fontFamily="@font/maax"
                         android:textColor="@color/primary_dark"
                         android:textSize="@dimen/text_size_2_small"
@@ -525,13 +527,18 @@
                     android:shadowDx="2"
                     android:shadowDy="2"
                     android:shadowRadius="2"
+
+
                     android:textAlignment="center"
                     android:textColor="@color/black"
                     android:textStyle="bold"
-                    tools:text="Error!" />
+                    android:visibility="gone"
+                    tools:text="Message!" />
 
                 <TextView
                     android:id="@+id/tvMessage"
+
+
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:background="@color/msg_err"
@@ -540,7 +547,8 @@
                     android:textAlignment="center"
                     android:textColor="@color/black"
                     android:textStyle="normal|bold"
-                    tools:text="Message!" />
+                    android:visibility="gone"
+                    tools:text="Error!" />
 
             </LinearLayout>
 
@@ -551,9 +559,7 @@
     <RelativeLayout
         android:id="@+id/rlToolButtons1"
         android:layout_width="match_parent"
-        android:layout_height="25dp"
-        android:layout_marginEnd="8dp"
-        android:layout_marginStart="8dp"
+        android:layout_height="28dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintBottom_toTopOf="@+id/rlToolButtons"
         app:layout_constraintLeft_toLeftOf="parent"