diff --git a/app/build.gradle b/app/build.gradle
index 4256b77901..1ea7808851 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -72,11 +72,11 @@ dependencies {
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.1'
 
     implementation 'com.tangem:blockchain:1.130.0'
-    implementation 'com.tangem:core:1.96.0'
-    implementation 'com.tangem:sdk:1.96.0'
+    implementation 'com.tangem:core:1.99.0'
+    implementation 'com.tangem:sdk:1.99.0'
 
     // WebView
-    implementation "androidx.browser:browser:1.2.0"
+    implementation "androidx.browser:browser:1.3.0"
 
     //lifecycle
     implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.2.0"
@@ -102,7 +102,7 @@ dependencies {
     implementation 'com.google.firebase:firebase-config-ktx'
     implementation 'com.google.firebase:firebase-analytics-ktx'
 
-    testImplementation 'junit:junit:4.13'
+    testImplementation 'junit:junit:4.13.1'
     testImplementation "com.google.truth:truth:1.0.1"
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletFragment.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletFragment.kt
index 7dd3bef7a9..5098d05d83 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletFragment.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletFragment.kt
@@ -230,11 +230,8 @@ class WalletFragment : Fragment(R.layout.fragment_wallet), StoreSubscriber<Walle
     private fun setupAddressCard(state: WalletState) {
         if (state.walletAddresses != null) {
             l_address?.show()
-            val tvAddressPaddingTop = tv_address.resources.getDimension(R.dimen.dimen16).toInt()
             if (state.showMultipleAddress) {
                 (l_address as? ViewGroup)?.beginDelayedTransition()
-                tv_address.setPadding(tv_address.paddingStart, tvAddressPaddingTop / 2,
-                        tv_address.paddingEnd, tv_address.paddingBottom)
                 chip_group_address_type.show()
                 chip_group_address_type.fitChipsByGroupWidth()
 
@@ -249,8 +246,6 @@ class WalletFragment : Fragment(R.layout.fragment_wallet), StoreSubscriber<Walle
                     }
                 }
             } else {
-                tv_address.setPadding(tv_address.paddingStart, tvAddressPaddingTop,
-                        tv_address.paddingEnd, tv_address.paddingBottom)
                 chip_group_address_type.hide()
             }
             tv_address.text = state.walletAddresses.selectedAddress.address
diff --git a/app/src/main/res/layout/fragment_wallet.xml b/app/src/main/res/layout/fragment_wallet.xml
index 9ed6acedb3..4b25ad6452 100644
--- a/app/src/main/res/layout/fragment_wallet.xml
+++ b/app/src/main/res/layout/fragment_wallet.xml
@@ -43,8 +43,7 @@
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:id="@+id/cl_wallet"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="33dp">
+                android:layout_height="wrap_content">
 
                 <ImageView
                     android:id="@+id/iv_card"
diff --git a/app/src/main/res/layout/layout_address.xml b/app/src/main/res/layout/layout_address.xml
index f595eeccd7..b7ad833af2 100644
--- a/app/src/main/res/layout/layout_address.xml
+++ b/app/src/main/res/layout/layout_address.xml
@@ -60,14 +60,13 @@
                 android:layout_height="wrap_content"
                 android:ellipsize="middle"
                 android:paddingStart="@dimen/dimen16"
-                android:paddingTop="@dimen/dimen16"
                 android:paddingEnd="@dimen/dimen16"
                 android:singleLine="true"
                 android:textColor="@color/darkGray1"
                 android:textSize="13sp"
                 app:layout_constraintEnd_toStartOf="@id/btn_copy"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/chip_group_address_type"
+                app:layout_constraintTop_toTopOf="@id/btn_copy"
                 tools:text="139mrsJgyWnJ**** **** y9BV" />
 
             <TextView
@@ -78,14 +77,13 @@
                 android:paddingStart="16dp"
                 android:paddingTop="4dp"
                 android:paddingEnd="16dp"
-                android:paddingBottom="25dp"
                 android:text="@string/wallet_address_button_explore"
                 android:textColor="@color/darkGray6"
                 android:textSize="14sp"
                 android:textStyle="bold"
                 app:drawableEndCompat="@drawable/ic_angle_bracket_right"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/tv_address" />
+                app:layout_constraintBottom_toBottomOf="@id/btn_copy"
+                app:layout_constraintStart_toStartOf="parent" />
 
 
             <FrameLayout
@@ -94,10 +92,12 @@
                 android:layout_height="@dimen/btn_rounded_size"
                 android:layout_marginTop="16dp"
                 android:layout_marginEnd="16dp"
+                android:layout_marginBottom="25dp"
                 android:background="@drawable/shape_ellipse"
                 android:clickable="true"
                 android:elevation="3dp"
                 android:focusable="true"
+                app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toStartOf="@id/btn_show_qr"
                 app:layout_constraintTop_toBottomOf="@id/chip_group_address_type">
 
@@ -151,9 +151,9 @@
                 android:layout_height="wrap_content"
                 android:layout_margin="16dp"
                 android:src="@drawable/ic_payid"
+                app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/v_payid_divider"
-                app:layout_constraintBottom_toBottomOf="parent"/>
+                app:layout_constraintTop_toBottomOf="@id/v_payid_divider" />
 
             <TextView
                 android:id="@+id/tv_create_payid"
diff --git a/app/src/main/res/layout/layout_wallet_short_buttons.xml b/app/src/main/res/layout/layout_wallet_short_buttons.xml
index 4971b42309..c66e96ee34 100644
--- a/app/src/main/res/layout/layout_wallet_short_buttons.xml
+++ b/app/src/main/res/layout/layout_wallet_short_buttons.xml
@@ -18,7 +18,8 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@id/btn_top_up"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintVertical_bias="1" />
+        app:layout_constraintVertical_bias="1"
+        android:layout_marginBottom="33dp"/>
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btn_top_up"
@@ -34,7 +35,8 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/btn_confirm_short"
         app:layout_constraintStart_toEndOf="@+id/btn_scan_short"
-        app:layout_constraintVertical_bias="1" />
+        app:layout_constraintVertical_bias="1"
+        android:layout_marginBottom="33dp"/>
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/btn_confirm_short"
@@ -50,6 +52,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@+id/btn_top_up"
-        app:layout_constraintVertical_bias="1" />
+        app:layout_constraintVertical_bias="1"
+        android:layout_marginBottom="33dp"/>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index ca088a1567..4dc0d14356 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,8 +10,8 @@ buildscript {
         classpath "com.android.tools.build:gradle:${versions.build_gradle}"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$versions.kotlin"
         classpath "com.github.dcendents:android-maven-gradle-plugin:2.1"
-        classpath 'com.google.gms:google-services:4.3.3'
-        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.2.0'
+        classpath 'com.google.gms:google-services:4.3.5'
+        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.4.1'
 //        classpath 'com.google.firebase:perf-plugin:1.3.1'
     }
 }
diff --git a/dependencies.gradle b/dependencies.gradle
index ed2e48ec9d..6aa50c71a1 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -1,4 +1,4 @@
 ext.versions = [
-        kotlin      : '1.4.10',
+        kotlin      : '1.4.30',
         build_gradle: '4.1.2',
 ]