Fix regression in annotation icon placement and refactor some recently committed code.

plugins/Annotations/stylesheets/annotations.less

@@ -9,6 +9,7 @@
 
 .evolution-annotations > span {
     position: absolute;
+    top:10px;
 }
 
 .annotation-manager {

plugins/CoreHome/templates/_dataTableFooter.twig

@@ -31,12 +31,12 @@
                     <span class="{{ footerIconGroup.class }}">
                     {% for footerIcon in footerIconGroup.buttons %}
                         <span>
-                        {% if properties.show_active_view_icon and javascriptVariablesToSet.viewDataTable == footerIcon.format %}
+                            {% if properties.show_active_view_icon and javascriptVariablesToSet.viewDataTable == footerIcon.format %}
                             <img src="plugins/Zeitgeist/images/data_table_footer_active_item.png" class="dataTableFooterActiveItem"/>
-                        {% endif %}
-                        <a class="tableIcon" format="{{ footerIcon.format }}" var="{{ footerIcon.var }}">
-                            <img width="16" height="16" title="{{ footerIcon.title }}" src="{{ footerIcon.icon }}"/>
-                        </a>
+                            {% endif %}
+                            <a class="tableIcon" format="{{ footerIcon.format }}" var="{{ footerIcon.var }}">
+                                <img width="16" height="16" title="{{ footerIcon.title }}" src="{{ footerIcon.icon }}"/>
+                            </a>
                         </span>
                     {% endfor %}
                     </span>