From 2c70ef8cdcfcb2cf838f195b1ad4708a39d2bf23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Raddaoui=20Mar=C3=ADn?=
 <raddaouimarin@gmail.com>
Date: Tue, 25 Aug 2015 20:27:36 +0200
Subject: [PATCH] Add missing alt tags, refs #8855

---
 .../modules/actor/templates/browseSuccess.php |  2 +-
 .../contactinformation/templates/_edit.php    |  3 +--
 .../templates/_sortableTableHeader.php        |  4 +--
 .../digitalobject/templates/_imageflow.php    |  2 +-
 .../digitalobject/templates/_showAudio.php    |  6 ++---
 .../digitalobject/templates/_showCompound.php |  4 +--
 .../digitalobject/templates/_showDownload.php | 10 +++----
 .../templates/_showGenericIcon.php            |  4 +--
 .../digitalobject/templates/_showImage.php    | 12 ++++-----
 .../digitalobject/templates/_showText.php     |  4 +--
 .../digitalobject/templates/_showVideo.php    | 14 +++++-----
 .../digitalobject/templates/browseSuccess.php | 26 +++++++++----------
 .../function/templates/browseSuccess.php      |  2 +-
 .../informationobject/templates/_event.php    |  2 +-
 .../templates/browseSuccess.php               |  2 +-
 .../templates/editPhysicalObjectsSuccess.php  |  3 +--
 .../templates/itemListSuccess.php             |  2 +-
 .../modules/menu/templates/_userMenu.php      |  2 +-
 .../modules/menu/templates/listSuccess.php    |  4 +--
 .../templates/browseSuccess.php               |  8 +++---
 .../repository/templates/_browseCardView.php  |  4 ++-
 .../repository/templates/_browseTableView.php | 14 +++++-----
 .../repository/templates/_holdings.php        |  2 +-
 .../modules/repository/templates/_logo.php    |  4 ++-
 .../repository/templates/browseSuccess.php    |  2 +-
 .../search/templates/_searchResult.php        |  6 +++--
 .../search/templates/autocompleteSuccess.php  | 10 +++----
 .../templates/descriptionUpdatesSuccess.php   |  2 +-
 .../settings/templates/languageSuccess.php    |  2 +-
 .../taxonomy/templates/browseSuccess.php      |  2 +-
 .../taxonomy/templates/indexSuccess.php       |  2 +-
 .../term/templates/browseTermSuccess.php      |  2 +-
 .../modules/term/templates/indexSuccess.php   |  3 ++-
 .../user/templates/readOnlySuccess.php        |  2 +-
 apps/qubit/templates/_header.php              |  2 +-
 config/error/error.html.php                   |  2 +-
 config/unavailable.php                        |  2 +-
 js/multiDelete.js                             |  3 ---
 .../modules/search/templates/_box.php         |  2 +-
 .../staticpage/templates/homeSuccess.php      |  2 +-
 .../templates/_header.php                     |  6 ++---
 .../accession/templates/_relatedDonor.php     |  2 +-
 .../sfIsaarPlugin/templates/_event.php        |  3 +--
 .../templates/_relatedAuthorityRecord.php     |  3 +--
 .../templates/_relatedAuthorityRecord.php     |  3 +--
 .../templates/_relatedFunction.php            |  3 +--
 .../templates/_relatedResource.php            |  3 +--
 .../sfIsdiahPlugin/templates/indexSuccess.php |  2 +-
 48 files changed, 104 insertions(+), 107 deletions(-)

diff --git a/apps/qubit/modules/actor/templates/browseSuccess.php b/apps/qubit/modules/actor/templates/browseSuccess.php
index 9a62dc8f00..d6b3a1bd02 100644
--- a/apps/qubit/modules/actor/templates/browseSuccess.php
+++ b/apps/qubit/modules/actor/templates/browseSuccess.php
@@ -3,7 +3,7 @@
 
 <?php slot('title') ?>
   <div class="multiline-header">
-    <?php echo image_tag('/images/icons-large/icon-people.png') ?>
+    <?php echo image_tag('/images/icons-large/icon-people.png', array('alt' => '')) ?>
     <h1 aria-describedby="results-label"><?php echo __('Showing %1% results', array('%1%' => $pager->getNbResults())) ?></h1>
     <span class="sub" id="results-label"><?php echo sfConfig::get('app_ui_label_actor') ?></span>
   </div>
diff --git a/apps/qubit/modules/contactinformation/templates/_edit.php b/apps/qubit/modules/contactinformation/templates/_edit.php
index 7b00bde435..ed8737363b 100644
--- a/apps/qubit/modules/contactinformation/templates/_edit.php
+++ b/apps/qubit/modules/contactinformation/templates/_edit.php
@@ -19,7 +19,6 @@
         </th><th style="width: 15%">
           <?php echo __('Primary') ?>
         </th><th style="text-align: center; width: 10%">
-          <?php echo image_tag('delete', array('align' => 'top', 'class' => 'deleteIcon')) ?>
         </th>
       </tr>
     </thead><tbody>
@@ -40,7 +39,7 @@
 <?php
 
 // Template for new display table rows
-$editHtml = '<a href="#">' . image_tag('pencil', array('alt' => 'edit', 'style' => 'align: top')) . '</a>';
+$editHtml = '<a href="#">' . image_tag('pencil', array('alt' => __('Edit'), 'style' => 'align: top')) . '</a>';
 
 $rowTemplate = json_encode(<<<value
 <tr id="{{$form->getWidgetSchema()->generateName('id')}}">
diff --git a/apps/qubit/modules/default/templates/_sortableTableHeader.php b/apps/qubit/modules/default/templates/_sortableTableHeader.php
index fb665bdccd..8a4d649f54 100644
--- a/apps/qubit/modules/default/templates/_sortableTableHeader.php
+++ b/apps/qubit/modules/default/templates/_sortableTableHeader.php
@@ -19,9 +19,9 @@
     array('title' => __('Sort'), 'class' => 'sortable')) ?>
 
   <?php if ($up === $sf_request->sort): ?>
-    <?php echo image_tag('up.gif') ?>
+    <?php echo image_tag('up.gif', array('alt' => __('Sort ascending'))) ?>
   <?php elseif ($down === $sf_request->sort): ?>
-    <?php echo image_tag('down.gif') ?>
+    <?php echo image_tag('down.gif', array('alt' => __('Sort descending'))) ?>
   <?php endif; ?>
 
 </th>
\ No newline at end of file
diff --git a/apps/qubit/modules/digitalobject/templates/_imageflow.php b/apps/qubit/modules/digitalobject/templates/_imageflow.php
index 9bc8c0a245..026bc80f16 100644
--- a/apps/qubit/modules/digitalobject/templates/_imageflow.php
+++ b/apps/qubit/modules/digitalobject/templates/_imageflow.php
@@ -4,7 +4,7 @@
 
   <div class="imageflow clearfix" id="imageflow">
     <?php foreach ($thumbnails as $item): ?>
-      <?php echo image_tag($item->getFullPath(), array('longdesc' => url_for(array($item->parent->informationObject, 'module' => 'informationobject')), 'alt' => esc_entities(render_title(truncate_text($item->parent->informationObject, 28))))) ?>
+      <?php echo image_tag($item->getFullPath(), array('longdesc' => url_for(array($item->parent->informationObject, 'module' => 'informationobject')), 'alt' => esc_entities(render_title(truncate_text($item->parent->informationObject, 100))))) ?>
     <?php endforeach; ?>
   </div>
 
diff --git a/apps/qubit/modules/digitalobject/templates/_showAudio.php b/apps/qubit/modules/digitalobject/templates/_showAudio.php
index f9b2426ba5..52c1642e72 100644
--- a/apps/qubit/modules/digitalobject/templates/_showAudio.php
+++ b/apps/qubit/modules/digitalobject/templates/_showAudio.php
@@ -6,7 +6,7 @@
     <a class="flowplayer audio" href="<?php echo public_path($representation->getFullPath()) ?>"></a>
   <?php else: ?>
     <div style="text-align: center">
