diff --git a/src/templates/common/elements/orcid_registration.html b/src/templates/common/elements/orcid_registration.html
index 9c33c119c8..f16882b260 100644
--- a/src/templates/common/elements/orcid_registration.html
+++ b/src/templates/common/elements/orcid_registration.html
@@ -5,7 +5,6 @@
     {% if orcid %}
         <p>
             ORCiD                            
-            {# IconA11y Semantic - alt text provided #}
             <a href="{{ orcid }}"><img alt="ORCID logo" src="{% static 'common/img/icons/orcid.gif' %}"> {{ orcid }}</a>&nbsp;
             [<a href="{% url 'core_register' %}">remove</a>]
         </p>
diff --git a/src/templates/common/elements/profile_image.html b/src/templates/common/elements/profile_image.html
index 45fb8b81cd..573f83ec96 100644
--- a/src/templates/common/elements/profile_image.html
+++ b/src/templates/common/elements/profile_image.html
@@ -1,5 +1,4 @@
 {% load static %}
-{# IconA11y Semantic - has text alternative#}
 <img
     class="{{ classes }}"
     src="{% if user.profile_image %}{{ user.profile_image.url }}{% elif request.journal.default_profile_image %}{{ request.journal.default_profile_image.url }}{% else %}{% static "common/img/icons/users.png" %}{% endif %}"
diff --git a/src/themes/OLH/templates/core/base.html b/src/themes/OLH/templates/core/base.html
index 6346f28d9c..a7cf0e16b6 100644
--- a/src/themes/OLH/templates/core/base.html
+++ b/src/themes/OLH/templates/core/base.html
@@ -91,7 +91,6 @@ <h1 class="menu-text">{{ request.journal.name }}</h1>
                     </div>
                     <div data-responsive-toggle="search-menu" data-hide-for="medium">
                         <a href="#" class="search-toggle" data-toggle aria-label="Search">
-                            {# IconA11y Semantic - updated with aria-label in a tag #}
                             <i aria-hidden="true" class="fa fa-search"></i>
                         </a>
                     </div>
@@ -151,7 +150,6 @@ <h1 class="menu-text">{{ request.journal.name }}</h1>
                         <form method="POST" action="{% url 'search' %}">
                             {% csrf_token %}
                             <div class="input-group">
-                                {# IconA11y Decorative - syntax updated #}
                                 <span class="input-group-label"><i aria-hidden="true" class="fa fa-search"></i></span>
                                 <input class="input-group-field" type="search" name="article_search" placeholder="{% trans 'Search' %}">
                                 <input type="hidden" name="sort" value="title">
diff --git a/src/themes/OLH/templates/core/homepage_elements/search_bar.html b/src/themes/OLH/templates/core/homepage_elements/search_bar.html
index a899c3539e..f627f7f28c 100644
--- a/src/themes/OLH/templates/core/homepage_elements/search_bar.html
+++ b/src/themes/OLH/templates/core/homepage_elements/search_bar.html
@@ -13,7 +13,6 @@
             <input id="title" name="title" type="hidden" value="on">
             <input id="abstract" name="abstract" type="hidden" value="on">
               <span class="input-group-label">
-                {# IconA11y Semantic - syntax updated #}
                 <i aria-hidden="true" class="fa fa-search"></i>
                 <span class="sr-only">Search</span>
               </span>
diff --git a/src/themes/OLH/templates/core/nav.html b/src/themes/OLH/templates/core/nav.html
index 86924a1976..1003a2eb70 100644
--- a/src/themes/OLH/templates/core/nav.html
+++ b/src/themes/OLH/templates/core/nav.html
@@ -43,7 +43,6 @@
         {% if request.journal.nav_start and not journal_settings.general.disable_journal_submission  %}
             <li>
                 <a href="{% url 'submission_start' %}" class="button">
-                    {# IconA11y Decorative - syntax updated #}
                     <i aria-hidden="true" class="fa fa-cloud-upload"></i> {% trans 'Start Submission' %}
                 </a>
             </li>
@@ -51,7 +50,6 @@
         {% if request.journal.nav_review %}
             <li>
                 <a href="{% url 'become_reviewer' %}" class="button">
-                    {# IconA11y Decorative - syntax updated #}
                     <i aria-hidden="true" class="fa fa-trophy"></i> 
                     {% trans 'Become a Reviewer' %}
                 </a>
diff --git a/src/themes/OLH/templates/core/news/item.html b/src/themes/OLH/templates/core/news/item.html
index aca8de2d8f..7d70cd2698 100644
--- a/src/themes/OLH/templates/core/news/item.html
+++ b/src/themes/OLH/templates/core/news/item.html
@@ -38,7 +38,6 @@ <h6>{{ news_item.byline }} on {{ news_item.posted|date:"Y-m-d" }}</h6>
                     {{ news_item.body|safe }}
                 </div>
                 <div class="large-3 columns">
-                    {# IconA11y Decorative - syntax updated #}
                     <h7>{% trans 'Tags ' %}<i aria-hidden="true" class="fa fa-tags">&nbsp;</i></h7>
                      <p>{% for tag in news_item.tags.all %}<a href="{% url 'core_news_list_tag' tag.text %}" class="button success tiny">{{ tag.text }}</a>{% if not forloop.last %}&nbsp;{% endif %}{% endfor %}</p>
                 </div>
diff --git a/src/themes/OLH/templates/elements/journal/box_article.html b/src/themes/OLH/templates/elements/journal/box_article.html
index d34a57efcd..7286c03590 100644
--- a/src/themes/OLH/templates/elements/journal/box_article.html
+++ b/src/themes/OLH/templates/elements/journal/box_article.html
@@ -19,11 +19,9 @@
         {% endif %}
     <div class="{% if not journal_settings.article.disable_article_thumbnails %}large-10{% endif %} columns end">
         {% if article.pinned %}
-            {# IconA11y Semantic - syntax updated #}
             <i aria-hidden="true" class="float-right fa fa-thumb-tack"></i>
             <span class="sr-only">Pinned</span>
         {% endif %}
-            {# IconA11y Semantic - syntax updated #}
             <h2>{{ article.title|safe }}
                 {% if article.is_remote %}
                     &nbsp;<i aria-hidden="true" class="fa fa-external-link small-icon-text"></i>
@@ -33,19 +31,15 @@ <h2>{{ article.title|safe }}
            {% include "elements/journal/authors_block.html" %}
             <p>
                 <span class="date">
-                    {# IconA11y Decorative - updated from Semantic via time tag #}
                     <i aria-hidden="true" class="fa fa-calendar"></i>
                     <time datetime='{{ article.date_published|date:"Y-m-d" }}'>{{ article.date_published|date:"Y-m-d" }}</time>
                 </span> 
-                {# IconA11y Decorative - syntax updated #}
                 <i aria-hidden="true" class="fa fa-book"></i> {% if article.issue.issue_type.code == 'issue' %}{{ article.issue_title }}{% else %}{{ article.issue.issue_title }}{% endif %}</p>
             {% if article.issues.count > 1 %}
-            {# IconA11y Decorative - syntax updated #}
               <p><strong><i aria-hidden="true" class="fa fa-info-circle"></i> {% trans 'Also a part of:'%}</strong></p>
               {% for other in article.issues.all %}
               {% if other != article.issue %}
               <p>
-                {# IconA11y Decorative - syntax updated #}
                 <i aria-hidden="true" class="fa fa-book"></i>
                 <a class="issue-link" href="{{ other.url }}">
                     {{other.issue_type.pretty_name}}: {{ other.display_title }}
diff --git a/src/themes/OLH/templates/elements/journal/editorial_social_content.html b/src/themes/OLH/templates/elements/journal/editorial_social_content.html
index bc23e710ea..91ad1cda49 100644
--- a/src/themes/OLH/templates/elements/journal/editorial_social_content.html
+++ b/src/themes/OLH/templates/elements/journal/editorial_social_content.html
@@ -4,7 +4,6 @@
         <a href="{{ user.website }}" 
             aria-label="{{ member.user.full_name }}'s website" 
             >
-            {# IconA11y Decorative - syntax updated #}
             <i aria-hidden="true"  class="fa fa-globe"></i> 
             {% trans 'Website' %}
         </a>
@@ -14,7 +13,6 @@
         <a href="https://www.twitter.com/{{ user.twitter }}" 
             aria-label="{{ member.user.full_name }}'s twitter profile"
             >
-            {# IconA11y Decorative - syntax updated #}
             <i aria-hidden="true"  class="fa fa-twitter-square"></i> 
             {% trans 'Twitter' %}
         </a>
@@ -24,7 +22,6 @@
         <a href="https://www.facebook.com/{{ user.facebook }}" 
             aria-label="{{ member.user.full_name }}'s facebook profile"
             >
-            {# IconA11y Decorative - syntax updated #}
             <i aria-hidden="true"  class="fa fa-facebook-square"></i> 
             {% trans 'Facebook' %}
         </a>
@@ -34,7 +31,6 @@
         <a href="https://www.github.com/{{ user.github}}" 
             aria-label="{{ member.user.full_name }}'s github profile"
             >
-            {# IconA11y Decorative - syntax updated #}
             <i aria-hidden="true"  class="fa fa-github-square"></i> 
             {% trans 'Github' %}
         </a>
@@ -44,7 +40,6 @@
         <a href="https://www.linkedin.com/in/{{ user.linkedin }}" 
             aria-label="{{ member.user.full_name }}'s linkedin profile"
             >
-            {# IconA11y Decorative - syntax updated #}
             <i aria-hidden="true" class="fa fa-linkedin-square"></i> 
             {% trans 'Linkedin' %}
         </a>
diff --git a/src/themes/OLH/templates/elements/journal/issue_sidebar.html b/src/themes/OLH/templates/elements/journal/issue_sidebar.html
index 4d32b90eef..20b9ea446e 100644
--- a/src/themes/OLH/templates/elements/journal/issue_sidebar.html
+++ b/src/themes/OLH/templates/elements/journal/issue_sidebar.html
@@ -7,7 +7,6 @@
             <h3>{% trans 'Downloads' %}</h3>
             <p>
                 <a href="{% url 'journal_issue_download_galley' issue.pk issue.galley.pk %}">
-                    {# IconA11y Decorative - syntax updated #}
                     <i aria-hidden="true"  class="fa fa-download">&nbsp</i>
                     {% trans "Download Issue" %} (PDF)
                 </a>
diff --git a/src/themes/OLH/templates/elements/journal/preprint_article_listing.html b/src/themes/OLH/templates/elements/journal/preprint_article_listing.html
index d5b9c61e4d..77ca7ff7c1 100644
--- a/src/themes/OLH/templates/elements/journal/preprint_article_listing.html
+++ b/src/themes/OLH/templates/elements/journal/preprint_article_listing.html
@@ -5,7 +5,6 @@
                  data-equalizer-watch>
                 <p><small><a href="{% url 'repository_preprint' preprint.pk %}">{{ preprint.title|safe }}</a></small></p>
                 <p><small><i>{% for author in preprint.authors.all %}{{ author.full_name }}{% if not forloop.last %}, {% endif %}{% endfor %}</i></small></p>
-                {# IconA11y Decorative - updated from Semantic via time tag #}
                 <p><small>
                     <i aria-hidden="true" class="fa fa-calendar">&nbsp;</i>
                     <time datetime='{{ preprint.date_published|date:"Y-m-d" }}'>{{ preprint.date_published|date:"Y-m-d" }}</time>
diff --git a/src/themes/OLH/templates/elements/public_reviews.html b/src/themes/OLH/templates/elements/public_reviews.html
index de9de4d65c..772bc798e3 100644
--- a/src/themes/OLH/templates/elements/public_reviews.html
+++ b/src/themes/OLH/templates/elements/public_reviews.html
@@ -4,7 +4,6 @@
              data-animation-out="slide-out-down">
             <div class="card">
                 <div class="card-divider">
-                    {# IconA11y Decorative - syntax updated #}
                     <h4><i aria-hidden="true" class="fa fa-pencil">&nbsp;</i>Open peer review from {{ review.reviewer.full_name }}
                     </h4>
                 </div>
diff --git a/src/themes/OLH/templates/elements/section_block.html b/src/themes/OLH/templates/elements/section_block.html
index 8dc017549b..e0947e1555 100644
--- a/src/themes/OLH/templates/elements/section_block.html
+++ b/src/themes/OLH/templates/elements/section_block.html
@@ -24,11 +24,9 @@ <h3>{% trans 'Sections' %}</h3>
             <td>
                 <strong>
                     {% if section.public_submissions %}
-                        {# IconA11y Semantic - syntax updated #}
                         <i aria-hidden="true" class="fa fa-check" title="{% trans 'yes' %}"></i>
                         <span class="sr-only">{% trans 'yes' %}</span>
                     {% else %}
-                        {# IconA11y Semantic - syntax updated #}
                         <i aria-hidden="true" class="fa fa-times" title="{% trans 'no' %}"></i>
                         <span class="sr-only">{% trans 'no' %}</span>
                     {% endif %}
@@ -37,11 +35,9 @@ <h3>{% trans 'Sections' %}</h3>
             <td>
                 <strong>
                     {% if section.number_of_reviewers > 0 %}
-                        {# IconA11y Semantic - syntax updated #}
                         <i aria-hidden="true" class="fa fa-check" title="{% trans 'yes' %}"></i>
                         <span class="sr-only">{% trans 'yes' %}</span>
                     {% else %}
-                        {# IconA11y Semantic - syntax updated #}
                         <i aria-hidden="true" class="fa fa-times" title="{% trans 'no' %}"></i>
                         <span class="sr-only">{% trans 'no' %}</span>
                     {% endif %}
@@ -50,11 +46,9 @@ <h3>{% trans 'Sections' %}</h3>
             <td>
                 <strong>
                     {% if section.indexing %}
-                        {# IconA11y Semantic - syntax updated #}
                         <i aria-hidden="true" class="fa fa-check" title="{% trans 'yes' %}"></i>
                         <span class="sr-only">{% trans 'yes' %}</span>
                     {% else %}
-                        {# IconA11y Semantic - syntax updated #}
                         <i aria-hidden="true" class="fa fa-times" title="{% trans 'no' %}"></i>
                         <span class="sr-only">{% trans 'no' %}</span>
                     {% endif %}
diff --git a/src/themes/OLH/templates/elements/submit/author.html b/src/themes/OLH/templates/elements/submit/author.html
index 039c99f403..3eb725e6f7 100644
--- a/src/themes/OLH/templates/elements/submit/author.html
+++ b/src/themes/OLH/templates/elements/submit/author.html
@@ -5,7 +5,6 @@
      data-animation-out="slide-out-down">
     <div class="card">
         <div class="card-divider">
-            {# IconA11y Decorative - syntax updated #}
             <h4><i aria-hidden="true"  class="fa fa-user">&nbsp;</i>{% trans "Add New Author" %}</h4>
         </div>
         <div class="card-section">
@@ -61,7 +60,6 @@ <h4><i aria-hidden="true"  class="fa fa-user">&nbsp;</i>{% trans "Add New Author
                     </div>
                 </div>
 
-                {# IconA11y Decorative - syntax updated #}
                 <button class="success button pull-right" type="submit" name="add_author"><i aria-hidden="true" class="fa fa-user">
                     &nbsp;</i>{% trans "Add Author" %}
                 </button>
diff --git a/src/themes/OLH/templates/journal/article.html b/src/themes/OLH/templates/journal/article.html
index 0d4ef70b0e..9cc1539c7d 100644
--- a/src/themes/OLH/templates/journal/article.html
+++ b/src/themes/OLH/templates/journal/article.html
@@ -33,7 +33,6 @@ <h2>{{ article.title|safe }}</h2>
                             {% if author.orcid %}<a href="https://orcid.org/{{ author.orcid }}" class=""><img src="https://orcid.org/sites/default/files/images/orcid_16x16.png" alt="orcid logo"></a>{% endif %}
                             {% if author.institution and author.institution != " " %} ({{ author.institution }}){% endif %}
                         {% if author.display_email and not journal_settings.article.hide_author_email_links %}
-                            {# IconA11y Semantic - syntax update #}
                             <a itemprop="email" href="mailto:{{ author.email }}" aria-label="Email author" class="fa fa-envelope email-link"></a>
                         {% endif %}
                         {% if not forloop.last %}, {% endif %}
@@ -83,7 +82,6 @@ <h3>{{ article.title|safe }}</h3>
                                             <span itemprop="worksFor" itemscope
                                                   itemtype="http://schema.org/CollegeOrUniversity"><span
                                                     itemprop="name">({{ author.institution }})</span></span>{% endif %}
-                                            {# IconA11y Semantic - syntax updated #}
                                             {% if author.display_email and not journal_settings.article.hide_author_email_links %}
                                                 <a itemprop="email" href="mailto:{{ author.email }}"
                                                     class="fa fa-envelope email-link"
@@ -123,11 +121,9 @@ <h3>{{ article.title|safe }}</h3>
                                 data-responsive-menu="drilldown medium-dropdown">
                               {% with article.get_doi_url as doi_url %}
                                 <li>{% trans "Share" %}:</li>
-                                {# IconA11y Semantic - syntax updated #}
                                 <li><a href="https://www.facebook.com/share.php?p[url]={% if doi_url %}{{ doi_url }}{% else %}{{ article.url }}{% endif %}" target="_blank" aria-label="{% trans 'Share on Facebook' %}"><i aria-hidden="true" class="fa fa-facebook"></i></a></li>
                                 <li><a class= "twitter-x"
                                     href="https://twitter.com/intent/tweet?text={{ article.title }} {% if doi_url %}{{ doi_url }}{% else %}{{ article.url }}{% endif %}" target="_blank" aria-label="{% trans 'Share on X' %}"><span aria-hidden="true">&#120143;</span></a></li>
-                                {# IconA11y Semantic - syntax updated #}
                                 <li><a href="https://www.linkedin.com/sharing/share-offsite?url={% if doi_url %}{{ doi_url }}{% else %}{{ article.url }}{% endif %}" target="_blank" aria-label="{% trans 'Share on LinkedIn' %}"><i aria-hidden="true" class="fa fa-linkedin"></i></a></li>
                               {% endwith %}
                             </ul>
@@ -141,7 +137,6 @@ <h3>{{ article.title|safe }}</h3>
                                         <a href="{{ article.local_url }}print/" 
                                             aria-label="{% trans 'print article' %}"
                                             >
-                                            {# IconA11y Semantic - updated syntax #}
                                             <i aria-hidden="true" class="fa fa-print">&nbsp;</i>
                                         </a>
                                     </li>
@@ -152,7 +147,6 @@ <h3>{{ article.title|safe }}</h3>
                                             <a href="mailto:{{ article.correspondence_author.email }}"
                                                 aria-label="email author"
                                             >
-                                                {# IconA11y Semantic - updated via aria-label in a tag #}
                                                 <i aria-hidden="true" class="fa fa-envelope"></i>
                                             </a>
                                         </li>
@@ -160,7 +154,6 @@ <h3>{{ article.title|safe }}</h3>
                                     <li><a href="#" id="dyslexia-mode" aria-label="{% trans 'Dyslexia mode' %}">{% trans "Dyslexia" %}</a></li>
                                     <li>
                                         <a href="#" aria-label="{% trans 'Cite article' %}">
-                                            {# IconA11y Semantic - syntax updated #}
                                             <i aria-hidden="true" class="fa fa-comments">&nbsp;</i>
                                         </a>
                                         <ul class="menu vertical">
@@ -199,7 +192,6 @@ <h1>{{ article.title|safe }}</h1>
                             {% if author.orcid %}<a href="https://orcid.org/{{ author.orcid }}" class=""><img src="https://orcid.org/sites/default/files/images/orcid_16x16.png" alt="orcid logo"></a>{% endif %}
                             {% if author.institution and author.institution != " " %} ({{ author.institution }}){% endif %}
                             {% if author.display_email and not journal_settings.article.hide_author_email_links %}
-                                {# IconA11y Semantic - syntax updated #}
                                 <a itemprop="email" 
                                     href="mailto:{{ author.email }}" 
                                     aria-label="Email author"
@@ -258,7 +250,6 @@ <h2>{% trans "Publisher Notes" %}</h2>
                                         </p>
                                         {% if proofing %}
                                             <p id="note_to_proofreader_1">
-                                                {# IconA11y Decorative - syntax updated #}
                                                 <i aria-hidden="true" class="fa fa-info"></i>
                                                 Note to proofreader: Download links on this page begin to work when the article is published.
                                             </p>
@@ -361,7 +352,6 @@ <h4>{% trans "Authors" %}</h4>
                                                 </a>
                                                 {% endif %}
                                                 {% if author.display_email and not journal_settings.article.hide_author_email_links %}
-                                                    {# IconA11y Semantic - syntax updated #}
                                                     <a itemprop="email" 
                                                         href="mailto:{{ author.email }}" 
                                                         class="fa fa-envelope email-link"
@@ -394,7 +384,6 @@ <h3>{% trans "Downloads" %}</h3>
                                         </ul>
                                         {% if proofing %}
                                             <p id="note_to_proofreader_2">
-                                                {# IconA11y Decorative - syntax updated #}
                                                 <i aria-hidden="true"  class="fa fa-info"></i>
                                                 Note to proofreader: Download links on this page begin to work when the article is published.
                                             </p>
diff --git a/src/themes/OLH/templates/journal/print.html b/src/themes/OLH/templates/journal/print.html
index 157bda8d5b..2b0c959248 100644
--- a/src/themes/OLH/templates/journal/print.html
+++ b/src/themes/OLH/templates/journal/print.html
@@ -23,7 +23,6 @@ <h3>{{ article.title|safe }}</h3>
             <span itemprop="worksFor" itemscope
                   itemtype="http://schema.org/CollegeOrUniversity"><span
                     itemprop="name">({{ author.institution }})</span></span>{% endif %}
-            {# IconA11y Semantic - syntax updated #}
             <a itemprop="email" href="mailto:{{ author.email }}"
                class="fa fa-envelope email-link"
                aria-label="Email author."></a></span></span>
diff --git a/src/themes/OLH/templates/press/core/news/item.html b/src/themes/OLH/templates/press/core/news/item.html
index 329e1f2d36..e6c8e440b3 100644
--- a/src/themes/OLH/templates/press/core/news/item.html
+++ b/src/themes/OLH/templates/press/core/news/item.html
@@ -38,7 +38,6 @@ <h6>{% trans "Posted by" %} {{ news_item.posted_by.full_name }} {% trans "on" %}
                     {{ news_item.body|safe }}
                 </div>
                 <div class="large-3 columns">
-                    {# IconA11y Decorative - syntax updated #}
                     <h7>{% trans "Tags" %} <i aria-hidden="true"  class="fa fa-tags">&nbsp;</i></h7>
                      <p>{% for tag in news_item.tags.all %}<a href="{% url 'core_news_list_tag' tag.text %}" class="button success tiny">{{ tag.text }}</a>{% if not forloop.last %}&nbsp;{% endif %}{% endfor %}</p>
                 </div>
diff --git a/src/themes/OLH/templates/repository/elements/preprint_home_listing.html b/src/themes/OLH/templates/repository/elements/preprint_home_listing.html
index c7b0836717..ece23e5208 100644
--- a/src/themes/OLH/templates/repository/elements/preprint_home_listing.html
+++ b/src/themes/OLH/templates/repository/elements/preprint_home_listing.html
@@ -5,7 +5,6 @@
                  data-equalizer-watch>
                 <p><small><a href="{% url 'repository_preprint' preprint.pk %}">{{ preprint.title|safe }}</a></small></p>
                 <p><small>{{ preprint.display_authors_compact }}</small></p>
-                {# IconA11y Decorative - updated from Semantic using time tag #}
                 <p><small><i aria-hidden="true" class="fa fa-calendar">&nbsp;</i>
                     <time datetime="{{ preprint.date_published|date:"Y-m-d" }}">{{ preprint.date_published|date:"Y-m-d" }}</time>
                 </small></p>
diff --git a/src/themes/OLH/templates/repository/home.html b/src/themes/OLH/templates/repository/home.html
index ca4a27eb52..893201f58c 100644
--- a/src/themes/OLH/templates/repository/home.html
+++ b/src/themes/OLH/templates/repository/home.html
@@ -19,7 +19,6 @@ <h1 class="text-center">{{ request.repository.name }}</h1>
                     <form method="POST" action="{% url 'repository_search' %}">
                         {% csrf_token %}
                         <div class="input-group">
-                            {# IconA11y Semantic - syntax updated #}
                             <span class="input-group-label">
                                 <i aria-hidden=true class="fa fa-search"></i>
                                 <span class="sr-only">Search</span>
diff --git a/src/themes/OLH/templates/repository/list.html b/src/themes/OLH/templates/repository/list.html
index ebc58b7a09..e58390df7e 100644
--- a/src/themes/OLH/templates/repository/list.html
+++ b/src/themes/OLH/templates/repository/list.html
@@ -34,10 +34,8 @@ <h1>{{ request.repository.object_name_plural }}</h1>
                                 <h2>{{ preprint.title|safe }}</h2>
                                 <p>{{ preprint.display_authors_compact }}</p>
                                 <p><span class="date">
-                                    {# IconA11y Decorative - updated from Semantic with time tag #}
                                     <i aria-hidden="true" class="fa fa-calendar"></i>
                                     <time datetime="{{ preprint.date_published|date:"Y-m-d" }}">{{ preprint.date_published|date:"Y-m-d" }}</time>&nbsp;&nbsp;
-                                    {# IconA11y Decorative - syntax updated #}
                                     <i aria-hidden="true" class="fa fa-paperclip"></i> {% include "common/repository/subject_display.html" %}</span></p>
                                 <p>{{ preprint.abstract|striptags|truncatesmart:400 }}</p>
                             </div>
@@ -67,7 +65,6 @@ <h2>{{ preprint.title|safe }}</h2>
                         <form method="POST" action="{% url 'repository_search' %}">
                             {% csrf_token %}
                             <div class="input-group">
-                                {# IconA11y Semantic - syntax updated #}
                                 <span class="input-group-label">
                                     <i aria-hidden="true" class="fa fa-search"></i>
                                     <span class="sr-only">Search</span>
diff --git a/src/themes/OLH/templates/repository/preprint.html b/src/themes/OLH/templates/repository/preprint.html
index 60e7d00d6f..31f433abd6 100644
--- a/src/themes/OLH/templates/repository/preprint.html
+++ b/src/themes/OLH/templates/repository/preprint.html
@@ -113,7 +113,6 @@ <h2>{% trans 'Comments' %}</h2>
                     {% if preprint.current_version.file %}
                         <h2>{% trans "Downloads" %}</h2>
                         <p>
-                            {# IconA11y Decorative - syntax updated #}
                             <a href="{% url 'repository_file_download' preprint.id preprint.current_version.file.id %}">
                                 <i aria-hidden="true"  class="fa fa-download"></i>
                                 Download {{ request.repository.object_name }}
@@ -139,7 +138,6 @@ <h2>{% trans "Metadata" %}</h2>
                     <h2>{% trans "Versions" %}</h2>
                     <ul>
                         {% for version in preprint.preprintversion_set.all %}
-                            {# IconA11y Semantic - updated with aria-label in a tag #}
                             <li><a href="{% url 'repository_file_download' preprint.id version.file.id %}" 
                                 aria-label="Downlaod Version {{ version.version }} - {{ version.date_time|date:"Y-m-d" }}"
                                 >
@@ -159,7 +157,6 @@ <h2>{% trans "Metrics" %}</h2>
                       </ul>
                     {% endif %}
 
-                    {# IconA11y Decorative - syntax updated #}
                     <a href="{% url 'repository_list' %}"><i aria-hidden="true"  class="fa fa-arrow-left"></i> {% trans "All Preprints" %}</a>
 
                 </small>
diff --git a/src/themes/clean/templates/core/homepage_elements/search_bar.html b/src/themes/clean/templates/core/homepage_elements/search_bar.html
index 2559732e26..333a71627d 100644
--- a/src/themes/clean/templates/core/homepage_elements/search_bar.html
+++ b/src/themes/clean/templates/core/homepage_elements/search_bar.html
@@ -14,7 +14,6 @@
             <input id="abstract" name="abstract" type="hidden" value="on">
             <div class="input-group-prepend">
                 <div class="input-group-text">
-                  {# IconA11y Decorative - syntax updated #}
                   <i aria-hidden="true" class="fa fa-search"></i>
                 </div>
             </div>
diff --git a/src/themes/clean/templates/core/news/item.html b/src/themes/clean/templates/core/news/item.html
index 6f7d1e582c..1ee715c4e6 100644
--- a/src/themes/clean/templates/core/news/item.html
+++ b/src/themes/clean/templates/core/news/item.html
@@ -17,7 +17,6 @@ <h1>{{ news_item.title|safe }}</h1>
             <h6>{{ news_item.byline }} on {{ news_item.posted|date:"Y-m-d" }}</h6>
             <p>{{ news_item.body|safe }}</p>
             <br />
-            {# IconA11y Decorative - syntax updated #}
             <h7>{% trans 'Tags ' %}<i aria-hidden="true" class="fa fa-tags">&nbsp;</i></h7>
             <p>{% for tag in news_item.tags.all %}<a href="{% url 'core_news_list_tag' tag.text %}">{{ tag.text }}</a>{% if not forloop.last %}, {% endif %}{% endfor %}</p>
             <a href="{% url 'core_news_list' %}">{% trans "Back to" %} {{ journal_settings.news.news_title }} {% trans "List" %}</a>
diff --git a/src/themes/clean/templates/elements/article_listing.html b/src/themes/clean/templates/elements/article_listing.html
index b63f4449f3..9af536cdcd 100644
--- a/src/themes/clean/templates/elements/article_listing.html
+++ b/src/themes/clean/templates/elements/article_listing.html
@@ -21,7 +21,6 @@
             <div class="col article-block">
                 <a href="{% if article.is_remote %}{{ article.remote_url }}{% else %}{{ article.url }}{% endif %}">
                     {% if article.is_remote %}
-                    {# IconA11y Semantic - updated to include screen reader only text #}
                     <h2 class="card-title article-title">
                         <span class="sr-only">Externally hosted article: </span>
                         {{ article.title|safe }}
@@ -37,12 +36,10 @@ <h2 class="card-title article-title">{{ article.title|safe }}</h2>
                     {% endif %}{% endif %}{{ author.full_name }}{% if not forloop.last %}{% if not forloop.counter == article.frozen_authors.all|length|add:-1 %}, {% endif %}{% endif %}{% endfor %}
                 </p>
                 <p class="card-text">
-                    {# IconA11y Decorative - changed from Semantic by using the HTML time tag #}
                     <span class="date"><i class="fa fa-calendar" aria-hidden-"true"></i>
                         <time datetime="{{ article.date_published|date:"Y-m-d" }}">{{ article.date_published|date:"Y-m-d" }} </time>
                     </span>
                     {% if article.issue %}
-                    {# IconA11y Decorative - syntax updated #}
                     <i aria-hidden="true" class="fa fa-book"></i>
                     <a href="{{ article.issue.url }}">
                         {{ article.issue_title }}
@@ -50,12 +47,10 @@ <h2 class="card-title article-title">{{ article.title|safe }}</h2>
                     {% endif %}
                 </p>
                  {% if article.issues.count > 1 %}
-                  {# IconA11y Decorative - syntax updated #}
                   <p><strong><i aria-hidden="true" class="fa fa-info-circle"></i> {% trans 'Also a part of:'%}</strong></p>
                   {% for other in article.issues.all %}
                   {% if other != article.issue %}
                   <p>
-                    {# IconA11y Decorative - syntax updated #}
                     <i aria-hidden="true" class="fa fa-book"></i>
                     <a class="issue-link" href="{{ other.url }}">
                         {{other.issue_type.pretty_name}}: {{ other.display_title }}
diff --git a/src/themes/clean/templates/elements/journal/editorial_social_content.html b/src/themes/clean/templates/elements/journal/editorial_social_content.html
index cfa4576150..cc2b1b23ee 100644
--- a/src/themes/clean/templates/elements/journal/editorial_social_content.html
+++ b/src/themes/clean/templates/elements/journal/editorial_social_content.html
@@ -4,7 +4,6 @@
         <a href="{{ user.website }}" 
             aria-label="{{ member.user.full_name }}'s website" 
             >
-            {# IconA11y Decorative - syntax updated #}
             <i aria-hidden="true" class="fa fa-globe"></i> 
             {% trans 'Website' %}
         </a>
@@ -14,7 +13,6 @@
         <a href="https://www.twitter.com/{{ user.twitter }}" 
             aria-label="{{ member.user.full_name }}'s twitter profile"
             >
-            {# IconA11y Decorative - syntax updated #}
             <i aria-hidden="true" class="fa fa-twitter-square"></i> 
             {% trans 'Twitter' %}
         </a>
@@ -24,7 +22,6 @@
         <a href="https://www.facebook.com/{{ user.facebook }}" 
             aria-label="{{ member.user.full_name }}'s facebook profile"
             >
-            {# IconA11y Decorative - syntax updated #}
             <i aria-hidden="true" class="fa fa-facebook-square"></i> 
             {% trans 'Facebook' %}
         </a>
@@ -34,7 +31,6 @@
         <a href="https://www.github.com/{{ user.github}}" 
             aria-label="{{ member.user.full_name }}'s github profile"
             >
-            {# IconA11y Decorative - syntax updated #}
             <i aria-hidden="true" class="fa fa-github-square"></i> 
             {% trans 'Github' %}
         </a>
@@ -44,7 +40,6 @@
         <a href="https://www.linkedin.com/in/{{ user.linkedin }}" 
             aria-label="{{ member.user.full_name }}'s linkedin profile"
             >
-            {# IconA11y Decorative - syntax updated  #}
             <i aria-hidden="true" class="fa fa-linkedin-square"></i> 
             {% trans 'Linkedin' %}
         </a>
diff --git a/src/themes/clean/templates/elements/journal/issue_sidebar.html b/src/themes/clean/templates/elements/journal/issue_sidebar.html
index daf732fc49..88df385b20 100644
--- a/src/themes/clean/templates/elements/journal/issue_sidebar.html
+++ b/src/themes/clean/templates/elements/journal/issue_sidebar.html
@@ -6,7 +6,6 @@
             <h3>{% trans 'Downloads' %}</h3>
             <p>
                 <a href="{% url 'journal_issue_download_galley' issue.pk issue.galley.pk %}">
-                    {# IconA11y Decorative - syntax updated #}
                     <i aria-hidden="true" class="fa fa-download"></i>&nbsp
                     {% trans 'Download Issue' %} (PDF)
                 </a>
diff --git a/src/themes/clean/templates/elements/preprint_block.html b/src/themes/clean/templates/elements/preprint_block.html
index 531e5b10fd..a66be49b19 100644
--- a/src/themes/clean/templates/elements/preprint_block.html
+++ b/src/themes/clean/templates/elements/preprint_block.html
@@ -13,7 +13,6 @@
                             {% endif %}{% endfor %}</i></small>
                     </p>
                     <p>
-                        {# IconA11y Decorative - updated to decorative with an HTML time tag #}
                         <small><i class="fa fa-calendar">&nbsp;</i>
                             <time datetime="{{ preprint.date_published|date:"Y-m-d" }}">
                                 {{ preprint.date_published|date:"Y-m-d" }}
diff --git a/src/themes/clean/templates/elements/public_reviews.html b/src/themes/clean/templates/elements/public_reviews.html
index 209e194317..ec68377fc8 100644
--- a/src/themes/clean/templates/elements/public_reviews.html
+++ b/src/themes/clean/templates/elements/public_reviews.html
@@ -4,7 +4,6 @@
         <div class="modal-dialog modal-lg" role="document">
             <div class="modal-content">
                 <div class="modal-header">
-                    {# IconA11y Decorative - syntax updated #}
                     <h5 class="modal-title"><i aria-hidden="true" class="fa fa-pencil">&nbsp;</i>Open peer review
                         from {{ review.reviewer.full_name }}</h5>
                     <button type="button" class="close" data-dismiss="modal" aria-label="Close">
diff --git a/src/themes/clean/templates/elements/sections_block.html b/src/themes/clean/templates/elements/sections_block.html
index ad179e777a..ddb3e8b483 100644
--- a/src/themes/clean/templates/elements/sections_block.html
+++ b/src/themes/clean/templates/elements/sections_block.html
@@ -16,27 +16,21 @@ <h2>{% trans 'Sections' %}</h2>
             <td>{{ section.name }}</td>
             
             <td>{% if section.public_submissions %}
-                    {# IconA11y Decorative - syntax updated #}
                     <i aria-hidden="true" class="fa fa-check"></i> {% trans 'Yes' %}
                 {% else %}
-                    {# IconA11y Decorative - syntax updated #}
                     <i aria-hidden="true"  class="fa fa-times"></i> {% trans 'No' %}
                 {% endif %}
             </td>
             <td>{% if section.number_of_reviewers > 0 %}
-                    {# IconA11y Decorative - syntax updated #}
                     <i aria-hidden="true"  class="fa fa-check"></i> {% trans 'Yes' %}
                 {% else %}
-                    {# IconA11y Decorative - syntax updated #}
                     <i aria-hidden="true"  class="fa fa-times"></i> {% trans 'No' %}
                 {% endif %}
             </td>
             
             <td>{% if section.indexing %}
-                    {# IconA11y Decorative - syntax updated #}
                     <i aria-hidden="true"  class="fa fa-check"></i> {% trans 'Yes' %}
                 {% else %}
-                    {# IconA11y Decorative - syntax updated #}
                     <i aria-hidden="true"  class="fa fa-times"></i> {% trans 'No' %}
                 {% endif %}
             </td>
diff --git a/src/themes/clean/templates/journal/article.html b/src/themes/clean/templates/journal/article.html
index 8c6a466220..3f6d86ea86 100644
--- a/src/themes/clean/templates/journal/article.html
+++ b/src/themes/clean/templates/journal/article.html
@@ -60,7 +60,6 @@ <h1 class="card-title align-text-bottom article-title">{{ article.title|safe }}<
                                         <a itemprop="email" href="mailto:{{ author.email }}"
                                            class="fa fa-envelope email-link"
                                            > 
-                                           {# IconA11y Semantic - but has adjacent text - text improved to make this decorative #}
                                            {% trans 'Contact by email' %}
                                         </a>
                                     {% endif %}
@@ -118,7 +117,6 @@ <h2>{% trans "Abstract" %}</h2>
                                 {% endfor %}
                                 {% if proofing %}
                                     <p id="note_to_proofreader_1">
-                                        {# IconA11y Decorative - syntax updated #}
                                         <i aria-hidden="true" class="fa fa-info"></i>
                                         Note to proofreader: Download links on this page begin to work when the article is published.
                                     </p>
@@ -182,19 +180,16 @@ <h2>{% trans "Share" %}</h2>
                         <a class="waves-effect waves-light btn btn-small social-share-btn facebook-bg"
                             href="https://www.facebook.com/share.php?p[url]={% if doi_url %}{{ doi_url }}{% else %}{{ article.url }}{% endif %}" 
                             target="_blank" aria-label="{% trans 'Share on Facebook' %}">
-                            {# IconA11y Decorative - works on voiceover #}
                             <i aria-hidden="true" class="fa fa-facebook"></i>
                         </a>
                         <a class="waves-effect waves-light btn btn-small social-share-btn twitter-x" 
                             href="https://twitter.com/intent/tweet?text={{ article.title }} {% if doi_url %}{{ doi_url }}{% else %}{{ article.url }}{% endif %}"
                             target="_blank" aria-label="{% trans 'Share on X' %}">
-                            {# IconA11y Decorative - works on voiceover #}
                             <span aria-hidden="true">&#120143;</span>
                         </a> 
                         <a class="waves-effect waves-light btn btn-small social-share-btn linkedin-bg"
                             href="https://www.linkedin.com/sharing/share-offsite?url={% if doi_url %}{{ doi_url }}{% else %}{{ article.url }}{% endif %}"
                             target="_blank" aria-label="{% trans 'Share on LinkedIn' %}">
-                            {# IconA11y Decorative - works on voiceover #}
                             <i aria-hidden="true" class="fa fa-linkedin"></i>
                         </a>
                     {% endwith %}
@@ -216,7 +211,6 @@ <h2>{% trans "Downloads" %}</h2>
                         </ul>
                         {% if proofing %}
                             <p id="note_to_proofreader_2">
-                                {# IconA11y Decorative - syntax updated #}
                                 <i aria-hidden="true" class="fa fa-info"></i>
                                 Note to proofreader: Download links on this page begin to work when the article is published.
                             </p>
@@ -267,7 +261,6 @@ <h2>{% trans "Information" %}</h2>
                     <li>{% trans "Original ISSN" %}: {{ article.ISSN_override }}</li>
                     {% endif %}
                     {% if article.peer_reviewed %}
-                    {# IconA11y Decorative - changed from Semantic as this is hidden when not used #}
                         <li>{% trans "Peer Reviewed" %}
                             <i aria-hidden="true" class="fa fa-check-circle"></i>
                         </li>
diff --git a/src/themes/clean/templates/journal/homepage_elements/carousel.html b/src/themes/clean/templates/journal/homepage_elements/carousel.html
index 7286238edf..d65bba40d0 100644
--- a/src/themes/clean/templates/journal/homepage_elements/carousel.html
+++ b/src/themes/clean/templates/journal/homepage_elements/carousel.html
@@ -37,12 +37,10 @@ <h2><a href="{{ carousel_item.url }}">{{ carousel_item.carousel_title|truncatech
             </a>
               <div id="carousel-buttons">
                 <button id="carousel-play" type="button" class="btn btn-secondary btn-sm">
-                  {# IconA11y Semantic - updated syntax #}
                   <i aria-hidden="true" class="fa fa-play" ></i>
                   <span class="sr-only">{% trans 'Play' %}</span>
                </button>
                 <button id="carousel-pause" type="button" class="btn btn-secondary btn-sm">
-                  {# IconA11y Semantic - updated syntax #}
                   <i aria-hidden="true" class="fa fa-pause" ></i>
                   <span class="sr-only">{% trans 'Play' %}</span>
                 </button>
diff --git a/src/themes/clean/templates/journal/print.html b/src/themes/clean/templates/journal/print.html
index 4ebfa23f0c..a8e69d465b 100644
--- a/src/themes/clean/templates/journal/print.html
+++ b/src/themes/clean/templates/journal/print.html
@@ -28,7 +28,6 @@ <h3>{{ article.title|safe }}</h3>
                         <span itemprop="name">({{ author.institution }})</span>
                     </span>
                 {% endif %}
-                {# IconA11y Semantic - alternative added #}
                 <a itemprop="email" href="mailto:{{ author.email }}">
                     <i aria-hidden="true" class="fa fa-envelope email-link"></i>
                     <span class="sr-only">Email {{ author.full_name }} </span>
diff --git a/src/themes/clean/templates/press/core/news/item.html b/src/themes/clean/templates/press/core/news/item.html
index 4ae06f26b8..2894e594c1 100644
--- a/src/themes/clean/templates/press/core/news/item.html
+++ b/src/themes/clean/templates/press/core/news/item.html
@@ -13,7 +13,6 @@ <h1>{{ news_item.title }}</h1>
             <h6>Posted by {{ news_item.posted_by.full_name }} on {{ news_item.posted|date:"Y-m-d" }}</h6>
             <p>{{ news_item.body|safe }}</p>
             <br />
-            {# IconA11y Decorative - syntax updated #}
             <h7>{% trans 'Tags ' %}<i aria-hidden="true" class="fa fa-tags">&nbsp;</i></h7>
             <p>{% for tag in news_item.tags.all %}<a href="{% url 'core_news_list_tag' tag.text %}">{{ tag.text }}</a>{% if not forloop.last %}, {% endif %}{% endfor %}</p>
             <a href="{% url 'core_news_list' %}">{% trans 'Back to News List' %}</a>
diff --git a/src/themes/clean/templates/press/nav.html b/src/themes/clean/templates/press/nav.html
index b00e817a19..5b08729c1c 100644
--- a/src/themes/clean/templates/press/nav.html
+++ b/src/themes/clean/templates/press/nav.html
@@ -73,10 +73,8 @@
                     </div>
                 </li>
             {% else %}
-                {# IconA11y Decorative - syntax updated #}
                 <li class="nav-item"><a href="{% url 'core_login' %}" class="nav-link"><i aria-hidden="true" class="fa fa-sign-in">
                     &nbsp;</i>{% trans 'Login' %}</a></li>
-                {# IconA11y Decorative - syntax updated #}
                 <li class="nav-item"><a href="{% url 'core_register' %}" class="nav-link"><i aria-hidden="true" class="fa fa-user-plus">
                     &nbsp;</i>{% trans 'Register' %}</a></li>
             {% endif %}
diff --git a/src/themes/material/templates/core/nav.html b/src/themes/material/templates/core/nav.html
index d6004f3da2..f7e84503fc 100644
--- a/src/themes/material/templates/core/nav.html
+++ b/src/themes/material/templates/core/nav.html
@@ -61,7 +61,6 @@
             {% endfor %}
 
             {% if request.journal.nav_review %}
-                {# IconA11y Decorative - syntax updated #}
                 <li><a href="{% url 'become_reviewer' %}"><i aria-hidden="true" class="fa fa-trophy">&nbsp;</i>{% trans "Become a Reviewer" %}</a></li>
             {% endif %}
             {% hook 'nav_block' %}
diff --git a/src/themes/material/templates/core/news/item.html b/src/themes/material/templates/core/news/item.html
index e44977d386..31c8980803 100644
--- a/src/themes/material/templates/core/news/item.html
+++ b/src/themes/material/templates/core/news/item.html
@@ -33,7 +33,6 @@ <h6><em>{{ news_item.byline }} {% trans "on" %} {{ news_item.posted|date:"Y-m-d"
                     <p>{{ news_item.body|safe }}</p>
                     {% if news_item.tags.all %}
                         <br />
-                        {# IconA11y Decorative - syntax updated #}
                         <h7>{% trans "Tags" %} <i aria-hidden="true" class="fa fa-tags">&nbsp;</i></h7>
                         <p>{% for tag in news_item.tags.all %}
                             <a href="{% url 'core_news_list_tag' tag.text %}"
diff --git a/src/themes/material/templates/elements/article_listing.html b/src/themes/material/templates/elements/article_listing.html
index 0f9852e9bf..ec5aff95ad 100644
--- a/src/themes/material/templates/elements/article_listing.html
+++ b/src/themes/material/templates/elements/article_listing.html
@@ -27,25 +27,21 @@ <h5 class="article-title">{{ article.title|safe }}</h5>
             </p>
             <p>
                 <span class="date">
-                    {# IconA11y Decorative - changed from Semantic using time tag #}
                     <i aria-hidden="true" class="fa fa-calendar"></i>
                     <time datetime='{{ article.date_published|date:"Y-m-d}}'>{{ article.date_published|date:"Y-m-d" }}</time>
                 </span>
 
                 {% if article.issue %}
-                    {# IconA11y Decorative - syntax updated #}
                     <i aria-hidden="true" class="fa fa-book"></i>
                     <a class="issue-link" href="{{ article.issue.url }}">
                         {{ article.issue_title }}
                     </a>
                 {% endif %}
                 {% if article.issues.count > 1 %}
-                    {# IconA11y Decorative - syntax updated #}
                   <p><strong><i aria-hidden="true" class="fa fa-info-circle"></i> {% trans 'Also a part of:'%}</strong></p>
                   {% for other in article.issues.all %}
                   {% if other != article.issue %}
                   <p>
-                    {# IconA11y Decorative - syntax updated #}
                     <i aria-hidden="true" class="fa fa-book"></i>
                     <a class="issue-link" href="{{ other.url }}">
                         {{other.issue_type.pretty_name}}: {{ other.display_title }}
diff --git a/src/themes/material/templates/elements/journal/issue_list.html b/src/themes/material/templates/elements/journal/issue_list.html
index e9b530c430..7d73d363a0 100644
--- a/src/themes/material/templates/elements/journal/issue_list.html
+++ b/src/themes/material/templates/elements/journal/issue_list.html
@@ -30,7 +30,6 @@
                     <a href="{% url 'journal_issue' issue.id %}">{% trans "View Issue" %}</a>
                     {% if request.user and request.user.is_staff or user_is_editor %}
                         <a href="{% url 'manage_issues_id' issue.pk %}">
-                            {# IconA11y Semantic - syntax updated #}
                             <i aria-hidden="true" class="fa fa-edit">&nbsp;</i>
                             <span class="sr-only">Edit Issue</span>
                         </a>
diff --git a/src/themes/material/templates/elements/journal/issue_sidebar.html b/src/themes/material/templates/elements/journal/issue_sidebar.html
index f393e608b9..436ae3a99c 100644
--- a/src/themes/material/templates/elements/journal/issue_sidebar.html
+++ b/src/themes/material/templates/elements/journal/issue_sidebar.html
@@ -5,7 +5,6 @@
     <h3>{% trans 'Downloads' %}</h3>
     <ul>
         <li>
-            {# IconA11y Decorative - syntax updated #}
             <a href="{% url 'journal_issue_download_galley' issue.pk issue.galley.pk %}"><i aria-hidden="true" class="fa fa-download">&nbsp</i> {% trans "Download" %} {% if not collection %}{% trans "Issue" %}{% else %}{% with col=journal_settings.general.collection_name %}{% if col %}{{ col }}{% else %}{% with col=journal_settings.general.collection_name %}{% if col %}{{ col }}{% else %}{% trans "Collection" %}{% endif %}{% endwith %}{% endif %}{% endwith %}{% endif %} (PDF)</a>
         <li>
     </ul>
diff --git a/src/themes/material/templates/elements/license_block.html b/src/themes/material/templates/elements/license_block.html
index ff677c222d..ffe0c49420 100644
--- a/src/themes/material/templates/elements/license_block.html
+++ b/src/themes/material/templates/elements/license_block.html
@@ -3,7 +3,6 @@
         {% if license.available_for_submission %}
             <li class="collection-item"><strong>{{ license }} - 
                 <a href="{{ license.url }}" aria-label="External link to more information about this license.">{% trans "More Information " %}
-                    {# IconA11y Decorative - changed from Semantic through use of aria label in a tag #}
                     <i aria-hidden="true" class="fa fa-external-link">&nbsp;</i>
                 </a></strong>
                 <br/><span class="help-text">{{ license.text }}</span>
diff --git a/src/themes/material/templates/elements/preprint_block.html b/src/themes/material/templates/elements/preprint_block.html
index 6f0e4bb893..19dc9d0652 100644
--- a/src/themes/material/templates/elements/preprint_block.html
+++ b/src/themes/material/templates/elements/preprint_block.html
@@ -13,7 +13,6 @@
                             {% endif %}{% endfor %}</i></small>
                     </p>
                     <p>
-                        {# IconA11y Decorative - updated from Semantic using time tag #}
                         <small>
                             <i aria-hidden="true" class="fa fa-calendar">&nbsp;</i>
                             <time datetime='{{ preprint.date_published|date:"Y-m-d" }}'>{{ preprint.date_published|date:"Y-m-d" }}</time>                   
diff --git a/src/themes/material/templates/elements/public_reviews.html b/src/themes/material/templates/elements/public_reviews.html
index 11d04d7701..fd05faf544 100644
--- a/src/themes/material/templates/elements/public_reviews.html
+++ b/src/themes/material/templates/elements/public_reviews.html
@@ -2,7 +2,6 @@
     {% for review in article.public_reviews %}
         <div class="modal" id="reviewmodal-{{ review.pk }}">
         <div class="modal-content">
-            {# IconA11y Decorative - syntax updated #}
             <h4><i aria-hidden="true" class="fa fa-pencil">&nbsp;</i>Open peer review from {{ review.reviewer.full_name }}</h4>
             {% for answer in review.review_form_answers %}
                 {% if answer.author_can_see %}
diff --git a/src/themes/material/templates/journal/article.html b/src/themes/material/templates/journal/article.html
index 1c3cb32203..098b387362 100644
--- a/src/themes/material/templates/journal/article.html
+++ b/src/themes/material/templates/journal/article.html
@@ -160,14 +160,12 @@ <h2>{% trans "Downloads" %}</h2>
                                     <h5>
                                         {{ article.metrics.views }}
                                     </h5>
-                                    {# IconA11y Decorative - syntax updated #}
                                     <p><i aria-hidden="true" class="fa fa-eye"></i>{% trans "Views" %}</p>
                                 </div>
                                 <div class="alm">
                                     <h5>
                                         {{ article.metrics.downloads }}
                                     </h5>
-                                    {# IconA11y Decorative - syntax updated #}
                                     <p><i aria-hidden="true" class="fa fa-download"></i>{% trans "Downloads" %}</p>
                                 </div>
                                 {% if article.metrics.alm.twitter %}
@@ -175,7 +173,6 @@ <h5>
                                         <h5>
                                             {{ article.metrics.alm.twitter }}
                                         </h5>
-                                        {# IconA11y Decorative - syntax updated #}
                                         <p><i aria-hidden="true" class="fa fa-twitter"></i>{% trans "Tweets" %}</p>
                                     </div>
                                 {% endif %}
@@ -184,7 +181,6 @@ <h5>
                                         <h5>
                                             {{ article.metrics.alm.wikipedia }}
                                         </h5>
-                                        {# IconA11y Decorative - syntax updated #}
                                         <p><i aria-hidden="true" class="fa fa-wikipedia-w"></i>{% trans "Wikipedia" %}</p>
                                     </div>
                                 {% endif %}
@@ -193,7 +189,6 @@ <h5>
                                         <h5>
                                             {{ article.metrics.alm.reddit }}
                                         </h5>
-                                        {# IconA11y Decorative - syntax updated #}
                                         <p><i aria-hidden="true" class="fa fa-reddit"></i>{% trans "Reddit" %}</p>
                                     </div>
                                 {% endif %}
@@ -203,7 +198,6 @@ <h5>
                                         <h5>
                                             {{ article.citation_count }}
                                         </h5>
-                                        {# IconA11y Decorative - syntax updated #}
                                         <p><i aria-hidden="true" class="fa fa-quote-left"></i>{% trans "Citations" %}</p>
                                     </div>
                                 {% endif %}
@@ -237,14 +231,12 @@ <h4>
                         {% trans "Share" %}
                     </h4>
                       {% with article.get_doi_url as doi_url%}
-                      {# IconA11y Semantic - syntax updated #}
                         <a class="waves-effect waves-light btn btn-small facebook-bg"
                             href="https://www.facebook.com/share.php?p[url]={% if doi_url %}{{ doi_url }}{% else %}{{ article.url }}{% endif %}" 
                             target="_blank" aria-label="{% trans 'Share on Facebook' %}"><i aria-hidden="true" class="fa fa-facebook"></i></a>
                         <a class="waves-effect waves-light btn btn-small twitter-bg twitter-x" 
                             href="https://twitter.com/intent/tweet?text={{ article.title }} {% if doi_url %}{{ doi_url }}{% else %}{{ article.url }}{% endif %}"
                             target="_blank" aria-label="{% trans 'Share on X' %}"><span aria-hidden="true">&#120143;</span></a>
-                        {# IconA11y Semantic - syntax updated #}
                         <a class="waves-effect waves-light btn btn-small linkedin-bg"
                             href="https://www.linkedin.com/sharing/share-offsite?url={% if doi_url %}{{ doi_url }}{% else %}{{ article.url }}{% endif %}"
                             target="_blank" aria-label="{% trans 'Share on LinkedIn' %}"><i aria-hidden="true" class="fa fa-linkedin"></i></a></button>
@@ -268,7 +260,6 @@ <h4>
                                 <span itemprop="name">({{ author.institution }})</span>
                             {% endif %}
                             {% if author.display_email and not journal_settings.article.hide_author_email_links %}
-                                {# IconA11y Semantic - syntax updated #}
                                 <a itemprop="email" href="mailto:{{ author.email }}">
                                    <i aria-hidden="true" class="fa fa-envelope email-link"></i>
                                    <span class="sr-only">Email author.</span>
@@ -401,7 +392,6 @@ <h4>
                     </h4>
                     <p>{{ article.license.name }} 
                         {% if article.license.url %}
-                            {# IconA11y Semantic - updated to aria-label on a tag #}
                             <a rel="license" href="{{ article.license.url }}" aria-label="External link to more license information.">
                                 <i aria-hidden="true" class="fa fa-external-link"></i>
                             </a>
@@ -439,7 +429,6 @@ <h4>
                             {% trans "Peer Review" %}
                         </h4>
                         <p>
-                            {# IconA11y Decorative - syntax updated #}
                             <i aria-hidden="true" class="fa fa-check-circle-o" style="color: green"></i>
                             {% trans "This article has been peer reviewed." %}
                         </p>
diff --git a/src/themes/material/templates/preprints/article.html b/src/themes/material/templates/preprints/article.html
index 332aab25f7..f4a11b2a18 100644
--- a/src/themes/material/templates/preprints/article.html
+++ b/src/themes/material/templates/preprints/article.html
@@ -149,7 +149,6 @@ <h5>{% trans "Citation" %}</h5>
                             <a class="waves-effect waves-light btn modal-trigger wide-button" href="#modal1">{% trans "APA Citation" %}</a>
                         </div>
 
-                        {# IconA11y Decorative - syntax updated #}
                         <p><br/><a href="{% url 'preprints_list' %}"><i aria-hidden="true" class="fa fa-arrow-left"></i>{% trans "All Preprints" %}</a>
                         </p>
                     </small>
diff --git a/src/themes/material/templates/preprints/editors.html b/src/themes/material/templates/preprints/editors.html
index 2efacc13b9..6b8580a097 100644
--- a/src/themes/material/templates/preprints/editors.html
+++ b/src/themes/material/templates/preprints/editors.html
@@ -25,7 +25,6 @@ <h4>{{ subject.name }}</h4>
                                    class="btn-floating halfway-fab waves-effect waves-light red"
                                    aria-label="User profile"
                                    >
-                                   {# IconA11y Semantic - updated with aria-label on a tag #}
                                    <i class="fa fa-user" aria-hidden="true"></i>
                                 </a>{% endif %}
                         </div>
diff --git a/src/themes/material/templates/preprints/list.html b/src/themes/material/templates/preprints/list.html
index 2052c4c0b7..45c21057d4 100644
--- a/src/themes/material/templates/preprints/list.html
+++ b/src/themes/material/templates/preprints/list.html
@@ -28,10 +28,8 @@ <h4>{% trans "All Preprints" %}</h4>
                                     {% if not forloop.counter == article.authors.all|length|add:-1 %},
                                     {% endif %}{% endif %}{% endfor %}</p>
                             <p><span class="date">
-                                {# IconA11y Decorative - changed from Semantic using time tag #}
                                 <i aria-hidden="true" class="fa fa-calendar"></i> 
                                 <time datetime='{{ article.date_published|date:"Y-m-d" }}'>{{ article.date_published|date:"Y-m-d" }}</time>
-                                {# IconA11y Decorative - syntax updated #}
                                 <i aria-hidden="true" class="fa fa-paperclip"></i> {{ article.get_subject_area }}
                         </div>
 
diff --git a/src/themes/material/templates/press/core/news/item.html b/src/themes/material/templates/press/core/news/item.html
index 0b9a86d404..ab552f1c83 100644
--- a/src/themes/material/templates/press/core/news/item.html
+++ b/src/themes/material/templates/press/core/news/item.html
@@ -20,7 +20,6 @@ <h6><em>{% trans "Posted by" %} {{ news_item.posted_by.full_name }} {% trans "on
                     <p>{{ news_item.body|safe }}</p>
                     {% if news_item.tags.all %}
                         <br />
-                        {# IconA11y Decorative - syntax updated #}
                         <h7>{% trans "Tags" %} <i aria-hidden="true" class="fa fa-tags">&nbsp;</i></h7>
                         <p>{% for tag in news_item.tags.all %}
                             <a href="{% url 'core_news_list_tag' tag.text %}"
diff --git a/src/themes/material/templates/repository/preprint.html b/src/themes/material/templates/repository/preprint.html
index 9b38916ea5..ea66bd2eba 100644
--- a/src/themes/material/templates/repository/preprint.html
+++ b/src/themes/material/templates/repository/preprint.html
@@ -54,7 +54,6 @@ <h1 class="carousel-text-wrapper">{{ preprint.title|safe }}</h1>
                                 visible version.</p>
                             <a href="{% url 'repository_file_download' preprint.id preprint.current_version.file.id %}"
                                class="waves-effect waves-light btn">
-                               {# IconA11y Decorative - syntax updated #}
                                <i aria-hidden="true" class="fa fa-download"></i>
                                 Download {{ request.repository.object_name }}
                             </a>
@@ -131,7 +130,6 @@ <h1 class="carousel-text-wrapper">{{ preprint.title|safe }}</h1>
                         <h2>{% trans "Downloads" %}</h2>
                         <p>
                             <a href="{% url 'repository_file_download' preprint.id preprint.current_version.file.id %}">
-                                {# IconA11y Decorative - syntax updated #}
                                 <i aria-hidden="true" class="fa fa-download"></i>
                                 Download {{ request.repository.object_name }}
                             </a></p>
@@ -185,7 +183,6 @@ <h2>Older Versions</h2>
                                     <a href="{% url 'repository_file_download' preprint.id version.file.id %}"
                                         aria-label='Download Version {{ version.version }} - {{ version.date_time|date:"Y-m-d" }}'
                                     >
-                                        {# IconA11y Semantic - updated using aria-label on a tag #}
                                         <i class="fa fa-download">&nbsp;</i>
                                         Version {{ version.version }} - {{ version.date_time|date:"Y-m-d" }}
                                     </a>