diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
index 382701b4c8..0f6741661d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -260,6 +260,7 @@ table+table {
 
 .highlighted-row { background-color: orange !important }
 
+tbody tr:nth-child(odd) td,
 tr.highlight td,
 tr.highlight th,
 tr.odd td,
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt
index 51b8b8a3dd..be498606de 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt
@@ -570,11 +570,7 @@
           </thead>
           <tbody>
               [% FOREACH period_loo IN period_inactive_loop %]
-                  [% IF ( loop.odd ) %]
-                      <tr>
-                  [% ELSE %]
-                      <tr class="highlight">
-                  [% END %]
+                  <tr>
                   <td><a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% period_loo.budget_period_id %]" title="View funds for [% period_loo.budget_period_description %]">[% period_loo.budget_period_description %]</a></td>
                   <td><span title="[% period_loo.budget_period_startdate %]">[% period_loo.budget_period_startdate | $KohaDates %]</span></td>
                   <td><span title="[% period_loo.budget_period_enddate %]">[% period_loo.budget_period_enddate | $KohaDates %]</span></td>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt
index afbabfdafa..ed8336a9af 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt
@@ -181,7 +181,7 @@ function Check(ff) {
                             <th scope="col" colspan="2">&nbsp; </th>
                         </tr>
                     [% FOREACH loo IN loop %]
-                        [% IF ( loop.even ) %]<tr class="highlight">[% ELSE %]<tr>[% END %]
+                        <tr>
                         <td>
                             <a href="[% loo.script_name %]?op=add_form&amp;booksellerid=[% loo.booksellerid %]&amp;contractnumber=[% loo.contractnumber %]">[% loo.contractname %]</a>
                         </td>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt
index d5d89066bd..65cd9c4e18 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt
@@ -125,7 +125,7 @@
 
     <tbody>
     [% FOREACH budget_line IN budget_lines %]
-    [% UNLESS ( loop.odd ) %]<tr class="highlight">[% ELSE %]<tr>[% END %]
+    <tr>
         [% IF ( budget_line.budget_lock ) %]
             <td class="locked" title="Fund locked">
         [% ELSE %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt
index bc72266510..f7b1d52e0f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt
@@ -262,11 +262,7 @@ function displayMoreConstraint(numlayer){
         <th>Delete</th>
     </tr>
     [% FOREACH loo IN loop %]
-    [% UNLESS ( loop.odd ) %]
-    <tr class="highlight">
-    [% ELSE %]
     <tr>
-    [% END %]
         <td>[% loo.tagsubfield %]</td>
         <td>
             [% IF ( loo.subfield_ignored ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt
index 87c55b4ac4..eabcf9ea91 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt
@@ -54,7 +54,7 @@
                 [% ELSE %]<a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Default framework</a>
                 [% END %] &rsaquo; Data deleted
             [% ELSE %]
-                [% IF ( authtypecode ) %][% authtypecode %] Framework</a>
+                [% IF ( authtypecode ) %][% authtypecode %] Framework
                 [% ELSE %]Default framework
                 [% END %]
             [% END %]
@@ -200,31 +200,31 @@
 </div>
 <table id="table_authtagstructure">
     <thead>
-        <th>Tag</th>
-        <th>Lib</th>
-        <th>Repeatable</th>
-        <th>Mandatory</th>
-        <th>Authorized<br />value</th>
-        <th>Subfields</th>
-        <th>Edit</th>
-        <th>Delete</th>
+        <tr>
+            <th>Tag</th>
+            <th>Lib</th>
+            <th>Repeatable</th>
+            <th>Mandatory</th>
+            <th>Authorized<br />value</th>
+            <th>Subfields</th>
+            <th>Edit</th>
+            <th>Delete</th>
+            </tr>
     </thead>
-    [% FOREACH loo IN loop %]
-    [% UNLESS ( loop.odd ) %]
-    <tr class="highlight">
-    [% ELSE %]
-    <tr>
-    [% END %]
-        <td><b>[% loo.tagfield %]</b></td>
-        <td>[% loo.liblibrarian %]</td>
-        <td>[% IF ( loo.repeatable ) %]Yes[% ELSE %]No[% END %]</td>
-        <td>[% IF ( loo.mandatory ) %]Yes[% ELSE %]No[% END %]</td>
-        <td>[% loo.authorised_value %]</td>
-        <td><a href="[% loo.subfield_link %]" class="button">subfields</a></td>
-        <td><a href="[% loo.edit %]">Edit</a></td>
-        <td><a href="[% loo.delete %]">Delete</a></td>
-    </tr>
-    [% END %]
+    <tbody>
+        [% FOREACH loo IN loop %]
+        <tr>
+            <td><b>[% loo.tagfield %]</b></td>
+            <td>[% loo.liblibrarian %]</td>
+            <td>[% IF ( loo.repeatable ) %]Yes[% ELSE %]No[% END %]</td>
+            <td>[% IF ( loo.mandatory ) %]Yes[% ELSE %]No[% END %]</td>
+            <td>[% loo.authorised_value %]</td>
+            <td><a href="[% loo.subfield_link %]" class="button">subfields</a></td>
+            <td><a href="[% loo.edit %]">Edit</a></td>
+            <td><a href="[% loo.delete %]">Delete</a></td>
+        </tr>
+        [% END %]
+    </tbody>
     </table>
 
 [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt
index dcc606df11..2c12808e81 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt
@@ -104,11 +104,7 @@
 	</tr>
 	
 	[% FOREACH loo IN loop %]
-        [% IF ( loop.odd ) %]
 		<tr>
-        [% ELSE %]
-        <tr class="highlight">
-        [% END %]
 			<td>[% loo.authtypecode %]</td>
 			<td>[% loo.authtypetext %]</td>
 			<td>[% loo.summary %]</td>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt
index fcba389d80..791e971e32 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt
@@ -220,9 +220,7 @@
     </tr>
     <!-- note highlight assignment appears backwards because we already have a normal row for Default -->
     [% FOREACH loo IN loop %]
-        [% IF ( loop.odd ) %]<tr class="highlight">
-        [% ELSE %]<tr>
-        [% END %]
+        <tr>
             <td>[% loo.frameworkcode %]</td>
             <td>[% loo.frameworktext %]</td>
             <td><a href="marctagstructure.pl?frameworkcode=[% loo.frameworkcode %]" >MARC structure</a></td>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt
index 7e8165f957..375152ca35 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branch_transfer_limits.tt
@@ -95,7 +95,7 @@
 
 			<tbody>
 					[% FOREACH to_branch_loo IN codes_loo.to_branch_loop %]
-						[% UNLESS ( loop.odd ) %]<tr class="highlight">[% ELSE %]<tr>[% END %]
+                        <tr>
 							<td><label style="min-width:400px;" for="[% to_branch_loo.code %][% to_branch_loo.toBranch %]row">[% to_branch_loo.toBranch %] - [% to_branch_loo.toBranchname %]</label></td>
 							<td>
 							[% IF ( to_branch_loo.isChecked ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt
index f12107f9e3..df49e26c12 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt
@@ -186,11 +186,7 @@ tinyMCE.init({
             <th>&nbsp;</th>
         </tr></thead><tbody>
         [% FOREACH branche IN branches %]
-	[% IF ( loop.odd ) %]
-        <tr>
-	[% ELSE %]
-		<tr class="highlight">
-	[% END %]
+            <tr>
                 <td>[% branche.branch_name |html %]</td>
                 <td>[% branche.branch_code |html %]</td>
                 <td>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt
index 02656343a6..fa5629ccdb 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt
@@ -131,11 +131,7 @@
 			<th>&nbsp;</th>
 		</thead>
 		[% FOREACH loo IN loop %]
-		[% UNLESS ( loop.odd ) %]
-		<tr class="highlight">
-		[% ELSE %]
-		<tr>
-		[% END %]
+        <tr>
 			<td>[% loo.cityid %]</td>
 			<td>[% loo.city_name %]</td>
 			<td>[% loo.city_state %]</td>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt
index 140c0335ec..8f9446fa63 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tt
@@ -250,11 +250,7 @@ function CheckRuleForm(f) {
     <th>Actions</th>
   </tr>
   [% FOREACH class_source IN class_sources %]
-  [% IF ( loop.odd ) %]
   <tr>
-  [% ELSE %]
-  <tr class="highlight">
-  [% END %]
     <td>[% class_source.code %]</td>
     <td>[% class_source.description %]</td>
     <td>[% IF ( class_source.used ) %]Yes[% ELSE %]No[% END %]</td>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/clone-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/clone-rules.tt
index 74d6ef451d..146b203f55 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/clone-rules.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/clone-rules.tt
@@ -1,5 +1,5 @@
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; Administration &rsaquo; Issuing Rules &rsaquo; Clone Issuing Rules</title>
+<title>Koha &rsaquo; Administration &rsaquo; Issuing rules &rsaquo; Clone issuing rules</title>
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
 <body id="admin_clone-rules" class="admin">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt
index 522420be0a..9a691fb663 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt
@@ -266,11 +266,7 @@ Item types administration
     <th>Actions</th>
   </thead>
   [% FOREACH loo IN loop %]
-    [% UNLESS ( loop.odd ) %]
-  <tr class="highlight">
-    [% ELSE %]
-  <tr>
-    [% END %]
+    <tr>
    [% UNLESS ( noItemTypeImages ) %] <td>[% IF ( loo.imageurl ) %]<img src="[% loo.imageurl %]" alt="" />[% ELSE %]&nbsp;[% END %]</td>[% END %]
     <td>
       <a href="[% loo.script_name %]?op=add_form&amp;itemtype=[% loo.itemtype |html %]">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tt
index 35134fa357..a96dd7d41b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/koha2marclinks.tt
@@ -92,11 +92,7 @@
     <th>&nbsp;</th>
 </tr>
 [% FOREACH loo IN loop %]
-[% UNLESS ( loop.odd ) %]
-<tr class="highlight">
-[% ELSE %]
 <tr>
-[% END %]
     <td><a href="[% loo.edit %]">[% loo.kohafield %]</a></td>
     <td>[% loo.tagfield %]</td>
     <td>[% loo.tagsubfield %]</td>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt
index c12ddf1331..bfa88158fe 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt
@@ -391,11 +391,7 @@ function populateHiddenCheckboxes(tab) {
     <th>Delete</th>
 </tr>
 [% FOREACH loo IN loop %]
-[% UNLESS ( loop.odd ) %]
-<tr class="highlight">
-[% ELSE %]
 <tr>
-[% END %]
     <td><a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?op=add_form&amp;tagfield=[% loo.tagfield %]&amp;frameworkcode=[% frameworkcode %]#sub[% loo.tagsubfield %]field">[% loo.tagsubfield %]</a></td>
     <td>
         [% IF ( loo.subfield_ignored ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt
index 219389dc21..049f419583 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt
@@ -192,7 +192,7 @@ $(document).ready(function() {
     <tbody>
     [% IF ( select_display ) %]
         [% FOREACH loo IN loop %]
-            [% IF ( loop.odd ) %]<tr>[% ELSE %]<tr class="highlight">[% END %]
+            <tr>
             <td>[% loo.tagfield %]</td>
             <td>[% loo.liblibrarian %]</td>
             <td>[% IF ( loo.repeatable ) %]Yes[% ELSE %]No[% END %]</td>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tt
index 151e8d6ff8..0e77e8b836 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/printers.tt
@@ -164,7 +164,7 @@
 			<th>&nbsp;</th>
 		</tr>
 		[% FOREACH loo IN loop %]
-		[% IF ( loop.odd ) %]<tr>[% ELSE %]<tr class="highlight">[% END %]
+        <tr>
 			<td>[% loo.printername %]</td>
 			<td>[% loo.printqueue %]</td>
 			<td>[% loo.printtype %]</td>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
index 535c740eba..8bc5809e61 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
@@ -162,11 +162,7 @@ for="tobranch"><strong>Clone these rules to:</strong></label> <input type="hidde
             </thead>
             <tbody>
 				[% FOREACH rule IN rules %]
-					[% UNLESS ( loop.odd ) %]
-					<tr class="highlight" id="row_[% loop.count %]">
-					[% ELSE %]
 					<tr id="row_[% loop.count %]">
-					[% END %]
 							<td>[% IF ( rule.default_humancategorycode ) %]
 									<em>All</em>
 								[% ELSE %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/stopwords.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/stopwords.tt
index 6ba5697433..db1016feb1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/stopwords.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/stopwords.tt
@@ -120,9 +120,7 @@
             <th></th>
         </tr>
         [% FOREACH loo IN loop %]
-           [% IF ( loop.odd ) %]<tr>
-           [% ELSE %]<tr class="highlight">
-           [% END %]
+            <tr>
             <td>[% loo.word %]</td>
             <td><a href="[% loo.script_name %]?op=delete_confirm&amp;searchfield=[% loo.word %]">Delete</a></td>
         </tr>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt
index 6ca3274a30..2d27d8303d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tt
@@ -264,7 +264,7 @@
         </tr></thead>
     [% END %]
     <tbody>[% FOREACH loo IN loop %]
-    [% UNLESS ( loop.odd ) %]<tr class="highlight">[% ELSE %]<tr>[% END %]
+        <tr>
 
         <td><strong><a href="[% loo.edit %]">[% loo.variable %]</a></strong></td><td> [% loo.explanation |html %]</td>
         [% IF ( loo.oneline ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt
index 10298cece2..fd272341e9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt
@@ -216,11 +216,7 @@
         </tr></thead>
         <tbody>
         [% FOREACH loo IN loop %]
-            [% UNLESS ( loop.odd ) %]
-                <tr class="highlight">
-            [% ELSE %]
-                <tr>
-            [% END %]
+            <tr>
             <td><a href="[% loo.script_name %]?op=edit&amp;id=[% loo.id %]">[% loo.servername %]</a></td><td>[% loo.host %]:[% loo.port %]</td><td>[% loo.db %]</td><td>[% loo.userid %]</td><td>[% IF loo.password %]########[% END %]</td><td>[% IF ( loo.checked ) %]Yes[% ELSE %]No[% END %]</td><td>[% loo.rank %]</td>
             <td>[% loo.syntax %]</td><td>[% loo.encoding %]</td><td>[% loo.timeout %]</td>
             <td>[% IF ( loo.recordtype == 'biblio' )  %]