-      <?php echo image_tag($representation->getFullPath(), array('style' => 'border: #999 1px solid')) ?>
+      <?php echo image_tag($representation->getFullPath(), array('style' => 'border: #999 1px solid', 'alt' => '')) ?>
     </div>
   <?php endif;?>
 
@@ -18,14 +18,14 @@
 
   <?php if ($iconOnly): ?>
 
-    <?php echo link_to(image_tag('play'), $link) ?>
+    <?php echo link_to(image_tag('play', array('alt' => __('Open original %1%', array('%1%' => sfConfig::get('app_ui_label_digitalobject'))))), $link) ?>
 
   <?php else: ?>
 
     <div class="resource">
 
       <div class="resourceRep">
-        <?php echo link_to(image_tag('play'), $link) ?>
+        <?php echo link_to(image_tag('play', array('alt' => __('Open original %1%', array('%1%' => sfConfig::get('app_ui_label_digitalobject'))))), $link) ?>
       </div>
 
       <div class="resourceDesc">
diff --git a/apps/qubit/modules/digitalobject/templates/_showCompound.php b/apps/qubit/modules/digitalobject/templates/_showCompound.php
index 3df906450a..0376fbac52 100644
--- a/apps/qubit/modules/digitalobject/templates/_showCompound.php
+++ b/apps/qubit/modules/digitalobject/templates/_showCompound.php
@@ -4,11 +4,11 @@
     <tr>
       <td>
         <?php if (null !== $representation = $leftObject->getCompoundRepresentation()): ?>
-          <?php echo link_to_if(SecurityPriviliges::editCredentials($sf_user, 'informationObject') || QubitTerm::TEXT_ID == $resource->mediaType->id, image_tag($representation->getFullPath()), public_path($leftObject->getFullPath(), array('title' => __('View full size')))) ?>
+          <?php echo link_to_if(SecurityPriviliges::editCredentials($sf_user, 'informationObject') || QubitTerm::TEXT_ID == $resource->mediaType->id, image_tag($representation->getFullPath(), array('alt' => '')), public_path($leftObject->getFullPath(), array('title' => __('View full size')))) ?>
         <?php endif; ?>
       </td><td>
         <?php if (null !== $rightObject && null !== $representation = $rightObject->getCompoundRepresentation()): ?>
-          <?php echo link_to_if(SecurityPriviliges::editCredentials($sf_user, 'informationObject') || QubitTerm::TEXT_ID == $resource->mediaType->id, image_tag($representation->getFullPath()), public_path($rightObject->getFullPath(), array('title' => __('View full size')))) ?>
+          <?php echo link_to_if(SecurityPriviliges::editCredentials($sf_user, 'informationObject') || QubitTerm::TEXT_ID == $resource->mediaType->id, image_tag($representation->getFullPath(), array('alt' => '')), public_path($rightObject->getFullPath(), array('title' => __('View full size')))) ?>
         <?php endif; ?>
       </td>
     </tr>
diff --git a/apps/qubit/modules/digitalobject/templates/_showDownload.php b/apps/qubit/modules/digitalobject/templates/_showDownload.php
index 0343bb4002..08fd485b5e 100644
--- a/apps/qubit/modules/digitalobject/templates/_showDownload.php
+++ b/apps/qubit/modules/digitalobject/templates/_showDownload.php
@@ -3,25 +3,25 @@
 <?php if (QubitTerm::REFERENCE_ID == $usageType): ?>
 
   <?php if (isset($link)): ?>
-    <?php echo link_to(image_tag($representation->getFullPath()), $link) ?>
+    <?php echo link_to(image_tag($representation->getFullPath(), array('alt' => __('Open original %1%', array('%1%' => sfConfig::get('app_ui_label_digitalobject'))))), $link) ?>
   <?php else: ?>
-    <?php echo image_tag($representation->getFullPath()) ?>
+    <?php echo image_tag($representation->getFullPath(), array('alt' => '')) ?>
   <?php endif; ?>
 
 <?php else: ?>
 
   <?php if ($iconOnly): ?>
 
-    <?php echo link_to(image_tag($representation->getFullPath()), $link) ?>
+    <?php echo link_to(image_tag($representation->getFullPath(), array('alt' => __('Open original %1%', array('%1%' => sfConfig::get('app_ui_label_digitalobject'))))), $link) ?>
 
   <?php else: ?>
 
     <div style="width: 100px; text-align: center"/>
 
       <?php if (isset($link)): ?>
-        <?php echo link_to(image_tag($representation->getFullPath()), $link) ?>
+        <?php echo link_to(image_tag($representation->getFullPath(), array('alt' => __('Open original %1%', array('%1%' => sfConfig::get('app_ui_label_digitalobject'))))), $link) ?>
       <?php else: ?>
-        <?php echo image_tag($representation->getFullPath()) ?>
+        <?php echo image_tag($representation->getFullPath(), array('alt' => '')) ?>
       <?php endif; ?>
 
       <?php echo wrap_text($digitalObject->name, 15) ?>
diff --git a/apps/qubit/modules/digitalobject/templates/_showGenericIcon.php b/apps/qubit/modules/digitalobject/templates/_showGenericIcon.php
index c10ab1dd86..2159280d96 100644
--- a/apps/qubit/modules/digitalobject/templates/_showGenericIcon.php
+++ b/apps/qubit/modules/digitalobject/templates/_showGenericIcon.php
@@ -4,9 +4,9 @@
 
   <div class="digitalObjectRep">
     <?php if (isset($link) && $canReadMaster): ?>
-      <?php echo link_to(image_tag($representation->getFullPath()), $link, array('target' => '_blank')) ?>
+      <?php echo link_to(image_tag($representation->getFullPath(), array('alt' => __('Open original %1%', array('%1%' => sfConfig::get('app_ui_label_digitalobject'))))), $link, array('target' => '_blank')) ?>
     <?php else: ?>
-      <?php echo image_tag($representation->getFullPath()) ?>
+      <?php echo image_tag($representation->getFullPath(), array('alt' => '')) ?>
     <?php endif; ?>
   </div>
 
diff --git a/apps/qubit/modules/digitalobject/templates/_showImage.php b/apps/qubit/modules/digitalobject/templates/_showImage.php
index a541914a5a..fa0c37ec24 100644
--- a/apps/qubit/modules/digitalobject/templates/_showImage.php
+++ b/apps/qubit/modules/digitalobject/templates/_showImage.php
@@ -3,9 +3,9 @@
 <?php if (QubitTerm::MASTER_ID == $usageType || QubitTerm::REFERENCE_ID == $usageType): ?>
 
   <?php if (isset($link)): ?>
-    <?php echo link_to(image_tag($representation->getFullPath()), $link, array('target' => '_blank')) ?>
+    <?php echo link_to(image_tag($representation->getFullPath(), array('alt' => __('Open original %1%', array('%1%' => sfConfig::get('app_ui_label_digitalobject'))))), $link, array('target' => '_blank')) ?>
   <?php else: ?>
-    <?php echo image_tag($representation->getFullPath()) ?>
+    <?php echo image_tag($representation->getFullPath(), array('alt' => '')) ?>
   <?php endif; ?>
 
 <?php elseif (QubitTerm::THUMBNAIL_ID == $usageType): ?>
@@ -13,9 +13,9 @@
   <?php if ($iconOnly): ?>
 
     <?php if (isset($link)): ?>
-      <?php echo link_to(image_tag($representation->getFullPath()), $link) ?>
+      <?php echo link_to(image_tag($representation->getFullPath(), array('alt' => __('Open original %1%', array('%1%' => sfConfig::get('app_ui_label_digitalobject'))))), $link) ?>
     <?php else: ?>
-      <?php echo image_tag($representation->getFullPath()) ?>
+      <?php echo image_tag($representation->getFullPath(), array('alt' => '')) ?>
     <?php endif; ?>
 
   <?php else: ?>
@@ -24,9 +24,9 @@
 
       <div class="digitalObjectRep">
         <?php if (isset($link)): ?>
