diff --git a/lnbits/templates/components.vue b/lnbits/templates/components.vue
index 70ebc8b1..06092254 100644
--- a/lnbits/templates/components.vue
+++ b/lnbits/templates/components.vue
@@ -47,6 +47,9 @@ include('components/lnbits-error.vue') %}
         <q-item-section>
           <q-item-label lines="1" v-text="$t('settings')"></q-item-label>
         </q-item-section>
+        <q-item-section side v-show="isActive('/admin')">
+          <q-icon name="chevron_right" color="grey-5" size="md"></q-icon>
+        </q-item-section>
       </q-item>
       <q-item v-if="showNode" to="/node">
         <q-item-section side>
@@ -59,6 +62,9 @@ include('components/lnbits-error.vue') %}
         <q-item-section>
           <q-item-label lines="1" v-text="$t('node')"></q-item-label>
         </q-item-section>
+        <q-item-section side v-show="isActive('/node')">
+          <q-icon name="chevron_right" color="grey-5" size="md"></q-icon>
+        </q-item-section>
       </q-item>
       <q-item v-if="showUsers" to="/users">
         <q-item-section side>
@@ -71,6 +77,9 @@ include('components/lnbits-error.vue') %}
         <q-item-section>
           <q-item-label lines="1" v-text="$t('users')"></q-item-label>
         </q-item-section>
+        <q-item-section side v-show="isActive('/users')">
+          <q-icon name="chevron_right" color="grey-5" size="md"></q-icon>
+        </q-item-section>
       </q-item>
       <q-item v-if="showAudit" to="/audit">
         <q-item-section side>
@@ -83,6 +92,9 @@ include('components/lnbits-error.vue') %}
         <q-item-section>
           <q-item-label lines="1" v-text="$t('api_watch')"></q-item-label>
         </q-item-section>
+        <q-item-section side v-show="isActive('/audit')">
+          <q-icon name="chevron_right" color="grey-5" size="md"></q-icon>
+        </q-item-section>
       </q-item>
     </div>
     <q-item to="/payments">
@@ -96,6 +108,9 @@ include('components/lnbits-error.vue') %}
       <q-item-section>
         <q-item-label lines="1" v-text="$t('payments')"></q-item-label>
       </q-item-section>
+      <q-item-section side v-show="isActive('/payments')">
+        <q-icon name="chevron_right" color="grey-5" size="md"></q-icon>
+      </q-item-section>
     </q-item>
     <q-item v-if="showExtensions" to="/extensions">
       <q-item-section side>
@@ -108,6 +123,9 @@ include('components/lnbits-error.vue') %}
       <q-item-section>
         <q-item-label lines="1" v-text="$t('extensions')"></q-item-label>
       </q-item-section>
+      <q-item-section side v-show="isActive('/extensions')">
+        <q-icon name="chevron_right" color="grey-5" size="md"></q-icon>
+      </q-item-section>
     </q-item>
   </q-list>
 </template>
@@ -119,7 +137,6 @@ include('components/lnbits-error.vue') %}
         <q-item-label v-text="$t('created')"></q-item-label>
         <q-item-label caption v-text="payment.date"></q-item-label>
       </q-item-section>
-
       <q-item-section side top>
         <q-item-label caption v-text="payment.dateFrom"></q-item-label>
       </q-item-section>
diff --git a/lnbits/templates/components/lnbits-manage-wallet-list.vue b/lnbits/templates/components/lnbits-manage-wallet-list.vue
index ab250e07..a5477b39 100644
--- a/lnbits/templates/components/lnbits-manage-wallet-list.vue
+++ b/lnbits/templates/components/lnbits-manage-wallet-list.vue
@@ -44,6 +44,9 @@
       >
         <q-icon name="group" :color="walletRec.extra.color" size="xs"></q-icon>
       </q-item-section>
+      <q-item-section side v-show="walletRec.id === activeWalletId">
+        <q-icon name="chevron_right" color="grey-5" size="md"></q-icon>
+      </q-item-section>
     </q-item>
     <q-item
       v-if="g.user.hiddenWalletsCount > 0"