diff --git a/css/src/main.css b/css/src/main.css
index c166f6563..cb24573a4 100644
--- a/css/src/main.css
+++ b/css/src/main.css
@@ -1618,8 +1618,8 @@ input.ng-invalid-match, input.ng-invalid-match:focus {
   padding: 0.8rem;
   position: absolute;
   background: #E4E8EC;
-  top: 37px;
-  right: 15px;
+  top: 10px;
+  right: 10px;
   line-height: 0;
   color: #7A8C9E;
   border-radius: 3px;
diff --git a/views/modals/address-book.html b/views/modals/address-book.html
index 9bc984882..1d36b206d 100644
--- a/views/modals/address-book.html
+++ b/views/modals/address-book.html
@@ -1,6 +1,3 @@
-<div class="text-right">
-  <a class="close-reveal-modal" ng-click="close()">Close</a>
-</div>
 <div class="row m10t">
   <div class="large-12 columns"> 
     <h1 ng-show="!showForm">Address Book</h1>
@@ -89,4 +86,5 @@
   <div class="large-12 columns" ng-show="!showForm">
     <a class="button primary expand" ng-click="toggleForm()"><i class="fi-plus"></i> Add entry</a>
   </div>
+  <a class="close-reveal-modal" ng-click="close()"><i class="fi-x size-18"></i></a>
 </div>
diff --git a/views/modals/paypro.html b/views/modals/paypro.html
index 9cb597acc..a9f16c0e1 100644
--- a/views/modals/paypro.html
+++ b/views/modals/paypro.html
@@ -1,10 +1,3 @@
-
-<div class="text-right">
-  <a class="close-reveal-modal" ng-click="cancel()">Close</a>
-</div>
-
-
-
 <div class="m20t text-center ">
   <div class="size-48">
   {{md.unitTotal}} {{$root.wallet.settings.unitName}}
@@ -12,6 +5,7 @@
   <div class="size-18 m5t text-gray">
     {{ alternative }} {{ alternativeIsoCode }}
   </div>
+  <a class="close-reveal-modal" ng-click="cancel()"><i class="fi-x size-18"></i></a>
 </div>
 <div class="line-b m10v"></div>
 
diff --git a/views/modals/qr-address.html b/views/modals/qr-address.html
index 777a3fcb8..78444bfa0 100644
--- a/views/modals/qr-address.html
+++ b/views/modals/qr-address.html
@@ -1,6 +1,3 @@
-<div class="text-right">
-  <a class="close-reveal-modal" ng-click="cancel()">Close</a>
-</div>
 <div class="text-center m20t">
   <qrcode size="220" data="{{address.address}}"></qrcode>
 
@@ -12,4 +9,5 @@
       ({{label}})
     </b>
   </div>
+  <a class="close-reveal-modal" ng-click="cancel()"><i class="fi-x size-18"></i></a>
 </div>
diff --git a/views/modals/tx-details.html b/views/modals/tx-details.html
index 50205df89..baabd0e5c 100644
--- a/views/modals/tx-details.html
+++ b/views/modals/tx-details.html
@@ -1,9 +1,3 @@
-
-<div class="text-right">
-  <a class="close-reveal-modal" ng-click="cancel()">Close</a>
-</div>
-
-
 <div class="m20t text-center">
   <div class="size-48"  ng-class="{
         'text-primary' : btx.action == 'received',
@@ -15,6 +9,7 @@
   <div class="size-18 m5t text-gray" ng-show="btx.alternativeAmount">
     {{btx.alternativeAmount}} {{$root.wallet.settings.alternativeIsoCode}}
   </div>
+  <a class="close-reveal-modal" ng-click="cancel()"><i class="fi-x size-18"></i></a>
 </div>
 
 <div class="line-b m10t"></div>
diff --git a/views/modals/wallet-info.html b/views/modals/wallet-info.html
index dc6f60bf4..58b5a7ca4 100644
--- a/views/modals/wallet-info.html
+++ b/views/modals/wallet-info.html
@@ -1,8 +1,3 @@
-
-<div class="text-right">
-  <a class="close-reveal-modal" ng-click="close()">Close</a>
-</div>
-
 <div class="text-center" ng-init="isComplete = item.isComplete(); networkName = item.getNetworkName()">
   <h1>{{item.name || item.id }}</h1>
   <h3>
@@ -58,5 +53,5 @@
       Copy this text as it is in a safe place (notepad or email)
     </div>
   </div>
-
+  <a class="close-reveal-modal" ng-click="close()"><i class="fi-x size-18"></i></a>
 </div>
diff --git a/views/modals/walletSelection.html b/views/modals/walletSelection.html
index 5d7617984..cfc8c2321 100644
--- a/views/modals/walletSelection.html
+++ b/views/modals/walletSelection.html
@@ -1,9 +1,3 @@
-
-<div class="text-right">
-  <a class="close-reveal-modal" ng-click="cancel()">Close</a>
-</div>
-
-
 <div ng-init="setWallets()">
 
   <h1 class="line-b"> Select a wallet to make the payment</h1>
@@ -29,5 +23,5 @@
       </div>
     </li>
   </ul>
-
+  <a class="close-reveal-modal" ng-click="cancel()"><i class="fi-x size-18"></i></a>
 </div>