diff --git a/administrator/components/com_privacy/Service/HTML/Privacy.php b/administrator/components/com_privacy/Service/HTML/Privacy.php
index d6aba1a0a6edc..968cf4214ef67 100644
--- a/administrator/components/com_privacy/Service/HTML/Privacy.php
+++ b/administrator/components/com_privacy/Service/HTML/Privacy.php
@@ -21,7 +21,7 @@
 class Privacy
 {
 	/**
-	 * Render a status label
+	 * Render a status badge
 	 *
 	 * @param   integer  $status  The item status
 	 *
@@ -34,17 +34,17 @@ public function statusLabel($status)
 		switch ($status)
 		{
 			case 2:
-				return '<span class="label label-success">' . Text::_('COM_PRIVACY_STATUS_COMPLETED') . '</span>';
+				return '<span class="badge badge-success">' . Text::_('COM_PRIVACY_STATUS_COMPLETED') . '</span>';
 
 			case 1:
-				return '<span class="label label-info">' . Text::_('COM_PRIVACY_STATUS_CONFIRMED') . '</span>';
+				return '<span class="badge badge-info">' . Text::_('COM_PRIVACY_STATUS_CONFIRMED') . '</span>';
 
 			case -1:
-				return '<span class="label label-important">' . Text::_('COM_PRIVACY_STATUS_INVALID') . '</span>';
+				return '<span class="badge badge-important">' . Text::_('COM_PRIVACY_STATUS_INVALID') . '</span>';
 
 			default:
 			case 0:
-				return '<span class="label label-warning">' . Text::_('COM_PRIVACY_STATUS_PENDING') . '</span>';
+				return '<span class="badge badge-warning">' . Text::_('COM_PRIVACY_STATUS_PENDING') . '</span>';
 		}
 	}
 }
diff --git a/administrator/modules/mod_privacy_dashboard/tmpl/default.php b/administrator/modules/mod_privacy_dashboard/tmpl/default.php
index aa456b104585c..58862133304d9 100644
--- a/administrator/modules/mod_privacy_dashboard/tmpl/default.php
+++ b/administrator/modules/mod_privacy_dashboard/tmpl/default.php
@@ -9,43 +9,52 @@
 
 defined('_JEXEC') or die;
 
-JHtml::_('bootstrap.tooltip');
+use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Router\Route;
+
+HTMLHelper::_('bootstrap.framework');
 
 $totalRequests  = 0;
 $activeRequests = 0;
 
 ?>
-<div class="row-striped">
-	<?php if (count($list)) : ?>
-		<div class="row-fluid">
-			<div class="span5"><strong><?php echo JText::_('COM_PRIVACY_DASHBOARD_HEADING_REQUEST_TYPE'); ?></strong></div>
-			<div class="span5"><strong><?php echo JText::_('COM_PRIVACY_DASHBOARD_HEADING_REQUEST_STATUS'); ?></strong></div>
-			<div class="span2"><strong><?php echo JText::_('COM_PRIVACY_DASHBOARD_HEADING_REQUEST_COUNT'); ?></strong></div>
-		</div>
+<table class="table" id="<?php echo str_replace(' ', '', $module->title) . $module->id; ?>">
+	<caption class="sr-only"><?php echo $module->title; ?></caption>
+	<thead>
+		<tr>
+			<th colspan="2" scope="col" style="width:40%"><?php echo Text::_('COM_PRIVACY_DASHBOARD_HEADING_REQUEST_TYPE'); ?></th>
+			<th colspan="2" scope="col" style="width:30%"><?php echo Text::_('COM_PRIVACY_DASHBOARD_HEADING_REQUEST_STATUS'); ?></th>
+			<th colspan="2" scope="col" style="width:30%"><?php echo Text::_('COM_PRIVACY_DASHBOARD_HEADING_REQUEST_COUNT'); ?></th>
+		</tr>
+	</thead>
+	<tbody>
+		<?php if (count($list)) : ?>
 		<?php foreach ($list as $row) : ?>
-			<div class="row-fluid">
-				<div class="span5">
-					<a class="hasTooltip" href="<?php echo JRoute::_('index.php?option=com_privacy&view=requests&filter[request_type]=' . $row->request_type . '&filter[status]=' . $row->status); ?>" data-original-title="<?php echo JText::_('COM_PRIVACY_DASHBOARD_VIEW_REQUESTS'); ?>">
-						<strong><?php echo JText::_('COM_PRIVACY_HEADING_REQUEST_TYPE_TYPE_' . $row->request_type); ?></strong>
-					</a>
-				</div>
-				<div class="span5"><?php echo JHtml::_('privacy.statusLabel', $row->status); ?></div>
-				<div class="span2"><span class="badge badge-info"><?php echo $row->count; ?></span></div>
-			</div>
+		<tr>
+			<td colspan="2">
+				<a href="<?php echo Route::_('index.php?option=com_privacy&view=requests&filter[request_type]=' . $row->request_type . '&filter[status]=' . $row->status); ?>">
+					<strong><?php echo Text::_('COM_PRIVACY_HEADING_REQUEST_TYPE_TYPE_' . $row->request_type); ?></strong>
+				</a>
+			</td>
+			<td colspan="2"><?php echo HTMLHelper::_('privacy.statusLabel', $row->status); ?></td>
+			<td colspan="2"><span class="badge badge-info"><?php echo $row->count; ?></span></td>
 			<?php if (in_array($row->status, array(0, 1))) : ?>
 				<?php $activeRequests += $row->count; ?>
 			<?php endif; ?>
 			<?php $totalRequests += $row->count; ?>
+		</tr>
 		<?php endforeach; ?>
-		<div class="row-fluid">
-			<div class="span5"><?php echo JText::plural('COM_PRIVACY_DASHBOARD_BADGE_TOTAL_REQUESTS', $totalRequests); ?></div>
-			<div class="span7"><?php echo JText::plural('COM_PRIVACY_DASHBOARD_BADGE_ACTIVE_REQUESTS', $activeRequests); ?></div>
-		</div>
-	<?php else : ?>
-		<div class="row-fluid">
-			<div class="span12">
-				<div class="alert"><?php echo JText::_('COM_PRIVACY_DASHBOARD_NO_REQUESTS'); ?></div>
-			</div>
-		</div>
-	<?php endif; ?>
-</div>
+		<tr>
+			<td colspan="2" style="text-align:center"><?php echo Text::plural('COM_PRIVACY_DASHBOARD_BADGE_TOTAL_REQUESTS', $totalRequests); ?></td>
+			<td colspan="4" style="text-align:center"><?php echo Text::plural('COM_PRIVACY_DASHBOARD_BADGE_ACTIVE_REQUESTS', $activeRequests); ?></td>
+		</tr>
+		<?php else : ?>
+		<tr>
+			<td colspan="6">
+				<?php echo Text::_('COM_PRIVACY_DASHBOARD_NO_REQUESTS'); ?>
+			</td>
+		</tr>
+		<?php endif; ?>
+	</tbody>
+</table>