diff --git a/administrator/components/com_workflow/tmpl/states/default.php b/administrator/components/com_workflow/tmpl/states/default.php
index 75cc01c306020..c4b644416761a 100644
--- a/administrator/components/com_workflow/tmpl/states/default.php
+++ b/administrator/components/com_workflow/tmpl/states/default.php
@@ -47,36 +47,29 @@
 					<table class="table table-striped">
 						<thead>
 							<tr>
-								<th style="width:1%" class="nowrap text-center hidden-sm-down">
+								<th scope="col" style="width:1%" class="nowrap text-center hidden-sm-down">
 									<?php echo JHtml::_('searchtools.sort', '', 's.ordering', $listDirn, $listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?>
 								</th>
-								<th style="width:1%" class="nowrap text-center hidden-sm-down">
+								<th scope="col" style="width:1%" class="nowrap text-center hidden-sm-down">
 									<?php echo JHtml::_('grid.checkall'); ?>
 								</th>
-								<th style="width:1%" class="nowrap text-center hidden-sm-down">
+								<th scope="col" style="width:1%" class="nowrap text-center hidden-sm-down">
 									<?php echo JHtml::_('searchtools.sort', 'JSTATUS', 's.condition', $listDirn, $listOrder); ?>
 								</th>
-								<th style="width:1%" class="text-center nowrap hidden-sm-down">
+								<th scope="col" style="width:1%" class="text-center nowrap hidden-sm-down">
 									<?php echo JText::_('COM_WORKFLOW_DEFAULT'); ?>
 								</th>
-								<th style="width:10%" class="nowrap hidden-sm-down">
+								<th scope="col" style="width:10%" class="nowrap hidden-sm-down">
 									<?php echo JHtml::_('searchtools.sort', 'COM_WORKFLOW_NAME', 's.title', $listDirn, $listOrder); ?>
 								</th>
-								<th style="width:10%" class="nowrap text-center hidden-sm-down">
+								<th scope="col" style="width:10%" class="nowrap text-center hidden-sm-down">
 									<?php echo JHtml::_('searchtools.sort', 'COM_WORKFLOW_CONDITION', 's.condition', $listDirn, $listOrder); ?>
 								</th>
-								<th style="width:10%" class="nowrap text-right hidden-sm-down">
+								<th scope="col" style="width:10%" class="nowrap text-right hidden-sm-down">
 									<?php echo JHtml::_('searchtools.sort', 'COM_WORKFLOW_ID', 's.id', $listDirn, $listOrder); ?>
 								</th>
 							</tr>
 						</thead>
-						<tfoot>
-							<tr>
-								<td colspan="7">
-									<?php echo $this->pagination->getListFooter(); ?>
-								</td>
-							</tr>
-						</tfoot>
 						<tbody class="js-draggable" data-url="<?php echo $saveOrderingUrl; ?>" data-direction="<?php echo strtolower($listDirn); ?>">
 							<?php foreach ($this->states as $i => $item):
 								$edit = JRoute::_('index.php?option=com_workflow&task=state.edit&id=' . $item->id . '&workflow_id=' . (int) $this->workflowID . '&extension=' . $this->extension);
@@ -136,6 +129,9 @@
 							<?php endforeach ?>
 						</tbody>
 					</table>
+					<?php // load the pagination. ?>
+					<?php echo $this->pagination->getListFooter(); ?>
+				
 				<?php endif; ?>
 				<input type="hidden" name="task" value="">
 				<input type="hidden" name="boxchecked" value="0">
diff --git a/administrator/components/com_workflow/tmpl/transitions/default.php b/administrator/components/com_workflow/tmpl/transitions/default.php
index aa8d2f1c29bea..01c187724f471 100644
--- a/administrator/components/com_workflow/tmpl/transitions/default.php
+++ b/administrator/components/com_workflow/tmpl/transitions/default.php
@@ -48,25 +48,25 @@
 					<table class="table table-striped">
 						<thead>
 							<tr>
-								<th style="width:1%" class="nowrap text-center hidden-sm-down">
+								<th scope="col" style="width:1%" class="nowrap text-center hidden-sm-down">
 									<?php echo JHtml::_('searchtools.sort', '', 't.ordering', $listDirn, $listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?>
 								</th>
-								<th style="width:1%" class="nowrap text-center hidden-sm-down">
+								<th scope="col" style="width:1%" class="nowrap text-center hidden-sm-down">
 									<?php echo JHtml::_('grid.checkall'); ?>
 								</th>
-								<th style="width:1%" class="nowrap text-center hidden-sm-down">
+								<th scope="col" style="width:1%" class="nowrap text-center hidden-sm-down">
 									<?php echo JHtml::_('searchtools.sort', 'JSTATUS', 't.published', $listDirn, $listOrder); ?>
 								</th>
-								<th style="width:10%" class="nowrap hidden-sm-down">
+								<th scope="col" style="width:10%" class="nowrap hidden-sm-down">
 									<?php echo JHtml::_('searchtools.sort', 'COM_WORKFLOW_NAME', 't.title', $listDirn, $listOrder); ?>
 								</th>
-								<th style="width:10%" class="nowrap text-center hidden-sm-down">
+								<th scope="col" style="width:10%" class="nowrap text-center hidden-sm-down">
 									<?php echo JHtml::_('searchtools.sort', 'COM_WORKFLOW_FROM_STATE', 't.from_state', $listDirn, $listOrder); ?>
 								</th>
-								<th style="width:10%" class="nowrap text-center hidden-sm-down">
+								<th scope="col" style="width:10%" class="nowrap text-center hidden-sm-down">
 									<?php echo JHtml::_('searchtools.sort', 'COM_WORKFLOW_TO_STATE', 't.to_state', $listDirn, $listOrder); ?>
 								</th>
-								<th style="width:10%" class="nowrap text-right hidden-sm-down">
+								<th scope="col" style="width:10%" class="nowrap text-right hidden-sm-down">
 									<?php echo JHtml::_('searchtools.sort', 'COM_WORKFLOW_ID', 't.id', $listDirn, $listOrder); ?>
 								</th>
 							</tr>
@@ -132,14 +132,9 @@
 								</tr>
 							<?php endforeach ?>
 						</tbody>
-						<tfoot>
-							<tr>
-								<td colspan="7">
-									<?php echo $this->pagination->getListFooter(); ?>
-								</td>
-							</tr>
-						</tfoot>
 					</table>
+					<?php // load the pagination. ?>
+					<?php echo $this->pagination->getListFooter(); ?>
 				<?php endif; ?>
 				<input type="hidden" name="task" value="">
 				<input type="hidden" name="boxchecked" value="0">
diff --git a/administrator/components/com_workflow/tmpl/workflows/default.php b/administrator/components/com_workflow/tmpl/workflows/default.php
index 29337743cbe03..e2f12dc5fc3dc 100644
--- a/administrator/components/com_workflow/tmpl/workflows/default.php
+++ b/administrator/components/com_workflow/tmpl/workflows/default.php
@@ -59,41 +59,39 @@
 					<table class="table table-striped" id="emailList">
 						<thead>
 							<tr>
-								<th style="width:1%" class="nowrap text-center hidden-sm-down">
+								<th scope="col" style="width:1%" class="nowrap text-center d-none d-md-table-cell">
 									<?php echo JHtml::_('searchtools.sort', '', 'w.ordering', $listDirn, $listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?>
 								</th>
 								<th style="width:1%" class="nowrap text-center hidden-sm-down">
 									<?php echo JHtml::_('grid.checkall'); ?>
 								</th>
-								<th style="width:1%" class="nowrap text-center hidden-sm-down">
+								<th scope="col"  style="width:1%" class="nowrap text-center hidden-sm-down">
 									<?php echo JHtml::_('searchtools.sort', 'JSTATUS', 'w.condition', $listDirn, $listOrder); ?>
 								</th>
 								<th style="width:10%" class="nowrap hidden-sm-down">
 									<?php echo JHtml::_('searchtools.sort', 'COM_WORKFLOW_NAME', 'w.title', $listDirn, $listOrder); ?>
 								</th>
-								<th style="width:10%" class="nowrap text-center hidden-sm-down">
+								<th scope="col" style="width:10%" class="nowrap text-center hidden-sm-down">
 									<?php echo JText::_('COM_WORKFLOW_STATES'); ?>
 								</th>
-								<th style="width:10%" class="text-center nowrap hidden-sm-down">
+								<th scope="col" style="width:10%" class="text-center nowrap hidden-sm-down">
 									<?php echo JText::_('COM_WORKFLOW_DEFAULT'); ?>
 								</th>
-								<th style="width:3%" class="nowrap text-center hidden-sm-down">
-									<span class="fa fa-circle-o text-warning hasTooltip" aria-hidden="true" title="<?php echo JText::_('COM_WORKFLOW_COUNT_STATES'); ?>">
-										<span class="sr-only"><?php echo JText::_('COM_WORKFLOW_COUNT_STATES'); ?></span>
-									</span>
+								<th scope="col" style="width:3%" class="nowrap text-center hidden-sm-down">
+									<span class="fa fa-circle-o text-warning hasTooltip" aria-hidden="true" title="<?php echo JText::_('COM_WORKFLOW_COUNT_STATES'); ?>"></span>
+									<span class="sr-only"><?php echo JText::_('COM_WORKFLOW_COUNT_STATES'); ?></span>
 								</th>
-								<th style="width:3%" class="nowrap text-center hidden-sm-down">
-									<span class="fa fa-arrows-h text-info hasTooltip" aria-hidden="true" title="<?php echo JText::_('COM_WORKFLOW_COUNT_TRANSITIONS'); ?>">
-										<span class="sr-only"><?php echo JText::_('COM_WORKFLOW_COUNT_TRANSITIONS'); ?></span>
-									</span>
+								<th scope="col" style="width:3%" class="nowrap text-center hidden-sm-down">
+									<span class="fa fa-arrows-h text-info hasTooltip" aria-hidden="true" title="<?php echo JText::_('COM_WORKFLOW_COUNT_TRANSITIONS'); ?>"></span>	
+									<span class="sr-only"><?php echo JText::_('COM_WORKFLOW_COUNT_TRANSITIONS'); ?></span>
 								</th>
-								<th style="width:10%" class="nowrap hidden-sm-down text-center">
+								<th scope="col" style="width:10%" class="nowrap hidden-sm-down text-center">
 									<?php echo JHtml::_('searchtools.sort', 'COM_WORKFLOW_DATE_' . strtoupper($orderingColumn), 'w.' . $orderingColumn, $listDirn, $listOrder); ?>
 								</th>
-								<th style="width:10%" class="nowrap text-center hidden-sm-down">
+								<th scope="col" style="width:10%" class="nowrap text-center hidden-sm-down">
 									<?php echo JHtml::_('searchtools.sort', 'COM_WORKFLOW_AUTHOR', 'w.created_by', $listDirn, $listOrder); ?>
 								</th>
-								<th style="width:10%" class="nowrap text-right hidden-sm-down">
+								<th scope="col" style="width:10%" class="nowrap text-right hidden-sm-down">
 									<?php echo JHtml::_('searchtools.sort', 'COM_WORKFLOW_ID', 'w.id', $listDirn, $listOrder); ?>
 								</th>
 							</tr>
@@ -176,15 +174,10 @@
 								</td>
 							</tr>
 						<?php endforeach ?>
-						</tbody>
-						<tfoot>
-							<tr>
-								<td colspan="<?php echo $columns; ?>">
-								<?php echo $this->pagination->getListFooter(); ?>
-								</td>
-							</tr>
-						</tfoot>
 					</table>
+					<?php // load the pagination. ?>
+					<?php echo $this->pagination->getListFooter(); ?>
+				
 				<?php endif; ?>
 				<input type="hidden" name="task" value="">
 				<input type="hidden" name="boxchecked" value="0">