-          <?php echo link_to(image_tag($representation->getFullPath()), $link) ?>
+          <?php echo link_to(image_tag($representation->getFullPath(), array('alt' => __('Open original %1%', array('%1%' => sfConfig::get('app_ui_label_digitalobject'))))), $link) ?>
         <?php else: ?>
-          <?php echo image_tag($representation->getFullPath()) ?>
+          <?php echo image_tag($representation->getFullPath(), array('alt' => '')) ?>
         <?php endif; ?>
       </div>
 
diff --git a/apps/qubit/modules/digitalobject/templates/_showText.php b/apps/qubit/modules/digitalobject/templates/_showText.php
index dc85fc0930..e055ffd5e4 100644
--- a/apps/qubit/modules/digitalobject/templates/_showText.php
+++ b/apps/qubit/modules/digitalobject/templates/_showText.php
@@ -1,5 +1,5 @@
 <?php if (isset($link)): ?>
-  <?php echo link_to(image_tag($representation->getFullPath()), $link) ?>
+  <?php echo link_to(image_tag($representation->getFullPath(), array('alt' => __('Open original %1%', array('%1%' => sfConfig::get('app_ui_label_digitalobject'))))), $link) ?>
 <?php else: ?>
-  <?php echo image_tag($representation->getFullPath()) ?>
+  <?php echo image_tag($representation->getFullPath(), array('alt' => '')) ?>
 <?php endif; ?>
diff --git a/apps/qubit/modules/digitalobject/templates/_showVideo.php b/apps/qubit/modules/digitalobject/templates/_showVideo.php
index d809c510e3..6cc5df49d3 100644
--- a/apps/qubit/modules/digitalobject/templates/_showVideo.php
+++ b/apps/qubit/modules/digitalobject/templates/_showVideo.php
@@ -3,9 +3,9 @@
 <?php if ($usageType == QubitTerm::MASTER_ID): ?>
 
   <?php if ($link == null): ?>
-    <?php echo image_tag($representation->getFullPath()) ?>
+    <?php echo image_tag($representation->getFullPath(), array('alt' => '')) ?>
   <?php else: ?>
-    <?php echo link_to(image_tag($representation->getFullPath()), $link) ?>
+    <?php echo link_to(image_tag($representation->getFullPath(), array('alt' => __('Open original %1%', array('%1%' => sfConfig::get('app_ui_label_digitalobject'))))), $link) ?>
   <?php endif; ?>
 
 <?php elseif ($usageType == QubitTerm::REFERENCE_ID): ?>
@@ -14,7 +14,7 @@
     <a class="flowplayer" href="<?php echo public_path($representation->getFullPath()) ?>"></a>
   <?php else: ?>
     <div style="text-align: center">
-      <?php echo image_tag($representation->getFullPath(), array('style' => 'border: #999 1px solid')) ?>
+      <?php echo image_tag($representation->getFullPath(), array('style' => 'border: #999 1px solid', 'alt' => '')) ?>
     </div>
   <?php endif;?>
 
@@ -28,9 +28,9 @@
   <?php if ($iconOnly): ?>
 
     <?php if (isset($link)): ?>
-      <?php echo link_to(image_tag($representation->getFullPath()), $link) ?>
+      <?php echo link_to(image_tag($representation->getFullPath(), array('alt' => __('Open original %1%', array('%1%' => sfConfig::get('app_ui_label_digitalobject'))))), $link) ?>
     <?php else: ?>
-      <?php echo image_tag($representation->getFullPath()); ?>
+      <?php echo image_tag($representation->getFullPath(), array('alt' => '')) ?>
     <?php endif; ?>
 
   <?php else: ?>
@@ -38,9 +38,9 @@
     <div class="digitalObject">
       <div class="digitalObjectRep">
         <?php if (isset($link)): ?>
-          <?php echo link_to(image_tag($representation->getFullPath()), $link) ?>
+          <?php echo link_to(image_tag($representation->getFullPath(), array('alt' => __('Open original %1%', array('%1%' => sfConfig::get('app_ui_label_digitalobject'))))), $link) ?>
         <?php else: ?>
-          <?php echo image_tag($representation->getFullPath()) ?>
+          <?php echo image_tag($representation->getFullPath(), array('alt' => '')) ?>
         <?php endif; ?>
       </div>
       <div class="digitalObjectDesc">
diff --git a/apps/qubit/modules/digitalobject/templates/browseSuccess.php b/apps/qubit/modules/digitalobject/templates/browseSuccess.php
index 7535c72aff..215fbe0407 100644
--- a/apps/qubit/modules/digitalobject/templates/browseSuccess.php
+++ b/apps/qubit/modules/digitalobject/templates/browseSuccess.php
@@ -1,10 +1,12 @@
+<?php use_helper('Text') ?>
+
 <?php decorate_with('layout_wide') ?>
 
 <div class="row-fluid">
   <div class="span6">
 
     <div class="multiline-header">
-      <?php echo image_tag('/images/icons-large/icon-media.png') ?>
+      <?php echo image_tag('/images/icons-large/icon-media.png', array('alt' => '')) ?>
       <h1 aria-describedby="results-label"><?php echo __('Showing %1% results', array('%1%' => $pager->getNbResults())) ?></h1>
       <span class="sub" id="results-label"><?php echo sfConfig::get('app_ui_label_digitalobject') ?></span>
     </div>
@@ -55,21 +57,19 @@
     <?php $doc = $hit->getData() ?>
     <div class="brick">
       <div class="preview">
-        <?php if (!empty($doc['digitalObject']['thumbnailPath'])): ?>
-          <?php if (QubitAcl::check(QubitInformationObject::getById($hit->getId()), 'readThumbnail') &&
-                    QubitGrantedRight::checkPremis($hit->getId(), 'readThumb')): ?>
-
-            <?php echo link_to(image_tag($doc['digitalObject']['thumbnailPath']), array('module' => 'informationobject', 'slug' => $doc['slug'])) ?>
-          <?php else: ?>
-            <?php echo link_to(image_tag(QubitDigitalObject::getGenericIconPathByMediaTypeId($doc['digitalObject']['mediaTypeId'])),
-              array('module' => 'informationobject', 'slug' => $doc['slug'])) ?>
-          <?php endif; ?>
+        <?php if (!empty($doc['digitalObject']['thumbnailPath'])
+                        && QubitAcl::check(QubitInformationObject::getById($hit->getId()), 'readThumbnail')
+                        && QubitGrantedRight::checkPremis($hit->getId(), 'readThumb')): ?>
+          <?php echo link_to(image_tag($doc['digitalObject']['thumbnailPath'],
+            array('alt' => __('Go to %1%', array('%1%' => esc_entities(render_title(truncate_text(get_search_i18n($doc, 'title', array('allowEmpty' => false)), 100))))))),
+            array('module' => 'informationobject', 'slug' => $doc['slug'])) ?>
         <?php else: ?>
-            <?php echo link_to(image_tag(QubitDigitalObject::getGenericIconPathByMediaTypeId($doc['digitalObject']['mediaTypeId'])),
-              array('module' => 'informationobject', 'slug' => $doc['slug'])) ?>
+          <?php echo link_to(image_tag(QubitDigitalObject::getGenericIconPathByMediaTypeId($doc['digitalObject']['mediaTypeId']),
+            array('alt' => __('Go to %1%', array('%1%' => esc_entities(render_title(truncate_text(get_search_i18n($doc, 'title', array('allowEmpty' => false)), 100))))))),
+            array('module' => 'informationobject', 'slug' => $doc['slug'])) ?>
         <?php endif; ?>
       </div>
