diff --git a/src/views/accounts/AccountItem.vue b/src/views/accounts/AccountItem.vue
index 19a2580..31bf473 100644
--- a/src/views/accounts/AccountItem.vue
+++ b/src/views/accounts/AccountItem.vue
@@ -3,14 +3,14 @@
     <account-encrypted v-if="isEncrypted" />
     <div class="account-item-container">
       <h2 class="title is-2 account-title">
-        <span :style="colorStyle()">{{ account.name }}</span>
         <router-link
           v-if="isAdmin"
-          class="tag"
           :to="{ name: 'account-setting', params: { id } }"
+          :style="colorStyle()"
         >
-          <awe-icon icon="cog" />
+          {{ account.name }}
         </router-link>
+        <span v-else :style="colorStyle()">{{ account.name }}</span>
       </h2>
       <div class="columns is-centered" v-if="showShare">
         <div class="column is-one-third">
@@ -478,7 +478,8 @@ export default class AccountItem extends BaseAccount {
   }
   .account-title {
     margin: 10px 0;
-    span {
+    span,
+    a {
       padding: 0 10px;
       margin: 0 10px;
     }
diff --git a/src/views/transactions/TransactionItem.vue b/src/views/transactions/TransactionItem.vue
index 012947b..a1cb3b9 100644
--- a/src/views/transactions/TransactionItem.vue
+++ b/src/views/transactions/TransactionItem.vue
@@ -1,6 +1,5 @@
 <template>
   <div v-if="transaction">
-    <h4 class="subtitle is-4">{{ transaction.date | fulldate }}</h4>
     <nav class="breadcrumb" aria-label="breadcrumbs" v-if="account">
       <ul>
         <li>
@@ -26,12 +25,12 @@
         </li>
       </ul>
     </nav>
+    <h3 class="subtitle is-3">{{ transaction.date | fulldate }}</h3>
     <div class="resume">
       Dépense payée par
       <span class="pay-by">{{ transaction.payBy }}</span>
       pour
-      <span v-if="payForLabel.length > 1">{{ payForLabel.join(', ') }}</span>
-      <span v-else>{{ payForLabel[0] }}</span>
+      <span>{{ payForLabel.join(', ') }}</span>
       d'une somme de
       <span class="numeric">{{
         transaction.amount | money(transaction.mainCurrency)
@@ -41,7 +40,9 @@
     <div v-if="transaction.exchange" class="exchange">
       <div v-if="currencies.length">
         <hr />
-        <h2 class="subtitle is-2">Taux d'échange aujourd'hui</h2>
+        <h3 class="subtitle is-3">
+          Taux d'échange le {{ transaction.date | fulldate }}
+        </h3>
         <div class="columns is-centered">
           <div class="column">
             <table class="table is-fullwidth is-striped is-bordered">