diff --git a/www/js/controllers/wallet-controllers.js b/www/js/controllers/wallet-controllers.js
index 38846e96cef58276bd36cc27e31fa206429828cd..aaedbbec02984dbfa4c03615ca8d8f0fe46d5748 100644
--- a/www/js/controllers/wallet-controllers.js
+++ b/www/js/controllers/wallet-controllers.js
@@ -524,7 +524,7 @@ function WalletController($scope, $rootScope, $q, $ionicPopup, $timeout, $state,
 }
 
 
-function WalletTxController($scope, $filter, $ionicPopover, $state, UIUtils, csWallet,
+function WalletTxController($scope, $filter, $ionicPopover, $state, $timeout, UIUtils, csWallet,
                             Modals, csSettings, BMA,csTx) {
   'ngInject';
 
diff --git a/www/plugins/es/templates/common/item_comment_content.html b/www/plugins/es/templates/common/item_comment_content.html
index 6ddc4d6128a909550784551106060f51c2dbd2d4..015e58ceffa27cbf664cb98620af31377d667633 100644
--- a/www/plugins/es/templates/common/item_comment_content.html
+++ b/www/plugins/es/templates/common/item_comment_content.html
@@ -1,22 +1,21 @@
 
   <div class="item item-avatar done in">
     <span class="avatar"
-          ng-id="!comment.avatar"
+          ng-if="::!comment.avatar"
           ng-class="{'avatar-member': comment.uid, 'avatar-wallet': !comment.uid}"></span>
     <span class="avatar"
-          ng-if="comment.avatar"
+          ng-if="::comment.avatar"
           style="background-image: url({{::comment.avatar.src}})"></span>
 
     <a class="pull-left"
-       ng-class="{'positive': comment.uid, 'dark': !comment.uid}"
-       ui-sref="app.wot_identity({pubkey:comment.issuer, uid: comment.name||comment.uid})">
-      <ng-if ng-if="comment.uid">
+       ui-sref="app.wot_identity({pubkey:comment.issuer, uid: comment.uid})">
+      <span class="positive" ng-if="::comment.uid">
         {{::comment.name||comment.uid}}
-      </ng-if>
-      <span ng-if="!comment.uid" class="gray">
+      </span>
+      <span ng-if="::!comment.uid" class="gray">
         <i class="icon ion-key gray"></i>
         {{::comment.issuer|formatPubkey}}
       </span>
     </a>&nbsp;
-    <span class="text-keep-lines" ng-bind-html="comment.message"></span>
+    <span class="text-keep-lines" ng-bind-html="::comment.message"></span>
   </div>
diff --git a/www/plugins/es/templates/common/view_comments.html b/www/plugins/es/templates/common/view_comments.html
index d80cede623ad867a36d0021344ca709ac8490747..3c82a6affe3ecdcecb85ebef4a042dc4e3bba749 100644
--- a/www/plugins/es/templates/common/view_comments.html
+++ b/www/plugins/es/templates/common/view_comments.html
@@ -74,31 +74,30 @@
 
   <div class="visible-xs visible-sm">
     <div class="block">
-      <div class="item item-input-inset">
-
-        <!-- reply to comment-->
-        <ng-if ng-if="formData.parent">
-          <div class="padding text-right pull-left" translate>COMMENTS.REPLY_TO</div><br/>
-          <div class="padding-left expanded">
-            <div class="card card-comment stable-900-bg item-text-wrap no-padding in done">
-              <ng-include ng-if="formData.parent.message"
-                          ng-init="comment = formData.parent"
-                          src="'plugins/es/templates/common/item_comment_content.html'">
-              </ng-include>
-              <span ng-if="!formData.parent.message" translate>
-                COMMENTS.DELETED_COMMENT
-              </span>
-              <div class="card-footer text-right gray">
-                <div class="pull-right">
-                  <a class="ion-close" ng-click="removeParentLink()">
-                    {{::'COMMON.BTN_CANCEL'|translate}}
-                  </a>
-                </div>
+      <!-- reply to comment-->
+      <div class="item item-input-inset done in" ng-if="formData.parent">
+        <div class="padding text-right pull-left" translate>COMMENTS.REPLY_TO</div><br/>
+        <div class="padding-left expanded">
+          <div class="card card-comment stable-900-bg item-text-wrap no-padding in done">
+            <ng-include ng-if="::formData.parent.message"
+                        ng-init="comment = formData.parent"
+                        src="'plugins/es/templates/common/item_comment_content.html'">
+            </ng-include>
+            <span ng-if="::!formData.parent.message" translate>
+              COMMENTS.DELETED_COMMENT
+            </span>
+            <div class="card-footer text-right gray">
+              <div class="pull-right">
+                <a class="ion-close" ng-click="removeParentLink()">
+                  {{::'COMMON.BTN_CANCEL'|translate}}
+                </a>
               </div>
             </div>
           </div>
-        </ng-if>
+        </div>
+      </div>
 
+      <div class="item item-input-inset">
         <div class="item-input-wrapper">
           <input type="text"
                  id="comment-form-input"
@@ -106,10 +105,12 @@
                  placeholder="{{'COMMENTS.COMMENT_HELP'|translate}}"
                  on-return="save();"
                  ng-model="formData.message"/>
-          <button class="button button-small button-small-padding button-icon button-dark button-icon icon ion-android-send gray" ng-click="save()">
+          <button class="button button-small button-small-padding button-icon button-dark button-icon gray" ng-click="save()">
+            <i class="icon ion-android-send"></i>
           </button>
         </div>
       </div>
     </div>
+    </div>
   </div>
 </div>