-      <p class="description"><?php echo render_title(get_search_i18n($doc, 'title')) ?></p>
+      <p class="description"><?php echo render_title(get_search_i18n($doc, 'title', array('allowEmpty' => false))) ?></p>
       <div class="bottom">
         <p>
           <?php if ('1' == sfConfig::get('app_inherit_code_informationobject', 1)
diff --git a/apps/qubit/modules/function/templates/browseSuccess.php b/apps/qubit/modules/function/templates/browseSuccess.php
index 01ed0024ad..befb3978c1 100644
--- a/apps/qubit/modules/function/templates/browseSuccess.php
+++ b/apps/qubit/modules/function/templates/browseSuccess.php
@@ -3,7 +3,7 @@
 
 <?php slot('title') ?>
   <div class="multiline-header">
-    <?php echo image_tag('/images/icons-large/icon-functions.png') ?>
+    <?php echo image_tag('/images/icons-large/icon-functions.png', array('alt' => '')) ?>
     <h1 aria-describedby="results-label"><?php echo __('Showing %1% results', array('%1%' => $pager->getNbResults())) ?></h1>
     <span class="sub" id="results-label"><?php echo sfConfig::get('app_ui_label_function') ?></span>
   </div>
diff --git a/apps/qubit/modules/informationobject/templates/_event.php b/apps/qubit/modules/informationobject/templates/_event.php
index b2436fbd95..989ca341d3 100644
--- a/apps/qubit/modules/informationobject/templates/_event.php
+++ b/apps/qubit/modules/informationobject/templates/_event.php
@@ -8,7 +8,7 @@
 use_helper('Javascript');
 
 // Template for new display table rows
-$editHtml = image_tag('pencil', array('alt' => 'edit', 'style' => 'align: top'));
+$editHtml = image_tag('pencil', array('alt' => __('Edit'), 'style' => 'align: top'));
 
 $rowTemplate = json_encode(<<<value
 <tr id="{{$form->getWidgetSchema()->generateName('id')}}">
diff --git a/apps/qubit/modules/informationobject/templates/browseSuccess.php b/apps/qubit/modules/informationobject/templates/browseSuccess.php
index 3d4564ed8d..75491208fd 100644
--- a/apps/qubit/modules/informationobject/templates/browseSuccess.php
+++ b/apps/qubit/modules/informationobject/templates/browseSuccess.php
@@ -3,7 +3,7 @@
 
 <?php slot('title') ?>
   <div class="multiline-header">
-    <?php echo image_tag('/images/icons-large/icon-archival.png') ?>
+    <?php echo image_tag('/images/icons-large/icon-archival.png', array('alt' => '')) ?>
     <h1 aria-describedby="results-label"><?php echo __('Showing %1% results', array('%1%' => $pager->getNbResults())) ?></h1>
     <span class="sub" id="results-label"><?php echo sfConfig::get('app_ui_label_informationobject') ?></span>
   </div>
diff --git a/apps/qubit/modules/informationobject/templates/editPhysicalObjectsSuccess.php b/apps/qubit/modules/informationobject/templates/editPhysicalObjectsSuccess.php
index aad7d28a56..4f364bd9e2 100644
--- a/apps/qubit/modules/informationobject/templates/editPhysicalObjectsSuccess.php
+++ b/apps/qubit/modules/informationobject/templates/editPhysicalObjectsSuccess.php
@@ -24,7 +24,6 @@
               <th colspan="2" style="width: 90%;">
                 <?php echo __('Containers') ?>
               </th><th style="width: 5%;">
-                <?php echo image_tag('delete', array('align' => 'top', 'class' => 'deleteIcon')) ?>
               </th>
             </tr>
           </thead><tbody>
@@ -33,7 +32,7 @@
                 <td style="width: 90%"><div class="animateNicely">
                   <?php echo $item->subject->getLabel() ?>
                 </div></td><td style="width: 20px;"><div class="animateNicely">
-                  <?php echo link_to(image_tag('pencil', array('align' => 'top')), array($item->subject, 'module' => 'physicalobject', 'action' => 'edit')) ?>
+                  <?php echo link_to(image_tag('pencil', array('style' => 'align: top', 'alt' => __('Edit')), array($item->subject, 'module' => 'physicalobject', 'action' => 'edit')) ?>
                 </div></td><td style="width: 20px;"><div class="animateNicely">
                   <input class="multiDelete" name="delete_relations[]" type="checkbox" value="<?php echo url_for(array($item, 'module' => 'relation')) ?>"/>
                 </div></td>
diff --git a/apps/qubit/modules/informationobject/templates/itemListSuccess.php b/apps/qubit/modules/informationobject/templates/itemListSuccess.php
index 3b6d328b39..a15c06ec8e 100644
--- a/apps/qubit/modules/informationobject/templates/itemListSuccess.php
+++ b/apps/qubit/modules/informationobject/templates/itemListSuccess.php
@@ -40,7 +40,7 @@
         <?php if ($includeThumbnails): ?>
         <td>
         <?php if (null != ($do = $item['resource']->getDigitalObject()) && (null != $do->thumbnail)):  ?>
-          <?php echo image_tag($do->thumbnail->getFullPath()) ?>
+          <?php echo image_tag($do->thumbnail->getFullPath(), array('alt' => '')) ?>
         <?php else: ?>
           <?php echo __('N/A') ?>
         <?php endif; ?>
diff --git a/apps/qubit/modules/menu/templates/_userMenu.php b/apps/qubit/modules/menu/templates/_userMenu.php
index 01bd6000dd..06cfa05d8e 100644
--- a/apps/qubit/modules/menu/templates/_userMenu.php
+++ b/apps/qubit/modules/menu/templates/_userMenu.php
@@ -51,7 +51,7 @@
       </div>
 
       <div class="top-dropdown-header">
-        <?php echo image_tag($gravatar) ?>&nbsp;
+        <?php echo image_tag($gravatar, array('alt' => '')) ?>&nbsp;
         <h2><?php echo __('Hi, %1%', array('%1%' => $sf_user->user->username)) ?></h2>
       </div>
 
diff --git a/apps/qubit/modules/menu/templates/listSuccess.php b/apps/qubit/modules/menu/templates/listSuccess.php
index ea8efd727f..f18cbcaf58 100644
--- a/apps/qubit/modules/menu/templates/listSuccess.php
+++ b/apps/qubit/modules/menu/templates/listSuccess.php
@@ -28,13 +28,13 @@
             <?php if (isset($item['prev'])): ?>
               <?php echo link_to(image_tag('up.gif', array('alt' => __('Move up'))), array('module' => 'menu', 'action' => 'list', 'move' => $item['id'], 'before' => $item['prev']), array('title' => __('Move item up in list'))) ?>
             <?php else: ?>
-              <?php echo image_tag('1x1_transparent', array('height' => '5', 'width' => '13')) ?>
+              &nbsp;&nbsp;
             <?php endif; ?>
 
             <?php if (isset($item['next'])): ?>
               <?php echo link_to(image_tag('down.gif', array('alt' => __('Move down'))), array('module' => 'menu', 'action' => 'list', 'move' => $item['id'], 'after' => $item['next']), array('title' => __('Move item down in list'))) ?>
             <?php else: ?>
-              <?php echo image_tag('1x1_transparent', array('height' => '5', 'width'=>'13')) ?>
+              &nbsp;&nbsp;
             <?php endif; ?>
 
             <?php if ($item['protected']): ?>
diff --git a/apps/qubit/modules/physicalobject/templates/browseSuccess.php b/apps/qubit/modules/physicalobject/templates/browseSuccess.php
index 92734f389e..df5fa5eb38 100644
--- a/apps/qubit/modules/physicalobject/templates/browseSuccess.php
+++ b/apps/qubit/modules/physicalobject/templates/browseSuccess.php
@@ -23,16 +23,16 @@
         <th class="sortable">
           <?php echo link_to(__('Name'), array('sort' => ('nameUp' == $sf_request->sort) ? 'nameDown' : 'nameUp') + $sf_data->getRaw('sf_request')->getParameterHolder()->getAll(), array('title' => __('Sort'), 'class' => 'sortable')) ?>
           <?php if ('nameUp' == $sf_request->sort): ?>
-            <?php echo image_tag('up.gif') ?>
+            <?php echo image_tag('up.gif', array('alt' => __('Sort ascending'))) ?>
           <?php elseif ('nameDown' == $sf_request->sort): ?>
-            <?php echo image_tag('down.gif') ?>
+            <?php echo image_tag('down.gif', array('alt' => __('Sort descending'))) ?>
           <?php endif; ?>
         </th><th class="sortable">
           <?php echo link_to(__('Location'), array('sort' => ('locationUp' == $sf_request->sort) ? 'locationDown' : 'locationUp') + $sf_data->getRaw('sf_request')->getParameterHolder()->getAll(), array('title' => __('Sort'), 'class' => 'sortable')) ?>
           <?php if ('locationUp' == $sf_request->sort): ?>
-            <?php echo image_tag('up.gif') ?>
+            <?php echo image_tag('up.gif', array('alt' => __('Sort ascending'))) ?>
           <?php elseif ('locationDown' == $sf_request->sort): ?>
-            <?php echo image_tag('down.gif') ?>
+            <?php echo image_tag('down.gif', array('alt' => __('Sort descending'))) ?>
           <?php endif; ?>
         </th><th>
           <?php echo __('Type') ?>
diff --git a/apps/qubit/modules/repository/templates/_browseCardView.php b/apps/qubit/modules/repository/templates/_browseCardView.php
index 0b50ead02a..b955f7a4e0 100644
--- a/apps/qubit/modules/repository/templates/_browseCardView.php
+++ b/apps/qubit/modules/repository/templates/_browseCardView.php
@@ -1,3 +1,5 @@
+<?php use_helper('Text') ?>
+
 <section class="masonry">
 
   <?php foreach ($pager->getResults() as $hit): ?>
@@ -12,7 +14,7 @@
       <a href="<?php echo url_for(array('module' => 'repository', 'slug' => $doc['slug'])) ?>">
         <?php if ($hasLogo): ?>
           <div class="preview">
-            <?php echo image_tag('/uploads/r/'.$doc['slug'].'/conf/logo.png') ?>
+            <?php echo image_tag('/uploads/r/'.$doc['slug'].'/conf/logo.png', array('alt' => __('Go to %1%', array('%1%' => esc_entities(render_title(truncate_text(get_search_i18n($doc, 'authorizedFormOfName', array('allowEmpty' => false, 'culture' => $selectedCulture)), 100))))))) ?>
           </div>
         <?php else: ?>
           <h4><?php echo $authorizedFormOfName ?></h4>
diff --git a/apps/qubit/modules/repository/templates/_browseTableView.php b/apps/qubit/modules/repository/templates/_browseTableView.php
index 5479e65277..6a5f404a65 100644
--- a/apps/qubit/modules/repository/templates/_browseTableView.php
+++ b/apps/qubit/modules/repository/templates/_browseTableView.php
@@ -7,9 +7,9 @@
                            array('title' => __('Sort'), 'class' => 'sortable')) ?>
 
         <?php if ('nameUp' == $sf_request->sort): ?>
-          <?php echo image_tag('up.gif') ?>
+          <?php echo image_tag('up.gif', array('alt' => __('Sort ascending'))) ?>
         <?php elseif ('nameDown' == $sf_request->sort): ?>
-          <?php echo image_tag('down.gif') ?>
+          <?php echo image_tag('down.gif', array('alt' => __('Sort descending'))) ?>
         <?php endif; ?>
       </th>
 
@@ -19,9 +19,9 @@
                            array('title' => __('Sort'), 'class' => 'sortable')) ?>
 
         <?php if ('regionUp' == $sf_request->sort): ?>
-          <?php echo image_tag('up.gif') ?>
+          <?php echo image_tag('up.gif', array('alt' => __('Sort ascending'))) ?>
         <?php elseif ('regionDown' == $sf_request->sort): ?>
-          <?php echo image_tag('down.gif') ?>
+          <?php echo image_tag('down.gif', array('alt' => __('Sort descending'))) ?>
         <?php endif; ?>
       </th>
 
@@ -31,9 +31,9 @@
                            array('title' => __('Sort'), 'class' => 'sortable')) ?>
 
         <?php if ('localityUp' == $sf_request->sort): ?>
