diff --git a/plugins/Annotations/templates/getEvolutionIcons.twig b/plugins/Annotations/templates/getEvolutionIcons.twig
index 705738845dab48b7548223fcd90b9e416a85d8b1..583d0573a7e9dfd72b715d0dd6f58182ddb6d04d 100755
--- a/plugins/Annotations/templates/getEvolutionIcons.twig
+++ b/plugins/Annotations/templates/getEvolutionIcons.twig
@@ -7,7 +7,7 @@
               {% elseif counts.count == 1 %}title="{{ 'Annotations_AnnotationOnDate'|translate(date,
               counts.note)|raw }}{{ 'Annotations_ClickToEditOrAdd'|translate }}"
               {% else %}}title="{{ 'Annotations_ViewAndAddAnnotations_js'|translate(date) }}"{% endif %}>
-		<img src="plugins/Zeitgeist/images/{% if counts.starred > 0 %}yellow_marker.png{% else %}grey_marker.png{% endif %}" width="16" height="16"/>
-	</span>
+            <img src="plugins/Zeitgeist/images/{% if counts.starred > 0 %}yellow_marker.png{% else %}grey_marker.png{% endif %}" width="16" height="16"/>
+        </span>
     {% endfor %}
 </div>
diff --git a/plugins/DBStats/templates/index.twig b/plugins/DBStats/templates/index.twig
index 8e6e2a07feab32c7a81743b9daeae8d686f8ea00..a052c092e7e0f73e7cec67d5d6a4171581c48391 100755
--- a/plugins/DBStats/templates/index.twig
+++ b/plugins/DBStats/templates/index.twig
@@ -18,9 +18,9 @@
             <h3 style="margin-top:0">{{ 'General_GeneralInformation'|translate }}</h3><br/>
 
             <p style="font-size:1.4em;padding-left:21px;line-height:1.8em">
-                <strong><em>{{ userCount }}</strong></em>&nbsp;{% if userCount == 1 %}{{ 'UsersManager_User'|translate }}{% else %}{{ 'UsersManager_MenuUsers'|translate }}{% endif %}
+                <strong><em>{{ userCount }}</em></strong>&nbsp;{% if userCount == 1 %}{{ 'UsersManager_User'|translate }}{% else %}{{ 'UsersManager_MenuUsers'|translate }}{% endif %}
                 <br/>
-                <strong><em>{{ siteCount }}</strong></em>&nbsp;{% if siteCount == 1 %}{{ 'General_Website'|translate }}{% else %}{{ 'Referers_Websites'|translate }}{% endif %}
+                <strong><em>{{ siteCount }}</em></strong>&nbsp;{% if siteCount == 1 %}{{ 'General_Website'|translate }}{% else %}{{ 'Referers_Websites'|translate }}{% endif %}
             </p><br/>
             {% set clickDeleteLogSettings %}{{ 'PrivacyManager_DeleteDataSettings'|translate }}{% endset %}
             <h3 style="margin-top:0">{{ 'PrivacyManager_DeleteDataSettings'|translate }}</h3><br/>
diff --git a/plugins/Goals/templates/_listGoalEdit.twig b/plugins/Goals/templates/_listGoalEdit.twig
index b8803ff5776648b201d075a99836f07ca8a876a9..457a20f6a36726ad6f5f11664c6e7e60195bdefc 100644
--- a/plugins/Goals/templates/_listGoalEdit.twig
+++ b/plugins/Goals/templates/_listGoalEdit.twig
@@ -17,7 +17,7 @@
                 <td><span class='matchAttribute'>{{ goal.match_attribute }}</span>
                     {% if goal.pattern_type is defined %}
                         <br/>
-                        {{ 'Goals_Pattern'|translate }} {{ goal.pattern_type }}: {{ goal.pattern|raw }}</b>
+                        {{ 'Goals_Pattern'|translate }} {{ goal.pattern_type }}: {{ goal.pattern|raw }}
                     {% endif %}
                 </td>
                 <td>{% if goal.revenue==0 %}-{% else %}{{ goal.revenue|money(idSite)|raw }}{% endif %}</td>
