diff --git a/app/src/main/res/layout/fr_loaded_wallet.xml b/app/src/main/res/layout/fr_loaded_wallet.xml
index 4d7b2dfacc..b90e7117c9 100644
--- a/app/src/main/res/layout/fr_loaded_wallet.xml
+++ b/app/src/main/res/layout/fr_loaded_wallet.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.constraint.ConstraintLayout 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:layout_width="match_parent"
@@ -41,7 +40,7 @@
                     android:id="@+id/ivTangemCard"
                     android:layout_width="match_parent"
                     android:layout_height="180dp"
-                    tools:src="@drawable/card_default"/>
+                    tools:src="@drawable/card_default" />
 
                 <RelativeLayout
                     android:id="@+id/rlProgressBar"
@@ -57,7 +56,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
                         android:alpha="0.75"
-                        android:background="@color/white"/>
+                        android:background="@color/white" />
 
                     <TextView
                         android:layout_width="wrap_content"
@@ -76,7 +75,7 @@
                         android:layout_centerInParent="true"
                         android:alpha="0.8"
                         android:elevation="1dp"
-                        android:progressTint="@color/colorPrimary"/>
+                        android:progressTint="@color/colorPrimary" />
 
                 </RelativeLayout>
 
@@ -92,7 +91,7 @@
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:gravity="center"
+                    android:gravity="center_vertical"
                     android:orientation="horizontal">
 
                     <TextView
@@ -101,8 +100,6 @@
                         android:layout_height="wrap_content"
                         android:layout_weight="3"
                         android:fontFamily="@font/maaxmedium"
-                        android:paddingLeft="5dp"
-                        android:paddingRight="5dp"
                         android:text="@string/no_data_string"
                         android:textAlignment="center"
                         android:textColor="@color/black"
@@ -113,14 +110,11 @@
                         android:id="@+id/tvBlockchain"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="4dp"
                         android:layout_weight="1"
                         android:fontFamily="@font/maax"
-                        android:paddingLeft="5dp"
-                        android:paddingRight="5dp"
                         android:textColor="@color/primary"
                         android:textStyle="normal|bold"
-                        tools:text="Bitcoin"/>
+                        tools:text="Bitcoin" />
 
                 </LinearLayout>
 
@@ -174,7 +168,7 @@
                         android:textColor="@android:color/black"
                         android:textSize="@dimen/text_size_1_small"
                         android:textStyle="normal|bold"
-                        tools:text="1DoQdnSYshhZ5Tqt5Sk6svZt29jqoYVwQY"/>
+                        tools:text="1DoQdnSYshhZ5Tqt5Sk6svZt29jqoYVwQY" />
 
                     <LinearLayout
                         android:layout_width="match_parent"
@@ -227,6 +221,7 @@
                             android:text="@string/copy"
                             android:textColor="@color/primary"
                             android:textSize="@dimen/text_size_medium" />
+
                     </LinearLayout>
 
                 </LinearLayout>
@@ -247,7 +242,7 @@
             android:id="@+id/tvMessage"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="#BF7FF27F"
+            android:background="@color/msg_okay"
             android:elevation="2dp"
             android:fontFamily="@font/maax"
             android:padding="4dp"
@@ -264,7 +259,7 @@
             android:layout_height="wrap_content"
             android:layout_alignParentBottom="false"
             android:layout_below="@+id/tvMessage"
-            android:background="#BFFF4444"
+            android:background="@color/msg_err"
             android:elevation="3dp"
             android:fontFamily="@font/maax"
             android:padding="4dp"
@@ -299,7 +294,7 @@
             android:paddingLeft="20dp"
             android:paddingRight="20dp"
             android:text="@string/load"
-            android:textSize="@dimen/text_size_large"/>
+            android:textSize="@dimen/text_size_large" />
 
         <android.support.v7.widget.AppCompatButton
             android:id="@+id/btnExtract"
@@ -339,7 +334,7 @@
             android:id="@+id/tvInfo"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginRight="20dp"