-          <?php echo image_tag('up.gif') ?>
+          <?php echo image_tag('up.gif', array('alt' => __('Sort ascending'))) ?>
         <?php elseif ('localityDown' == $sf_request->sort): ?>
-          <?php echo image_tag('down.gif') ?>
+          <?php echo image_tag('down.gif', array('alt' => __('Sort descending'))) ?>
         <?php endif; ?>
       </th>
 
@@ -48,7 +48,7 @@
     <tr>
       <td>
         <?php if (isset($doc['logoPath'])): ?>
-          <?php echo image_tag($doc['logoPath'], array('height' => '10%', 'width' => '10%')) ?>
+          <?php echo image_tag($doc['logoPath'], array('height' => '10%', 'width' => '10%', 'alt' => '')) ?>
         <?php endif; ?>
 
         <?php echo link_to(render_title(get_search_i18n($doc, 'authorizedFormOfName', array('allowEmpty' => false,
diff --git a/apps/qubit/modules/repository/templates/_holdings.php b/apps/qubit/modules/repository/templates/_holdings.php
index bb60159be6..e0d3053dd9 100644
--- a/apps/qubit/modules/repository/templates/_holdings.php
+++ b/apps/qubit/modules/repository/templates/_holdings.php
@@ -4,7 +4,7 @@
 
   <h3>
     <?php echo sfConfig::get('app_ui_label_holdings') ?>
-    <?php echo image_tag('loading.small.gif', array('class' => 'hidden', 'id' => 'spinner')) ?>
+    <?php echo image_tag('loading.small.gif', array('class' => 'hidden', 'id' => 'spinner', 'alt' => __('Loading ...'))) ?>
   </h3>
   <form class="sidebar-search" action="<?php echo url_for(array('module' => 'search')) ?>">
     <input type="hidden" name="repos" value="<?php echo $resource->id ?>">
diff --git a/apps/qubit/modules/repository/templates/_logo.php b/apps/qubit/modules/repository/templates/_logo.php
index 885f5a885b..187b2a4e57 100644
--- a/apps/qubit/modules/repository/templates/_logo.php
+++ b/apps/qubit/modules/repository/templates/_logo.php
@@ -1,7 +1,9 @@
+<?php use_helper('Text') ?>
+
 <div class="repository-logo<?php echo $resource->existsLogo() ? '' : ' repository-logo-text' ?>">
   <a href="<?php echo url_for(array($resource, 'module' => 'repository')) ?>">
     <?php if ($resource->existsLogo()): ?>
-      <?php echo image_tag($resource->getLogoPath()) ?>
+      <?php echo image_tag($resource->getLogoPath(), array('alt' => __('Go to %1%', array('%1%' => esc_entities(render_title(truncate_text($resource), 100)))))) ?>
     <?php else: ?>
       <h2><?php echo render_title($resource) ?></h2>
     <?php endif; ?>
diff --git a/apps/qubit/modules/repository/templates/browseSuccess.php b/apps/qubit/modules/repository/templates/browseSuccess.php
index f461f786a3..201d1991a3 100644
--- a/apps/qubit/modules/repository/templates/browseSuccess.php
+++ b/apps/qubit/modules/repository/templates/browseSuccess.php
@@ -3,7 +3,7 @@
 
 <?php slot('title') ?>
   <div class="multiline-header">
-    <?php echo image_tag('/images/icons-large/icon-institutions.png') ?>
+    <?php echo image_tag('/images/icons-large/icon-institutions.png', array('alt' => '')) ?>
     <h1 aria-describedby="results-label"><?php echo __('Showing %1% results', array('%1%' => $pager->getNbResults())) ?></h1>
     <span class="sub" id="results-label"><?php echo sfConfig::get('app_ui_label_repository') ?></span>
   </div>
diff --git a/apps/qubit/modules/search/templates/_searchResult.php b/apps/qubit/modules/search/templates/_searchResult.php
index d2038f9379..a814316d16 100644
--- a/apps/qubit/modules/search/templates/_searchResult.php
+++ b/apps/qubit/modules/search/templates/_searchResult.php
@@ -14,9 +14,11 @@
           <?php if (isset($doc['digitalObject']['thumbnailPath']) &&
                     QubitAcl::check(QubitInformationObject::getById($hit->getId()), 'readThumbnail') &&
                     QubitGrantedRight::checkPremis($hit->getId(), 'readThumb')): ?>
-            <?php echo image_tag($doc['digitalObject']['thumbnailPath']) ?>
+            <?php echo image_tag($doc['digitalObject']['thumbnailPath'],
+              array('alt' => __('Go to %1%', array('%1%' => esc_entities(render_title(truncate_text(get_search_i18n($doc, 'title', array('allowEmpty' => false, 'culture' => $culture)), 100))))))) ?>
           <?php else: ?>
-            <?php echo image_tag(QubitDigitalObject::getGenericIconPathByMediaTypeId($doc['digitalObject']['mediaTypeId'])) ?>
+            <?php echo image_tag(QubitDigitalObject::getGenericIconPathByMediaTypeId($doc['digitalObject']['mediaTypeId']),
+              array('alt' => __('Go to %1%', array('%1%' => esc_entities(render_title(truncate_text(get_search_i18n($doc, 'title', array('allowEmpty' => false, 'culture' => $culture)), 100))))))) ?>
           <?php endif; ?>
         </div>
       </a>
diff --git a/apps/qubit/modules/search/templates/autocompleteSuccess.php b/apps/qubit/modules/search/templates/autocompleteSuccess.php
index 216b720ac2..08cef3ba1e 100644
--- a/apps/qubit/modules/search/templates/autocompleteSuccess.php
+++ b/apps/qubit/modules/search/templates/autocompleteSuccess.php
@@ -1,6 +1,6 @@
 <?php if ($descriptions->getTotalHits() > 0): ?>
   <section>
-    <?php echo image_tag('/images/icons-small/icon-archival-small.png', array('width' => '24', 'height' => '24')) ?>
+    <?php echo image_tag('/images/icons-small/icon-archival-small.png', array('width' => '24', 'height' => '24', 'alt' => sfConfig::get('app_ui_label_informationobject'))) ?>
     <ul>
       <?php foreach ($descriptions->getResults() as $hit): ?>
         <?php $doc = $hit->getData() ?>
@@ -21,7 +21,7 @@
 
 <?php if ($repositories->getTotalHits() > 0): ?>
   <section>
-    <?php echo image_tag('/images/icons-small/icon-institutions-small.png', array('width' => '24', 'height' => '24')) ?>
+    <?php echo image_tag('/images/icons-small/icon-institutions-small.png', array('width' => '24', 'height' => '24', 'alt' => sfConfig::get('app_ui_label_actor'))) ?>
     <ul>
       <?php foreach ($repositories->getResults() as $hit): ?>
         <?php $doc = $hit->getData() ?>
@@ -36,7 +36,7 @@
 
 <?php if ($actors->getTotalHits() > 0): ?>
   <section>
-    <?php echo image_tag('/images/icons-small/icon-people-small.png', array('width' => '24', 'height' => '24')) ?>
+    <?php echo image_tag('/images/icons-small/icon-people-small.png', array('width' => '24', 'height' => '24', 'alt' => sfConfig::get('app_ui_label_repository'))) ?>
     <ul>
       <?php foreach ($actors->getResults() as $hit): ?>
         <?php $doc = $hit->getData() ?>
@@ -51,7 +51,7 @@
 
 <?php if ($places->getTotalHits() > 0): ?>
   <section>
-    <?php echo image_tag('/images/icons-small/icon-places-small.png', array('width' => '24', 'height' => '24')) ?>
+    <?php echo image_tag('/images/icons-small/icon-places-small.png', array('width' => '24', 'height' => '24', 'alt' => sfConfig::get('app_ui_label_place'))) ?>
     <ul>
       <?php foreach ($places->getResults() as $hit): ?>
         <?php $doc = $hit->getData() ?>
@@ -66,7 +66,7 @@
 
 <?php if ($subjects->getTotalHits() > 0): ?>
   <section>
-    <?php echo image_tag('/images/icons-small/icon-subjects-small.png', array('width' => '24', 'height' => '24')) ?>
+    <?php echo image_tag('/images/icons-small/icon-subjects-small.png', array('width' => '24', 'height' => '24', 'alt' => sfConfig::get('app_ui_label_subject'))) ?>
     <ul>
       <?php foreach ($subjects->getResults() as $hit): ?>
         <?php $doc = $hit->getData() ?>
diff --git a/apps/qubit/modules/search/templates/descriptionUpdatesSuccess.php b/apps/qubit/modules/search/templates/descriptionUpdatesSuccess.php
index 5c1cce1d42..c5c8159bf9 100644
--- a/apps/qubit/modules/search/templates/descriptionUpdatesSuccess.php
+++ b/apps/qubit/modules/search/templates/descriptionUpdatesSuccess.php
@@ -2,7 +2,7 @@
 
 <?php slot('title') ?>
   <h1 class="multiline">
-    <?php echo image_tag('/images/icons-large/icon-new.png', array('width' => '42', 'height' => '42')) ?>
+    <?php echo image_tag('/images/icons-large/icon-new.png', array('width' => '42', 'height' => '42', 'alt' => '')) ?>
     <?php echo __('Browse newest additions') ?>
   </h1>
 <?php end_slot() ?>
diff --git a/apps/qubit/modules/settings/templates/languageSuccess.php b/apps/qubit/modules/settings/templates/languageSuccess.php
index 7c51cecf4e..f3600312e9 100644
--- a/apps/qubit/modules/settings/templates/languageSuccess.php
+++ b/apps/qubit/modules/settings/templates/languageSuccess.php
@@ -42,7 +42,7 @@
               </td>
               <td>
                 <?php if ($setting->deleteable): ?>
-                  <?php echo link_to(image_tag('delete'), array($setting, 'module' => 'settings', 'action' => 'delete')) ?>
+                  <?php echo link_to(image_tag('delete', array('alt' => __('Delete'))), array($setting, 'module' => 'settings', 'action' => 'delete')) ?>
                 <?php endif; ?>
               </td>
             </tr>
diff --git a/apps/qubit/modules/taxonomy/templates/browseSuccess.php b/apps/qubit/modules/taxonomy/templates/browseSuccess.php
index daeb801afd..1fec471537 100644
--- a/apps/qubit/modules/taxonomy/templates/browseSuccess.php
+++ b/apps/qubit/modules/taxonomy/templates/browseSuccess.php
@@ -3,7 +3,7 @@
 <?php slot('title') ?>
   <div class="multiline-header">
     <?php if (isset($icon)): ?>
-      <?php echo image_tag('/images/icons-large/icon-'.$icon.'.png') ?>
+      <?php echo image_tag('/images/icons-large/icon-'.$icon.'.png', array('alt' => '')) ?>
     <?php endif; ?>
     <h1 aria-describedby="results-label"><?php echo __('Showing %1% results', array('%1%' => $pager->getNbResults())) ?></h1>
     <span class="sub" id="results-label"><?php echo render_title($resource) ?></span>
diff --git a/apps/qubit/modules/taxonomy/templates/indexSuccess.php b/apps/qubit/modules/taxonomy/templates/indexSuccess.php
index ba227c4c0a..2baad0eae1 100644
--- a/apps/qubit/modules/taxonomy/templates/indexSuccess.php
+++ b/apps/qubit/modules/taxonomy/templates/indexSuccess.php
@@ -13,7 +13,7 @@
 <?php slot('title') ?>
   <div class="multiline-header">
     <?php if (isset($icon)): ?>
-      <?php echo image_tag('/images/icons-large/icon-'.$icon.'.png') ?>
+      <?php echo image_tag('/images/icons-large/icon-'.$icon.'.png', array('alt' => '')) ?>
     <?php endif; ?>
     <h1 aria-describedby="results-label"><?php echo __('Showing %1% results', array('%1%' => $pager->getNbResults())) ?></h1>
     <span class="sub" id="results-label"><?php echo render_title($resource) ?></span>
diff --git a/apps/qubit/modules/term/templates/browseTermSuccess.php b/apps/qubit/modules/term/templates/browseTermSuccess.php
index 3f9047c27f..f2516121e5 100644
--- a/apps/qubit/modules/term/templates/browseTermSuccess.php
+++ b/apps/qubit/modules/term/templates/browseTermSuccess.php
@@ -6,7 +6,7 @@
   <div class="hidden-phone">
     <h1>
       <?php if (isset($icon)): ?>
-        <?php echo image_tag('/images/icons-large/icon-'.$icon.'.png', array('width' => '42', 'height' => '42')) ?>
+        <?php echo image_tag('/images/icons-large/icon-'.$icon.'.png', array('width' => '42', 'height' => '42', 'alt' => '')) ?>
       <?php endif; ?>
       <?php echo __('Browse %1% %2%', array(
         '%1%' => render_title($resource->taxonomy),
diff --git a/apps/qubit/modules/term/templates/indexSuccess.php b/apps/qubit/modules/term/templates/indexSuccess.php
index 26f597d456..d8db2888c9 100644
--- a/apps/qubit/modules/term/templates/indexSuccess.php
+++ b/apps/qubit/modules/term/templates/indexSuccess.php
@@ -112,7 +112,8 @@
       <div>
         <?php echo $resource->code ?>
         <?php if (!empty($resource->code) && QubitTaxonomy::PLACE_ID == $resource->taxonomy->id): ?>
-          <?php echo image_tag('http://maps.googleapis.com/maps/api/staticmap?zoom=13&size=300x300&sensor=false&center='.$resource->code, array('class' => 'static-map')) ?>
+          <?php echo image_tag('http://maps.googleapis.com/maps/api/staticmap?zoom=13&size=300x300&sensor=false&center='.$resource->code,
+            array('class' => 'static-map', 'alt' => __('Map of %1%', array('%1%' => esc_entities(render_title(truncate_text($resource, 100))))))) ?>
         <?php endif; ?>
       </div>
     </div>
diff --git a/apps/qubit/modules/user/templates/readOnlySuccess.php b/apps/qubit/modules/user/templates/readOnlySuccess.php
index 0d8949a8b2..8042c20566 100644
--- a/apps/qubit/modules/user/templates/readOnlySuccess.php
+++ b/apps/qubit/modules/user/templates/readOnlySuccess.php
@@ -1,6 +1,6 @@
 <div style="text-align: center;">
 
-  <?php echo image_tag('lock48') ?>
+  <?php echo image_tag('lock48', array('alt' => __('Read only'))) ?>
 
   <h2 style="font-size: 20px;"><?php echo __('The system is currently in read-only mode. Please try again later.'); ?></h2>
 
diff --git a/apps/qubit/templates/_header.php b/apps/qubit/templates/_header.php
index f66d962442..9afc15f7df 100644
--- a/apps/qubit/templates/_header.php
+++ b/apps/qubit/templates/_header.php
@@ -9,7 +9,7 @@
 <header id="top-bar">
 
   <?php if (sfConfig::get('app_toggleLogo')): ?>
-    <?php echo link_to(image_tag('logo'), '@homepage', array('id' => 'logo', 'rel' => 'home')) ?>
+    <?php echo link_to(image_tag('logo', array('alt' => 'AtoM')), '@homepage', array('id' => 'logo', 'rel' => 'home')) ?>
   <?php endif; ?>
 
   <?php if (sfConfig::get('app_toggleTitle')): ?>
diff --git a/config/error/error.html.php b/config/error/error.html.php
index 69a1a5a70e..821eb7c3fe 100644
--- a/config/error/error.html.php
+++ b/config/error/error.html.php
@@ -12,7 +12,7 @@
       <section class="admin-message" id="error-404">
 
         <h2>
-          <img src="<?php echo $path ?>/images/logo.png"/>
+          <img alt="" src="<?php echo $path ?>/images/logo.png"/>
           Oops! An Error Occurred
         </h2>
 
diff --git a/config/unavailable.php b/config/unavailable.php
index 1946a20e45..5200635d52 100644
--- a/config/unavailable.php
+++ b/config/unavailable.php
@@ -31,7 +31,7 @@
 
     <div id="header">
       <div id="logo-floater">
-        <h1><img alt="Qubit" id="logo" src="<?php echo $path ?>/images/logo.png"/><div>Qubit</div></h1>
+        <h1><img alt="" id="logo" src="<?php echo $path ?>/images/logo.png"/><div>Qubit</div></h1>
       </div>
     </div>
 
diff --git a/js/multiDelete.js b/js/multiDelete.js
index ac8a489c92..a19cd22bc7 100644
--- a/js/multiDelete.js
+++ b/js/multiDelete.js
@@ -41,8 +41,5 @@
             // It returns document (which is not compatible
             // with hide()) if $('.multiDelete').lenght is zero
             .filter('input').hide();
-
-          // Drop delete icons from table headers
-          $('th img.deleteIcon', context).remove();
         } }
   })(jQuery);
diff --git a/plugins/arArchivesCanadaPlugin/modules/search/templates/_box.php b/plugins/arArchivesCanadaPlugin/modules/search/templates/_box.php
index d13f2c3c5b..62f6a2afa9 100644
--- a/plugins/arArchivesCanadaPlugin/modules/search/templates/_box.php
+++ b/plugins/arArchivesCanadaPlugin/modules/search/templates/_box.php
@@ -31,7 +31,7 @@
                 <li>
                   <a href="<?php echo url_for($item->getPath(array('getUrl' => true, 'resolveAlias' => true))) ?>">
                     <?php if (isset($icons[$item->name])): ?>
-                      <?php echo image_tag($icons[$item->name], array('width' => 42, 'height' => 42)) ?>
+                      <?php echo image_tag($icons[$item->name], array('width' => 42, 'height' => 42, 'alt' => '')) ?>
                     <?php endif; ?>
                     <?php echo esc_entities($item->getLabel(array('cultureFallback' => true))) ?>
                   </a>
diff --git a/plugins/arArchivesCanadaPlugin/modules/staticpage/templates/homeSuccess.php b/plugins/arArchivesCanadaPlugin/modules/staticpage/templates/homeSuccess.php
index b8eb2368f7..d49e608f20 100644
--- a/plugins/arArchivesCanadaPlugin/modules/staticpage/templates/homeSuccess.php
+++ b/plugins/arArchivesCanadaPlugin/modules/staticpage/templates/homeSuccess.php
@@ -19,7 +19,7 @@
             <li>
               <a href="<?php echo url_for($item->getPath(array('getUrl' => true, 'resolveAlias' => true))) ?>">
                 <?php if (isset($icons[$item->name])): ?>
-                  <?php echo image_tag($icons[$item->name], array('width' => 42, 'height' => 42)) ?>
+                  <?php echo image_tag($icons[$item->name], array('width' => 42, 'height' => 42, 'alt' => '')) ?>
                 <?php endif; ?>
                 <?php echo esc_specialchars($item->getLabel(array('cultureFallback' => true))) ?>
               </a>
diff --git a/plugins/arArchivesCanadaPlugin/templates/_header.php b/plugins/arArchivesCanadaPlugin/templates/_header.php
index a4f61c5d62..b91d1376a8 100644
--- a/plugins/arArchivesCanadaPlugin/templates/_header.php
+++ b/plugins/arArchivesCanadaPlugin/templates/_header.php
@@ -22,9 +22,9 @@
         <div class="span12">
 
           <?php if ('fr' == $sf_user->getCulture()): ?>
-            <a id="header-council" href="http://www.cdncouncilarchives.ca/"><?php echo image_tag('/plugins/arArchivesCanadaPlugin/images/council.fr.png', array('width' => '156', 'height' => '42')) ?></a>
+            <a id="header-council" href="http://www.cdncouncilarchives.ca/"><?php echo image_tag('/plugins/arArchivesCanadaPlugin/images/council.fr.png', array('width' => '156', 'height' => '42', 'alt' => __('Canadian Council of Archives'))) ?></a>
           <?php else: ?>
-            <a id="header-council" href="http://www.cdncouncilarchives.ca/"><?php echo image_tag('/plugins/arArchivesCanadaPlugin/images/council.en.png', array('width' => '156', 'height' => '42')) ?></a>
+            <a id="header-council" href="http://www.cdncouncilarchives.ca/"><?php echo image_tag('/plugins/arArchivesCanadaPlugin/images/council.en.png', array('width' => '156', 'height' => '42', 'alt' => __('Canadian Council of Archives'))) ?></a>
           <?php endif; ?>
 
           <ul id="header-nav" class="nav nav-pills">
@@ -58,7 +58,7 @@
       <div class="row">
 
         <div id="logo-and-name" class="span6">
-          <h1><?php echo link_to(image_tag('/plugins/arArchivesCanadaPlugin/images/logo.png'), '@homepage', array('rel' => 'home')) ?></h1>
+          <h1><?php echo link_to(image_tag('/plugins/arArchivesCanadaPlugin/images/logo.png', array('alt' => __('Archives Canada'))), '@homepage', array('rel' => 'home')) ?></h1>
         </div>
 
         <div id="header-search" class="span6">
diff --git a/plugins/qtAccessionPlugin/modules/accession/templates/_relatedDonor.php b/plugins/qtAccessionPlugin/modules/accession/templates/_relatedDonor.php
index 4762bd7611..b17c778b84 100644
--- a/plugins/qtAccessionPlugin/modules/accession/templates/_relatedDonor.php
+++ b/plugins/qtAccessionPlugin/modules/accession/templates/_relatedDonor.php
@@ -33,7 +33,7 @@
 <?php
 
 // Template for new display table rows
-$editHtml = image_tag('pencil', array('alt' => 'edit', 'style' => 'align: top'));
+$editHtml = image_tag('pencil', array('alt' => __('Edit'), 'style' => 'align: top'));
 
 $rowTemplate = json_encode(<<<value
 <tr id="{{$form->getWidgetSchema()->generateName('id')}}">
diff --git a/plugins/sfIsaarPlugin/modules/sfIsaarPlugin/templates/_event.php b/plugins/sfIsaarPlugin/modules/sfIsaarPlugin/templates/_event.php
index 6bb2e6ea69..3181454468 100644
--- a/plugins/sfIsaarPlugin/modules/sfIsaarPlugin/templates/_event.php
+++ b/plugins/sfIsaarPlugin/modules/sfIsaarPlugin/templates/_event.php
@@ -20,7 +20,6 @@
         </th><th style="width: 25%">
           <?php echo __('Dates') ?>
         </th><th style="text-align: center; width: 10%">
-          <?php echo image_tag('delete', array('align' => 'top', 'class' => 'deleteIcon')) ?>
         </th>
       </tr>
     </thead><tbody>
@@ -43,7 +42,7 @@
 <?php
 
 // Template for new display table rows
-$editHtml = image_tag('pencil', array('alt' => 'edit', 'style' => 'align: top'));
+$editHtml = image_tag('pencil', array('alt' => __('Edit'), 'style' => 'align: top'));
 
 $rowTemplate = json_encode(<<<value
 <tr id="{{$form->getWidgetSchema()->generateName('id')}}">
diff --git a/plugins/sfIsaarPlugin/modules/sfIsaarPlugin/templates/_relatedAuthorityRecord.php b/plugins/sfIsaarPlugin/modules/sfIsaarPlugin/templates/_relatedAuthorityRecord.php
index 3ffa22e378..799937f17f 100644
--- a/plugins/sfIsaarPlugin/modules/sfIsaarPlugin/templates/_relatedAuthorityRecord.php
+++ b/plugins/sfIsaarPlugin/modules/sfIsaarPlugin/templates/_relatedAuthorityRecord.php
@@ -24,7 +24,6 @@
         </th><th style="width: 25%">
           <?php echo __('Description') ?>
         </th><th style="text-align: center; width: 10%">
-          <?php echo image_tag('delete', array('align' => 'top', 'class' => 'deleteIcon')) ?>
         </th>
       </tr>
     </thead><tbody>
@@ -65,7 +64,7 @@
 <?php
 
 // Template for new display table rows
-$editHtml = image_tag('pencil', array('alt' => 'edit', 'style' => 'align: top'));
+$editHtml = image_tag('pencil', array('alt' => __('Edit'), 'style' => 'align: top'));
 
 $rowTemplate = json_encode(<<<value
 <tr id="{{$form->getWidgetSchema()->generateName('id')}}">
diff --git a/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/templates/_relatedAuthorityRecord.php b/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/templates/_relatedAuthorityRecord.php
index 46d109fffa..68c1a2a56c 100644
--- a/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/templates/_relatedAuthorityRecord.php
+++ b/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/templates/_relatedAuthorityRecord.php
@@ -20,7 +20,6 @@
         </th><th style="width: 20%">
           <?php echo __('Dates') ?>
         </th><th style="text-align: center; width: 10%">
-          <?php echo image_tag('delete', array('align' => 'top', 'class' => 'deleteIcon')) ?>
         </th>
       </tr>
     </thead><tbody>
@@ -43,7 +42,7 @@
 <?php
 
 // Template for new display table rows
-$editHtml = image_tag('pencil', array('alt' => 'edit', 'style' => 'align: top'));
+$editHtml = image_tag('pencil', array('alt' => __('Edit'), 'style' => 'align: top'));
 
 $rowTemplate = json_encode(<<<value
 <tr id="{{$form->getWidgetSchema()->generateName('id')}}">
diff --git a/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/templates/_relatedFunction.php b/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/templates/_relatedFunction.php
index 82e186a9e5..da695212c1 100644
--- a/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/templates/_relatedFunction.php
+++ b/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/templates/_relatedFunction.php
@@ -22,7 +22,6 @@
         </th><th style="width: 20%">
           <?php echo __('Dates') ?>
         </th><th style="text-align: center; width: 10%">
-          <?php echo image_tag('delete', array('align' => 'top', 'class' => 'deleteIcon')) ?>
         </th>
       </tr>
     </thead><tbody>
@@ -51,7 +50,7 @@
 <?php
 
 // Template for new display table rows
-$editHtml = image_tag('pencil', array('alt' => 'edit', 'style' => 'align: top'));
+$editHtml = image_tag('pencil', array('alt' => __('Edit'), 'style' => 'align: top'));
 
 $rowTemplate = json_encode(<<<value
 <tr id="{{$form->getWidgetSchema()->generateName('id')}}">
diff --git a/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/templates/_relatedResource.php b/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/templates/_relatedResource.php
index 786a8f778b..4f325dcd85 100644
--- a/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/templates/_relatedResource.php
+++ b/plugins/sfIsdfPlugin/modules/sfIsdfPlugin/templates/_relatedResource.php
@@ -20,7 +20,6 @@
         </th><th style="width: 20%">
           <?php echo __('Dates') ?>
         </th><th style="text-align: center; width: 10%">
-          <?php echo image_tag('delete', array('align' => 'top', 'class' => 'deleteIcon')) ?>
         </th>
       </tr>
     </thead><tbody>
@@ -43,7 +42,7 @@
 <?php
 
 // Template for new display table rows
-$editHtml = image_tag('pencil', array('alt' => 'edit', 'style' => 'align: top'));
+$editHtml = image_tag('pencil', array('alt' => __('Edit'), 'style' => 'align: top'));
 
 $rowTemplate = json_encode(<<<value
 <tr id="{{$form->getWidgetSchema()->generateName('id')}}">
diff --git a/plugins/sfIsdiahPlugin/modules/sfIsdiahPlugin/templates/indexSuccess.php b/plugins/sfIsdiahPlugin/modules/sfIsdiahPlugin/templates/indexSuccess.php
index fbe9689077..c9042265db 100644
--- a/plugins/sfIsdiahPlugin/modules/sfIsdiahPlugin/templates/indexSuccess.php
+++ b/plugins/sfIsdiahPlugin/modules/sfIsdiahPlugin/templates/indexSuccess.php
@@ -32,7 +32,7 @@
   <?php if ($resource->existsBanner()): ?>
     <div class="row" id="repository-banner">
       <div class="span7">
-        <?php echo image_tag($resource->getBannerPath()) ?>
+        <?php echo image_tag($resource->getBannerPath(), array('alt' => '')) ?>
       </div>
     </div>
   <?php endif; ?>