diff --git a/phpBB/styles/prosilver/template/mcp_header.html b/phpBB/styles/prosilver/template/mcp_header.html
index df03de725a..69239887e3 100644
--- a/phpBB/styles/prosilver/template/mcp_header.html
+++ b/phpBB/styles/prosilver/template/mcp_header.html
@@ -22,7 +22,7 @@
 	<div style="width: 100%;">
 
 	<div id="cp-menu">
-		<div id="navigation">
+		<div id="navigation" role="navigation">
 			<ul>
 			<!-- BEGIN l_block1 -->
 			<!-- IF l_block1.S_SELECTED -->
diff --git a/phpBB/styles/prosilver/template/mcp_topic.html b/phpBB/styles/prosilver/template/mcp_topic.html
index cf93c90b06..6bf6af1b78 100644
--- a/phpBB/styles/prosilver/template/mcp_topic.html
+++ b/phpBB/styles/prosilver/template/mcp_topic.html
@@ -11,16 +11,16 @@
 	<!-- DEFINE $SHOW_PANEL = 'display-panel' -->
 <!-- ENDIF -->
 
-<div id="minitabs" class="sub-panels" data-show-panel="{$SHOW_PANEL}">
+<div id="minitabs" class="sub-panels" data-show-panel="{$SHOW_PANEL}" role="tablist">
 	<ul>
 		<li id="display-panel-tab" class="tab<!-- IF not S_MERGE_VIEW --> activetab<!-- ENDIF -->">
-			<a href="#minitabs" data-subpanel="display-panel">{L_DISPLAY_OPTIONS}</a>
+			<a href="#minitabs" data-subpanel="display-panel" role="tab" aria-controls="display-panel">{L_DISPLAY_OPTIONS}</a>
 		</li>
 		<li id="split-panel-tab" class="tab">
-			<a href="#minitabs" data-subpanel="split-panel">{L_SPLIT_TOPIC}</a>
+			<a href="#minitabs" data-subpanel="split-panel" role="tab" aria-controls="split-panel">{L_SPLIT_TOPIC}</a>
 		</li>
 		<li id="merge-panel-tab" class="tab<!-- IF S_MERGE_VIEW --> activetab<!-- ENDIF -->">
-			<a href="#minitabs" data-subpanel="merge-panel">{L_MERGE_POSTS}</a>
+			<a href="#minitabs" data-subpanel="merge-panel" role="tab" aria-controls="merge-panel">{L_MERGE_POSTS}</a>
 		</li>
 	</ul>
 </div>
@@ -31,7 +31,7 @@
 <div class="panel">
 	<div class="inner">
 
-	<fieldset id="display-panel" class="fields2">
+	<fieldset id="display-panel" class="fields2" role="tabpanel">
 	<dl>
 		<dt><label for="posts_per_page">{L_POSTS_PER_PAGE}{L_COLON}</label><br /><span>{L_POSTS_PER_PAGE_EXPLAIN}</span></dt>
 		<dd><input class="inputbox autowidth" type="number" min="1" name="posts_per_page" id="posts_per_page" size="6" value="{POSTS_PER_PAGE}" /></dd>
@@ -43,7 +43,7 @@
 	</fieldset>
 
 <!-- IF S_CAN_SPLIT -->
-	<fieldset id="split-panel" class="fields2">
+	<fieldset id="split-panel" class="fields2" role="tabpanel">
 		<p>{L_SPLIT_TOPIC_EXPLAIN}</p>
 
 	<!-- IF S_SHOW_TOPIC_ICONS -->
@@ -66,7 +66,7 @@
 <!-- ENDIF -->
 
 <!-- IF S_CAN_MERGE -->
-	<fieldset id="merge-panel" class="fields2">
+	<fieldset id="merge-panel" class="fields2" role="tabpanel">
 		<p>{L_MERGE_TOPIC_EXPLAIN}</p>
 	<dl>
 		<dt><label for="to_topic_id">{L_MERGE_TOPIC_ID}{L_COLON}</label></dt>
diff --git a/phpBB/styles/prosilver/template/posting_editor.html b/phpBB/styles/prosilver/template/posting_editor.html
index 5d533c6bb1..0e041742ed 100644
--- a/phpBB/styles/prosilver/template/posting_editor.html
+++ b/phpBB/styles/prosilver/template/posting_editor.html
@@ -99,17 +99,17 @@
 	<!-- ENDIF -->
 
 	<!-- IF not S_PRIVMSGS and not S_SHOW_DRAFTS and not $SIG_EDIT eq 1 -->
-		<div id="tabs" class="sub-panels" data-show-panel="<!-- IF SHOW_PANEL -->{SHOW_PANEL}<!-- ELSE -->options-panel<!-- ENDIF -->">
+		<div id="tabs" class="sub-panels" data-show-panel="<!-- IF SHOW_PANEL -->{SHOW_PANEL}<!-- ELSE -->options-panel<!-- ENDIF -->" role="tablist">
 			<ul>
-				<li id="options-panel-tab" class="tab activetab"><a href="#tabs" data-subpanel="options-panel"><span>{L_OPTIONS}</span></a></li>
+				<li id="options-panel-tab" class="tab activetab"><a href="#tabs" data-subpanel="options-panel" role="tab" aria-controls="options-panel"><span>{L_OPTIONS}</span></a></li>
 				<!-- IF S_SHOW_ATTACH_BOX -->
 					<li id="attach-panel-tab" class="tab">
-						<a href="#tabs" data-subpanel="attach-panel">
+						<a href="#tabs" data-subpanel="attach-panel" role="tab" aria-controls="attach-panel">
 							{L_ATTACHMENTS} <strong id="file-total-progress"><strong id="file-total-progress-bar"></strong></strong>
 						</a>
 					</li>				
 				<!-- ENDIF -->
-				<!-- IF S_SHOW_POLL_BOX || S_POLL_DELETE --><li id="poll-panel-tab"><a href="#tabs" data-subpanel="poll-panel"><span>{L_ADD_POLL}</span></a></li><!-- ENDIF -->
+				<!-- IF S_SHOW_POLL_BOX || S_POLL_DELETE --><li id="poll-panel-tab"><a href="#tabs" data-subpanel="poll-panel" role="tab" aria-controls="poll-panel"><span>{L_ADD_POLL}</span></a></li><!-- ENDIF -->
 			</ul>
 		</div>
 	<!-- ENDIF -->
diff --git a/phpBB/styles/prosilver/template/ucp_header.html b/phpBB/styles/prosilver/template/ucp_header.html
index 6fb82774de..a17f145cbc 100644
--- a/phpBB/styles/prosilver/template/ucp_header.html
+++ b/phpBB/styles/prosilver/template/ucp_header.html
@@ -20,7 +20,7 @@
 	<div style="width: 100%;">
 
 	<div id="cp-menu">
-		<div id="navigation">
+		<div id="navigation" role="navigation">
 
 		<!-- IF S_PRIVMSGS -->
 			<!-- BEGIN t_block2 -->