diff --git a/app/src/main/java/com/remit/jmecustomer/features/sendmoney/view/SendMoneyV2TransactionCompleteActivity.java b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/view/SendMoneyV2TransactionCompleteActivity.java
index 33b8feaa..bb62e195 100644
--- a/app/src/main/java/com/remit/jmecustomer/features/sendmoney/view/SendMoneyV2TransactionCompleteActivity.java
+++ b/app/src/main/java/com/remit/jmecustomer/features/sendmoney/view/SendMoneyV2TransactionCompleteActivity.java
@@ -2,13 +2,16 @@ package com.remit.jmecustomer.features.sendmoney.view;
 
 import android.content.Intent;
 import android.graphics.Bitmap;
+import android.graphics.PorterDuff;
 import android.graphics.drawable.Drawable;
+import android.os.Build;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
@@ -126,7 +129,7 @@ public class SendMoneyV2TransactionCompleteActivity extends BaseActivity impleme
 
     private void performDefaultAction(Bundle savedInstanceState) {
         toolbarTitle.setText(R.string.receipt_title_text);
-        progressbar_partner_info.getIndeterminateDrawable().setColorFilter(ContextCompat.getColor(this, android.R.color.white), android.graphics.PorterDuff.Mode.MULTIPLY);
+        progressbar_partner_info.getIndeterminateDrawable().setColorFilter(ContextCompat.getColor(this, android.R.color.white), PorterDuff.Mode.MULTIPLY);
         if (savedInstanceState == null) {
             try {
                 transactionId = getIntent().getStringExtra(SEND_MONEY_TID_BUNDLE_KEY);
@@ -140,12 +143,33 @@ public class SendMoneyV2TransactionCompleteActivity extends BaseActivity impleme
                     List<String> list = Arrays.asList(displayActions.split(","));
                     if (list.contains(Constants.CancelStatus)) {
                         this.btnCancel.setVisibility(View.VISIBLE);
+                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+                            if (list.stream().count() == 1) {
+                                ViewGroup.LayoutParams lp = this.btnReject.getLayoutParams();
+                                lp.width = LinearLayout.LayoutParams.MATCH_PARENT;
+                                this.btnCancel.setLayoutParams(lp);
+                            }
+                        }
                     }
                     if (list.contains(Constants.AmendStatus)) {
-                        this.btnChange.setVisibility(View.INVISIBLE);
+                        this.btnChange.setVisibility(View.VISIBLE);
+                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+                            if (list.stream().count() == 1) {
+                                ViewGroup.LayoutParams lp = this.btnReject.getLayoutParams();
+                                lp.width = LinearLayout.LayoutParams.MATCH_PARENT;
+                                this.btnChange.setLayoutParams(lp);
+                            }
+                        }
                     }
                     if (list.contains(Constants.RejectStatus)) {
                         this.btnReject.setVisibility(View.VISIBLE);
+                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+                            if (list.stream().count() == 1) {
+                                ViewGroup.LayoutParams lp = this.btnReject.getLayoutParams();
+                                lp.width = LinearLayout.LayoutParams.MATCH_PARENT;
+                                this.btnReject.setLayoutParams(lp);
+                            }
+                        }
                     }
                 }
 
diff --git a/app/src/main/res/layout/activity_send_money_v2_transaction_complete.xml b/app/src/main/res/layout/activity_send_money_v2_transaction_complete.xml
index 6946496e..164c60f1 100644
--- a/app/src/main/res/layout/activity_send_money_v2_transaction_complete.xml
+++ b/app/src/main/res/layout/activity_send_money_v2_transaction_complete.xml
@@ -566,7 +566,7 @@
                     android:textAllCaps="false"
                     android:textColor="@color/white"
                     android:textSize="@dimen/_10ssp"
-                    android:visibility="invisible"/>
+                    android:visibility="gone"/>
 
                 <com.remit.jmecustomer.common.customwidgets.GmeButton
                     android:id="@+id/btn_cancel"
@@ -584,7 +584,7 @@
                     android:textAllCaps="false"
                     android:textColor="@color/white"
                     android:textSize="@dimen/_10ssp"
-                    android:visibility="invisible"/>
+                    android:visibility="gone"/>
 
 
                 <com.remit.jmecustomer.common.customwidgets.GmeButton
@@ -603,7 +603,8 @@
                     android:textAllCaps="false"
                     android:textColor="@color/white"
                     android:textSize="@dimen/_10ssp"
-                    android:visibility="invisible"/>
+                    android:visibility="gone"
+                   />
             </LinearLayout>
 
         </LinearLayout>