diff --git a/components/com_content/views/category/tmpl/default_articles.php b/components/com_content/views/category/tmpl/default_articles.php
index c6bc7f85b04cf..8969ab8489757 100644
--- a/components/com_content/views/category/tmpl/default_articles.php
+++ b/components/com_content/views/category/tmpl/default_articles.php
@@ -31,11 +31,20 @@
 		}
 	}
 }
-?>
 
+// For B/C we also add the css classes inline. This will be removed in 4.0.
+JFactory::getDocument()->addStyleDeclaration("
+.hide { display: none; }
+.table-noheader { border-collapse: collapse; }
+.table-noheader thead { display: none; }
+");
+
+$tableClass = $this->params->get('show_headings') != 1 ? ' table-noheader' : '';
+?>
 <form action="<?php echo htmlspecialchars(JUri::getInstance()->toString()); ?>" method="post" name="adminForm" id="adminForm" class="form-inline">
-<?php if ($this->params->get('show_headings') || $this->params->get('filter_field') != 'hide' || $this->params->get('show_pagination_limit')) :?>
+<?php if ($this->params->get('filter_field') != 'hide' || $this->params->get('show_pagination_limit')) : ?>
 	<fieldset class="filters btn-toolbar clearfix">
+		<legend class="hide"><?php echo JText::_('COM_CONTENT_FORM_FILTER_LEGEND'); ?></legend>
 		<?php if ($this->params->get('filter_field') != 'hide') :?>
 			<div class="btn-group">
 				<?php if ($this->params->get('filter_field') != 'tag') :?>
@@ -65,39 +74,29 @@
 		<input type="hidden" name="limitstart" value="" />
 		<input type="hidden" name="task" value="" />
 	</fieldset>
+
+	<div class="control-group hide pull-right">
+		<div class="controls">
+			<button type="submit" name="filter_submit" class="btn btn-primary"><?php echo JText::_('COM_CONTENT_FORM_FILTER_SUBMIT'); ?></button>
+		</div>
+	</div>
+
 <?php endif; ?>
 
 <?php if (empty($this->items)) : ?>
-
 	<?php if ($this->params->get('show_no_articles', 1)) : ?>
 		<p><?php echo JText::_('COM_CONTENT_NO_ARTICLES'); ?></p>
 	<?php endif; ?>
-
 <?php else : ?>
-
-	<table class="category table table-striped table-bordered table-hover">
-		<?php
-		$headerTitle    = '';
-		$headerDate     = '';
-		$headerAuthor   = '';
-		$headerHits     = '';
-		$headerEdit     = '';
-		?>
-		<?php if ($this->params->get('show_headings')) : ?>
-			<?php
-			$headerTitle    = 'headers="categorylist_header_title"';
-			$headerDate     = 'headers="categorylist_header_date"';
-			$headerAuthor   = 'headers="categorylist_header_author"';
-			$headerHits     = 'headers="categorylist_header_hits"';
-			$headerEdit     = 'headers="categorylist_header_edit"';
-			?>
-			<thead>
+	<table class="category table table-striped table-bordered table-hover<?php echo $tableClass; ?>">
+		<caption class="hide"><?php echo JText::sprintf('COM_CONTENT_CATEGORY_LIST_TABLE_CAPTION', $this->category->title); ?></caption>
+		<thead>
 			<tr>
-				<th id="categorylist_header_title">
+				<th scope="col" id="categorylist_header_title">
 					<?php echo JHtml::_('grid.sort', 'JGLOBAL_TITLE', 'a.title', $listDirn, $listOrder); ?>
 				</th>
 				<?php if ($date = $this->params->get('list_show_date')) : ?>
-					<th id="categorylist_header_date">
+					<th scope="col" id="categorylist_header_date">
 						<?php if ($date == "created") : ?>
 							<?php echo JHtml::_('grid.sort', 'COM_CONTENT_' . $date . '_DATE', 'a.created', $listDirn, $listOrder); ?>
 						<?php elseif ($date == "modified") : ?>
@@ -108,21 +107,20 @@
 					</th>
 				<?php endif; ?>
 				<?php if ($this->params->get('list_show_author')) : ?>
-					<th id="categorylist_header_author">
+					<th scope="col" id="categorylist_header_author">
 						<?php echo JHtml::_('grid.sort', 'JAUTHOR', 'author', $listDirn, $listOrder); ?>
 					</th>
 				<?php endif; ?>
 				<?php if ($this->params->get('list_show_hits')) : ?>
-					<th id="categorylist_header_hits">
+					<th scope="col" id="categorylist_header_hits">
 						<?php echo JHtml::_('grid.sort', 'JGLOBAL_HITS', 'a.hits', $listDirn, $listOrder); ?>
 					</th>
 				<?php endif; ?>
 				<?php if ($isEditable) : ?>
-					<th id="categorylist_header_edit"><?php echo JText::_('COM_CONTENT_EDIT_ITEM'); ?></th>
+					<th scope="col" id="categorylist_header_edit"><?php echo JText::_('COM_CONTENT_EDIT_ITEM'); ?></th>
 				<?php endif; ?>
 			</tr>
-			</thead>
-		<?php endif; ?>
+		</thead>
 		<tbody>
 		<?php foreach ($this->items as $i => $article) : ?>
 			<?php if ($this->items[$i]->state == 0) : ?>
@@ -130,7 +128,7 @@
 			<?php else: ?>
 				<tr class="cat-list-row<?php echo $i % 2; ?>" >
 			<?php endif; ?>
-			<td <?php echo $headerTitle; ?> class="list-title">
+			<td headers="categorylist_header_title" class="list-title">
 				<?php if (in_array($article->access, $this->user->getAuthorisedViewLevels())) : ?>
 					<a href="<?php echo JRoute::_(ContentHelperRoute::getArticleRoute($article->slug, $article->catid, $article->language)); ?>">
 						<?php echo $this->escape($article->title); ?>
@@ -165,7 +163,7 @@
 				<?php endif; ?>
 			</td>
 			<?php if ($this->params->get('list_show_date')) : ?>
-				<td <?php echo $headerDate; ?> class="list-date small">
+				<td headers="categorylist_header_date" class="list-date small">
 					<?php
 					echo JHtml::_(
 						'date', $article->displayDate,
@@ -174,7 +172,7 @@
 				</td>
 			<?php endif; ?>
 			<?php if ($this->params->get('list_show_author', 1)) : ?>
-				<td <?php echo $headerAuthor; ?> class="list-author">
+				<td headers="categorylist_header_author" class="list-author">
 					<?php if (!empty($article->author) || !empty($article->created_by_alias)) : ?>
 						<?php $author = $article->author ?>
 						<?php $author = ($article->created_by_alias ? $article->created_by_alias : $author);?>
@@ -187,14 +185,14 @@
 				</td>
 			<?php endif; ?>
 			<?php if ($this->params->get('list_show_hits', 1)) : ?>
-				<td <?php echo $headerHits; ?> class="list-hits">
+				<td headers="categorylist_header_hits" class="list-hits">
 							<span class="badge badge-info">
 								<?php echo JText::sprintf('JGLOBAL_HITS_COUNT', $article->hits); ?>
 							</span>
 				</td>
 			<?php endif; ?>
 			<?php if ($isEditable) : ?>
-				<td <?php echo $headerEdit; ?> class="list-edit">
+				<td headers="categorylist_header_edit" class="list-edit">
 					<?php if ($article->params->get('access-edit')) : ?>
 						<?php echo JHtml::_('icon.edit', $article, $params); ?>
 					<?php endif; ?>
diff --git a/language/en-GB/en-GB.com_content.ini b/language/en-GB/en-GB.com_content.ini
index 773cd4aa04dcd..65b1d0f11babd 100644
--- a/language/en-GB/en-GB.com_content.ini
+++ b/language/en-GB/en-GB.com_content.ini
@@ -26,6 +26,9 @@ COM_CONTENT_ERROR_PARENT_CATEGORY_NOT_FOUND="Parent category not found"
 COM_CONTENT_FEED_READMORE="Read More ..."
 COM_CONTENT_FILTER_SEARCH_DESC="Content Filter Search"
 COM_CONTENT_FORM_EDIT_ARTICLE="Edit an article"
+COM_CONTENT_FORM_FILTER_LEGEND="Filters"
+COM_CONTENT_FORM_FILTER_SUBMIT="Filter"
+COM_CONTENT_CATEGORY_LIST_TABLE_CAPTION="List of articles in category %s"
 COM_CONTENT_HEADING_TITLE="Title"
 COM_CONTENT_HITS_FILTER_LABEL="Hits Filter"
 COM_CONTENT_INTROTEXT="Article must have some content."
diff --git a/media/jui/less/tables.less b/media/jui/less/tables.less
index 0e35271e11fe5..bdb32c60f4dc8 100644
--- a/media/jui/less/tables.less
+++ b/media/jui/less/tables.less
@@ -242,3 +242,14 @@ table th[class*="span"],
     background-color: darken(@infoBackground, 5%);
   }
 }
+
+
+// TABLE WITHOUT HEADER
+// -----------------
+// Table with table header hidden
+.table-noheader {
+  border-collapse: collapse;
+  thead {
+	display: none;
+  }
+}
\ No newline at end of file
diff --git a/templates/protostar/css/template.css b/templates/protostar/css/template.css
index f17c17a642883..546aa1fdb0f72 100644
--- a/templates/protostar/css/template.css
+++ b/templates/protostar/css/template.css
@@ -1938,6 +1938,12 @@ table th[class*="span"],
 .table-hover tbody tr.info:hover > td {
 	background-color: #c4e3f3;
 }
+.table-noheader {
+	border-collapse: collapse;
+}
+.table-noheader thead {
+	display: none;
+}
 .dropup,
 .dropdown {
 	position: relative;