diff --git a/templates/part.board.headerControls.php b/templates/part.board.headerControls.php
index 363bd452f..efa5e2620 100644
--- a/templates/part.board.headerControls.php
+++ b/templates/part.board.headerControls.php
@@ -25,7 +25,7 @@
 	<i class="icon" ng-class="{ 'icon-toggle-compact-collapsed': compactMode, 'icon-toggle-compact-expanded': !compactMode }"></i>
 	<span class="hidden-visually"><?php p($l->t('Toggle compact mode')); ?></span>
 </button>
-<button ui-sref="board.detail({ id: id, tab: 0})"  title="<?php p($l->t('Board details')); ?>">
+<button ui-sref="board.detail({ id: id, tab: 0})"  title="<?php p($l->t('Show board details')); ?>">
     <i class="icon icon-settings"></i>
-    <span class="hidden-visually"><?php p($l->t('Board details')); ?></span>
+    <span class="hidden-visually"><?php p($l->t('Show board details')); ?></span>
 </button>
diff --git a/templates/part.board.mainView.php b/templates/part.board.mainView.php
index 033830f5b..980ac74e4 100644
--- a/templates/part.board.mainView.php
+++ b/templates/part.board.mainView.php
@@ -124,31 +124,31 @@
 											<a class="menuitem action action-rename permanent"
 											   data-action="AssignToMe"
 											   ng-click="cardAssignToMe(c); $event.stopPropagation();"><span
-														class="icon icon-user"></span><span><?php p($l->t('Assign to me')); ?></span></a>
+														class="icon icon-user"></span><span><?php p($l->t('Assign card to me')); ?></span></a>
 										</li>
 										<li ng-if="isCurrentUserAssigned(c)">
 											<a class="menuitem action action-rename permanent"
 											   data-action="UnassignFromMe"
 											   ng-click="cardUnassignFromMe(c); $event.stopPropagation();"><span
-														class="icon icon-user"></span><span><?php p($l->t('Unassign from me')); ?></span></a>
+														class="icon icon-user"></span><span><?php p($l->t('Unassign card from me')); ?></span></a>
 										</li>
 										<li ng-if="params.filter!=='archive'">
 											<a class="menuitem action action-rename permanent"
 											   data-action="Archive"
 											   ng-click="cardArchive(c); $event.stopPropagation();"><span
-														class="icon icon-archive"></span><span><?php p($l->t('Archive')); ?></span></a>
+														class="icon icon-archive"></span><span><?php p($l->t('Archive card')); ?></span></a>
 										</li>
 										<li ng-if="params.filter==='archive'">
 											<a class="menuitem action action-rename permanent"
 											   data-action="Unarchive"
 											   ng-click="cardUnarchive(c); $event.stopPropagation();"><span
-														class="icon icon-archive"></span><span><?php p($l->t('Unarchive')); ?></span></a>
+														class="icon icon-archive"></span><span><?php p($l->t('Unarchive card')); ?></span></a>
 										</li>
 										<li>
 											<a class="menuitem action action-delete permanent"
 											   data-action="Delete"
 											   ng-click="cardDelete(c); $event.stopPropagation();"><span
-														class="icon icon-delete"></span><span><?php p($l->t('Delete')); ?></span></a>
+														class="icon icon-delete"></span><span><?php p($l->t('Delete card')); ?></span></a>
 										</li>
 									</ul>
 								</div>
diff --git a/templates/part.board.sidebarView.php b/templates/part.board.sidebarView.php
index 9cb881b13..6ee31d9be 100644
--- a/templates/part.board.sidebarView.php
+++ b/templates/part.board.sidebarView.php
@@ -94,9 +94,9 @@
                             </label>
                         </div>
                     </div>
-                    <a ng-if="boardservice.canManage() && label.edit" ng-click="labelUpdate(label)" class="icon" title="<?php p($l->t('Update')); ?>"><i class="icon icon-checkmark" ></i><span class="hidden-visually"><?php p($l->t('Update')); ?></span></a>
-                    <a ng-if="boardservice.canManage() && !label.edit" ng-click="label.edit=true" class="icon" title="<?php p($l->t('Edit')); ?>"><i class="icon icon-rename"></i><span class="hidden-visually"><?php p($l->t('Edit')); ?></span></a>
-                    <a ng-if="boardservice.canManage()" ng-click="labelDelete(label)" class="icon" title="<?php p($l->t('Delete')); ?>"><i class="icon icon-delete" ></i><span class="hidden-visually"><?php p($l->t('Delete')); ?></span></a>
+                    <a ng-if="boardservice.canManage() && label.edit" ng-click="labelUpdate(label)" class="icon" title="<?php p($l->t('Update tag')); ?>"><i class="icon icon-checkmark" ></i><span class="hidden-visually"><?php p($l->t('Update tag')); ?></span></a>
+                    <a ng-if="boardservice.canManage() && !label.edit" ng-click="label.edit=true" class="icon" title="<?php p($l->t('Edit tag')); ?>"><i class="icon icon-rename"></i><span class="hidden-visually"><?php p($l->t('Edit tag')); ?></span></a>
+                    <a ng-if="boardservice.canManage()" ng-click="labelDelete(label)" class="icon" title="<?php p($l->t('Delete tag')); ?>"><i class="icon icon-delete" ></i><span class="hidden-visually"><?php p($l->t('Delete tag')); ?></span></a>
                 </li>
                 <li ng-if="status.createLabel">
                     <div class="label-edit">
