diff --git a/www/comps/settings.js b/www/comps/settings.js
index 814cd40c..18ef1723 100644
--- a/www/comps/settings.js
+++ b/www/comps/settings.js
@@ -382,6 +382,8 @@ let MySettingsAccount = {
 				<td>{{ capGen.name }}</td>
 				<td><input disabled="disabled" :value="loginName" /></td>
 			</tr>
+			<tr><td colspan="2"></td></tr>
+			<tr><td colspan="2"><b>{{ capApp.titlePwChange }}</b></td></tr>
 			<tr>
 				<td>{{ capApp.pwOld }}</td>
 				<td><input autocomplete="current-password" type="password" v-model="pwOld" @input="newInput = true; generateOldPwKey()" /></td>
@@ -714,7 +716,14 @@ let MySettingsFixedTokens = {
 				<tbody>
 					<tr v-for="t in tokensFixed">
 						<td>{{ t.name }}</td>
-						<td>{{ displayContext(t.context) }}</td>
+						<td>
+							<my-button
+								:active="false"
+								:caption="displayContextText(t.context)"
+								:image="displayContextIcon(t.context)"
+								:naked="true"
+							/>
+						</td>
 						<td><span :title="getUnixFormat(t.dateCreate,'Y-m-d H:i:S')">{{ getUnixFormat(t.dateCreate,'Y-m-d') }}</span></td>
 						<td>
 							<div class="row">
@@ -1017,7 +1026,15 @@ let MySettingsFixedTokens = {
 		},
 		
 		// presentation
-		displayContext(v) {
+		displayContextIcon(v) {
+			switch(v) {
+				case 'client': return 'screen.png';     break;
+				case 'ics':    return 'calendar.png';   break;
+				case 'totp':   return 'smartphone.png'; break;
+			}
+			return '';
+		},
+		displayContextText(v) {
 			switch(v) {
 				case 'client': return this.capApp.context.client; break;
 				case 'ics':    return this.capApp.context.ics;    break;
diff --git a/www/langs/REPLACE_BY_BUILD/en_us b/www/langs/REPLACE_BY_BUILD/en_us
index f8ea344e..0497a167 100644
--- a/www/langs/REPLACE_BY_BUILD/en_us
+++ b/www/langs/REPLACE_BY_BUILD/en_us
@@ -2212,7 +2212,7 @@
 			"intro":"If the REI3 client application (see 'Devices') is installed, you can set global hotkeys. These are used to interact with REI3 as it runs in the background."
 		},
 		"dialog":{
-			"searchDictionary":"This system offers full-text search capabilities. Where full-text search is used, even very large texts can be looked up quickly with advanced search features such as comparing synonyms and word stems.<br /><br />'Dictionaries for full-text search' informs the system of which languages a user works with to use language specific search features."
+			"searchDictionary":"This system offers full-text search capabilities. Where full-text search is used, even very large texts can be looked up quickly with advanced search features such as comparing synonyms and word stems.<br /><br />'Dictionaries for full-text search' informs the system of which languages a user works with, to use language specific search features."
 		},
 		"encryption":{
 			"button":{
diff --git a/www/langs/REPLACE_BY_BUILD/it_it b/www/langs/REPLACE_BY_BUILD/it_it
index 8dfcf31e..9e07519c 100644
--- a/www/langs/REPLACE_BY_BUILD/it_it
+++ b/www/langs/REPLACE_BY_BUILD/it_it
@@ -2212,7 +2212,7 @@
 			"intro":"If the REI3 client application (see 'Devices') is installed, you can set global hotkeys. These are used to interact with REI3 as it runs in the background."
 		},
 		"dialog":{
-			"searchDictionary":"This system offers full-text search capabilities. Where full-text search is used, even very large texts can be looked up quickly with advanced search features such as comparing synonyms and word stems.<br /><br />'Dictionaries for full-text search' informs the system of which languages a user works with to use language specific search features."
+			"searchDictionary":"This system offers full-text search capabilities. Where full-text search is used, even very large texts can be looked up quickly with advanced search features such as comparing synonyms and word stems.<br /><br />'Dictionaries for full-text search' informs the system of which languages a user works with, to use language specific search features."
 		},
 		"encryption":{
 			"button":{
diff --git a/www/langs/REPLACE_BY_BUILD/lv_lv b/www/langs/REPLACE_BY_BUILD/lv_lv
index 76b43254..5900f0a0 100644
--- a/www/langs/REPLACE_BY_BUILD/lv_lv
+++ b/www/langs/REPLACE_BY_BUILD/lv_lv
@@ -2212,7 +2212,7 @@
 			"intro":"If the REI3 client application (see 'Devices') is installed, you can set global hotkeys. These are used to interact with REI3 as it runs in the background."
 		},
 		"dialog":{
-			"searchDictionary":"This system offers full-text search capabilities. Where full-text search is used, even very large texts can be looked up quickly with advanced search features such as comparing synonyms and word stems.<br /><br />'Dictionaries for full-text search' informs the system of which languages a user works with to use language specific search features."
+			"searchDictionary":"This system offers full-text search capabilities. Where full-text search is used, even very large texts can be looked up quickly with advanced search features such as comparing synonyms and word stems.<br /><br />'Dictionaries for full-text search' informs the system of which languages a user works with, to use language specific search features."
 		},
 		"encryption":{
 			"button":{
diff --git a/www/langs/REPLACE_BY_BUILD/ro_ro b/www/langs/REPLACE_BY_BUILD/ro_ro
index 249f6198..4413b489 100644
--- a/www/langs/REPLACE_BY_BUILD/ro_ro
+++ b/www/langs/REPLACE_BY_BUILD/ro_ro
@@ -2212,7 +2212,7 @@
 			"intro":"If the REI3 client application (see 'Devices') is installed, you can set global hotkeys. These are used to interact with REI3 as it runs in the background."
 		},
 		"dialog":{
-			"searchDictionary":"This system offers full-text search capabilities. Where full-text search is used, even very large texts can be looked up quickly with advanced search features such as comparing synonyms and word stems.<br /><br />'Dictionaries for full-text search' informs the system of which languages a user works with to use language specific search features."
+			"searchDictionary":"This system offers full-text search capabilities. Where full-text search is used, even very large texts can be looked up quickly with advanced search features such as comparing synonyms and word stems.<br /><br />'Dictionaries for full-text search' informs the system of which languages a user works with, to use language specific search features."
 		},
 		"encryption":{
 			"button":{