diff --git a/plugins/PDFReports/templates/_listReports.twig b/plugins/PDFReports/templates/_listReports.twig
index 78ab41e69dcb6fbc4d9dc6e74123f0be4d07e20f..2e6668a9c9947da746b1ddbf283f4fc2e0c29ef9 100644
--- a/plugins/PDFReports/templates/_listReports.twig
+++ b/plugins/PDFReports/templates/_listReports.twig
@@ -17,7 +17,7 @@
             <td colspan='7'>
                 <br/>
                 {{ 'PDFReports_MustBeLoggedIn'|translate }}
-                <br/>&rsaquo; <a href='index.php?module={{ loginModule }}'>{{ 'Login_LogIn'|translate }}</a></strong>
+                <br/>&rsaquo; <a href='index.php?module={{ loginModule }}'>{{ 'Login_LogIn'|translate }}</a>
                 <br/><br/>
             </td>
         </tr>
diff --git a/plugins/SegmentEditor/templates/getSelector.twig b/plugins/SegmentEditor/templates/getSelector.twig
index 2cecd2dd3155335711334a4aade75a48dde834ee..1ca6f34414d10463b9b9f34675b12394d2b71604 100644
--- a/plugins/SegmentEditor/templates/getSelector.twig
+++ b/plugins/SegmentEditor/templates/getSelector.twig
@@ -15,7 +15,7 @@
         {% else %}
             <ul class="submenu">
             <li> <span class='youMustBeLoggedIn'>{{ 'SegmentEditor_YouMustBeLoggedInToCreateSegments'|translate }}
-                <br/>&rsaquo; <a href='index.php?module={{ loginModule }}'>{{ 'Login_LogIn'|translate }}</a> </span></strong>
+                <br/>&rsaquo; <a href='index.php?module={{ loginModule }}'>{{ 'Login_LogIn'|translate }}</a> </span>
             </li>
             </ul>
         {% endif %}
diff --git a/plugins/UserCountry/templates/adminIndex.twig b/plugins/UserCountry/templates/adminIndex.twig
index 79699ed0888a176f2d8ef7e0d19df72bb515a945..27e2fc57223c338967f2daa602a6979becfb5c79 100755
--- a/plugins/UserCountry/templates/adminIndex.twig
+++ b/plugins/UserCountry/templates/adminIndex.twig
@@ -79,7 +79,7 @@
                 {% endif %}
                 {% if provider.statusMessage is defined and provider.statusMessage %}
                     {% set brokenReason %}
-                        {% if provider.status == 2 %}<strong><em>{{ 'General_Error'|translate }}:</strong></em> {% endif %}{{ provider.statusMessage }}
+                        {% if provider.status == 2 %}<strong><em>{{ 'General_Error'|translate }}:</em></strong> {% endif %}{{ provider.statusMessage }}
                     {% endset %}
                     {{ piwik.inlineHelp(brokenReason) }}
                 {% endif %}
diff --git a/plugins/VisitorGenerator/templates/generate.twig b/plugins/VisitorGenerator/templates/generate.twig
index 5fb29ffb669e145b3c2f3425cc770928f26f955a..969ec0298b51e2550ebec07f804ab472134760f1 100644
--- a/plugins/VisitorGenerator/templates/generate.twig
+++ b/plugins/VisitorGenerator/templates/generate.twig
@@ -6,7 +6,7 @@
 Generated visits for {{ siteName }} and for {{ 'General_LastDays'|translate(days) }}.<br/>
 Generated {{ 'General_NbActions'|translate }}: {{ nbActionsTotal }}<br/>
 {{ 'VisitorGenerator_NbRequestsPerSec'|translate }}: {{ nbRequestsPerSec }}<br/>
-{{ timer }}</p>
+{{ timer }}<br/>
 <p><strong>
         {% if browserArchivingEnabled %}
             The reports will be reprocessed the next time you visit the Piwik reports, it might take a few minutes.