diff --git a/templates/part.boardlist.php b/templates/part.boardlist.php
index 406322767..58e97256f 100644
--- a/templates/part.boardlist.php
+++ b/templates/part.boardlist.php
@@ -80,15 +80,15 @@
 								</a>
 							</li>
 							<li ui-sref="board.detail({boardId: b.id})">
-								<a class="menuitem"><span class="icon-settings-dark"></span> <?php p($l->t('Board details')); ?>
+								<a class="menuitem"><span class="icon-settings-dark"></span> <?php p($l->t('Show board details')); ?>
 								</a>
 							</li>
 						</ul>
 					</div>
 				</div>
 				<div class="board-edit-controls" ng-show="b.status.edit">
-					<span class="icon icon-checkmark" ng-click="boardUpdate(b)" title="<?php p($l->t('Update')); ?>"><span class="hidden-visually"><?php p($l->t('Update')); ?></span></span>
-					<span class="icon icon-close" ng-click="boardUpdateReset(b)" title="<?php p($l->t('Reset')); ?>"><span class="hidden-visually"><?php p($l->t('Reset')); ?></span></span>
+					<span class="icon icon-checkmark" ng-click="boardUpdate(b)" title="<?php p($l->t('Update board')); ?>"><span class="hidden-visually"><?php p($l->t('Update board')); ?></span></span>
+					<span class="icon icon-close" ng-click="boardUpdateReset(b)" title="<?php p($l->t('Reset board')); ?>"><span class="hidden-visually"><?php p($l->t('Reset board')); ?></span></span>
 				</div>
 				<div class="app-popover-menu-utils" ng-if="b.deletedAt > 0">
 					<button class="icon icon-history button-inline" ng-click="boardDeleteUndo(b)" title="<?php p($l->t('Undo board deletion - Otherwise the board will be deleted during the next cronjob run.')); ?>"><span class="hidden-visually"><?php p($l->t('Undo board deletion - Otherwise the board will be deleted during the next cronjob run.')); ?></span></button>
@@ -124,7 +124,7 @@
 			<td></td>
 			<td>
 				<div class="board-edit-controls">
-					<span class="icon icon-checkmark" ng-click="boardCreate()" title="<?php p($l->t('Create')); ?>"><span class="hidden-visually"><?php p($l->t('Create')); ?></span></span>
+					<span class="icon icon-checkmark" ng-click="boardCreate()" title="<?php p($l->t('Create  board')); ?>"><span class="hidden-visually"><?php p($l->t('Create board')); ?></span></span>
 					<span class="icon icon-close" ng-click="status.addBoard=!status.addBoard" title="<?php p($l->t('Close')); ?>"><span class="hidden-visually"><?php p($l->t('Close')); ?></span></span>
 				</div>
 			</td>
diff --git a/templates/part.card.attachments.php b/templates/part.card.attachments.php
index a2e074a61..4536e81ea 100644
--- a/templates/part.card.attachments.php
+++ b/templates/part.card.attachments.php
@@ -44,7 +44,7 @@
 						<li>
 							<a class="menuitem action action-delete"
 							   ng-click="$ctrl.cardservice.attachmentRemove(attachment); $event.stopPropagation();"><span
-										class="icon icon-delete"></span><span><?php p($l->t('Delete')); ?></span></a>
+										class="icon icon-delete"></span><span><?php p($l->t('Delete attachment')); ?></span></a>
 						</li>
 					</ul>
 				</div>
diff --git a/templates/part.navigation.php b/templates/part.navigation.php
index b08b2b19b..1eb761d3c 100644
--- a/templates/part.navigation.php
+++ b/templates/part.navigation.php
@@ -32,7 +32,7 @@
 				</li>
 				<li ui-sref="board.detail({boardId: b.id})">
 					<a class="icon-settings-dark">
-						<?php p($l->t('Board details')); ?>
+						<?php p($l->t('Show board details')); ?>
 					</a>
 				</li>
 			</ul>