+            android:layout_marginEnd="20dp"
             android:fontFamily="@font/saira_condensed_bold"
             android:paddingLeft="10dp"
             android:paddingRight="10dp"
@@ -351,7 +346,7 @@
             android:id="@+id/fabNFC"
             android:layout_width="wrap_content"
             android:layout_height="30dp"
-            android:layout_marginLeft="20dp"
+            android:layout_marginStart="20dp"
             app:backgroundTint="@color/primary_dark"
             app:fabSize="mini"
             app:srcCompat="@drawable/ic_nfc_white_24dp" />
diff --git a/app/src/main/res/layout/fr_verify_card.xml b/app/src/main/res/layout/fr_verify_card.xml
index ff2ff2b389..6928a0e843 100644
--- a/app/src/main/res/layout/fr_verify_card.xml
+++ b/app/src/main/res/layout/fr_verify_card.xml
@@ -12,11 +12,11 @@
 
     <android.support.v4.widget.SwipeRefreshLayout
         android:id="@+id/swipe_container"
-        android:layout_width="0dp"
+        android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_marginBottom="8dp"
         android:padding="8dp"
-        app:layout_constraintBottom_toTopOf="@+id/rlToolButtons"
+        app:layout_constraintBottom_toTopOf="@+id/rlToolButtons1"
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
@@ -488,7 +488,7 @@
                     android:id="@+id/tvError"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:background="#7FFF4444"
+                    android:background="@color/msg_okay"
                     android:fontFamily="@font/montserrat_light"
                     android:padding="4dp"
                     android:shadowColor="@color/cardview_shadow_start_color"
@@ -496,7 +496,7 @@
                     android:shadowDy="2"
                     android:shadowRadius="2"
                     android:textAlignment="center"
-                    android:textColor="@color/white"
+                    android:textColor="@color/black"
                     android:textStyle="bold"
                     tools:text="Error!" />
 
@@ -504,7 +504,7 @@
                     android:id="@+id/tvMessage"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:background="#7F7FF27F"
+                    android:background="@color/msg_err"
                     android:fontFamily="@font/montserrat_light"
                     android:padding="4dp"
                     android:textAlignment="center"
@@ -519,9 +519,12 @@
     </android.support.v4.widget.SwipeRefreshLayout>
 
     <RelativeLayout
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:padding="8dp"
+        android:id="@+id/rlToolButtons1"
+        android:layout_width="match_parent"
+        android:layout_height="25dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginStart="8dp"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintBottom_toTopOf="@+id/rlToolButtons"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent">
@@ -559,8 +562,8 @@
 
     <LinearLayout
         android:id="@+id/rlToolButtons"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent">
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 3ea08659cd..69d9efd5fc 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:android="http://schemas.android.com/tools">
+<resources>
 
     <color name="colorPrimary">#027aff</color>
     <color name="colorPrimaryDark">#027AFF</color>
@@ -16,8 +16,8 @@
     <color name="text_normal">#FF505050</color>
     <color name="msg_send">@color/accent</color>
     <color name="msg_rcv">#4a763d</color>
-    <color name="msg_okay">#4fc84f</color>
-    <color name="msg_err">#ff4444</color>
+    <color name="msg_okay">#BF7FF27F</color>
+    <color name="msg_err">#BFFF4444</color>
     <color name="msg_start">#4a086e</color>
     <color name="msg_action">#0c15c1</color>
     <color name="btn_light">#e3e3e3</color>
@@ -34,9 +34,9 @@
     <color name="type_banknote">#ffffff</color>
     <color name="type_wallet">#ffffff</color>
     <color name="black_overlay">#66000000</color>
-    <color name="confirmed" >#106800</color>
-    <color name="not_confirmed" >#7c0a02</color>
+    <color name="confirmed">#106800</color>
+    <color name="not_confirmed">#7c0a02</color>
     <color name="bg_err">#600600</color>
     <color name="bg_msg">#bff2af</color>
 
-</resources>
+</resources>
\ No newline at end of file