diff --git a/www/views/confirm.html b/www/views/confirm.html
index 71094eaca..8ad43e6f2 100644
--- a/www/views/confirm.html
+++ b/www/views/confirm.html
@@ -60,12 +60,18 @@
           <span class="label" ng-if="!isGlidera" translate>From</span>
           <span class="label" ng-if="isGlidera == 'buy'">To</span>
           <span class="label" ng-if="isGlidera == 'sell'">From</span>
-          <div class="wallet">
+          <div class="wallet" ng-if="wallet">
             <i class="icon big-icon-svg">
               <img src="img/icon-wallet.svg" ng-style="{'background-color': wallet.color}" class="bg"/>
             </i>
             <div>{{wallet.name}}</div>
           </div>
+          <div class="wallet" ng-if="!wallet">
+            <i class="icon big-icon-svg">
+              <img src="img/icon-wallet.svg" ng-style="{'background-color': 'grey'}" class="bg"/>
+            </i>
+            <div>...</div>
+          </div>
           <i class="icon bp-arrow-right"></i>
         </a>
         <a class="item single-line item-icon-right" ng-if="!insufficientFunds && !noMatchingWallet && !isGlidera" ng-click="showDescriptionPopup()">
diff --git a/www/views/includes/alert.html b/www/views/includes/alert.html
deleted file mode 100644
index 2da1e9b3a..000000000
--- a/www/views/includes/alert.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<div class="columns m20t">
-  <div class="m20t  size-14 text-center">
-      <i class="fi-alert"></i>
-      {{msg|translate}}
-  </div>
-<div class="text-center m20t" ng-click="close()">
-    <a class="button outline light-gray round tiny small-4">OK</a>
-  </div>
-</div>
diff --git a/www/views/includes/password.html b/www/views/includes/password.html
deleted file mode 100644
index 4a16c11bc..000000000
--- a/www/views/includes/password.html
+++ /dev/null
@@ -1,42 +0,0 @@
-
-  <div class="columns m20t">
-    <label class="size-14 text-center" for="password" ng-if="isSetup">
-      <span ng-show="!isVerification" translate>Set up a spending password</span>
-      <span ng-show="isVerification" translate>Repeat the spending password</span>
-    </label>
-    <label class="size-14 text-center" for="password" ng-if="!isSetup">
-      <span translate>Enter your spending password</span>
-    </label>
-
-    <div class="input m20t">
-      <input type="password" placeholder="{{'Your spending password'|translate}}"
-      id="passwordInput" name="password" ng-model="data.password" ng-keypress="keyPress($event)" autofocus>
-    </div>
-  </div>
-  <div class="row">
-    <div class="small-6 columns">
-      <button
-        class="round small-6 columns outline dark-gray expand"
-        ng-click="cancel()"
-        ng-disabled="loading">
-        <span class="size-12" translate>Cancel</span>
-      </button>
-    </div>
-
-    <div class="small-6 columns">
-      <button class="round expand"
-              ng-click="set()"
-              ng-disabled="!data.password || loading"
-        ng-style="{'background-color':index.backgroundColor}">
-        <span ng-if="isSetup" class="size-12" translate>SET</span>
-        <span ng-if="!isSetup" class="size-12">OK</span>
-      </button>
-    </div>
-  </div>
-
-    <p class="text-warning size-12 columns m20t text-center" ng-show="isSetup">
-      <i class="fi-alert"></i>
-      <span ng-show="!error" translate> Your wallet key will be encrypted. The Spending Password cannot be recovered. Be sure to write it down</span>
-
-      <span ng-show="error">{{error|translate}}</span>
-    </p>