Index: wp-content/plugins/plugin-directory/readme/class-parser.php
===================================================================
--- wp-content/plugins/plugin-directory/readme/class-parser.php	(revision 4462)
+++ wp-content/plugins/plugin-directory/readme/class-parser.php	(working copy)
@@ -359,7 +359,7 @@
 			if ( $this->faq ) {
 				$this->sections['faq'] .= "\n<dl>\n";
 				foreach ( $this->faq as $question => $answer ) {
-					$this->sections['faq'] .= "<dt>{$question}</dt>\n<dd>{$answer}</dd>\n";
+					$this->sections['faq'] .= "<dt><button class=\"button-link\" aria-expanded=\"false\">{$question}</button></dt>\n<dd>{$answer}</dd>\n";
 				}
 				$this->sections['faq'] .= "\n</dl>\n";
 			}
Index: wp-content/themes/pub/wporg-plugins/client/components/plugin/sections/faq/style.scss
===================================================================
--- wp-content/themes/pub/wporg-plugins/client/components/plugin/sections/faq/style.scss	(revision 4462)
+++ wp-content/themes/pub/wporg-plugins/client/components/plugin/sections/faq/style.scss	(working copy)
@@ -16,12 +16,15 @@
 		border-bottom: 1px solid $color__border;
 	}
 
-	dt {
+	.button-link {
 		border-top: 1px solid $color__border;
 		cursor: pointer;
 		font-size: ms( 0 );
 		font-weight: 600;
+		margin-bottom: 1px;
 		padding: 1rem 0;
+		text-align: left;
+		width: 100%;
 
 		&:before {
 			content: "\f347";
@@ -30,6 +33,13 @@
 			margin: 0 1rem;
 		}
 
+		&:focus {
+			border: 0;
+			border-top: 1px solid $color__border;
+			box-shadow: none;
+			outline: none;
+		}
+
 		&.open:before {
 			content: "\f343";
 		}
Index: wp-content/themes/pub/wporg-plugins/css/style-rtl.css
===================================================================
--- wp-content/themes/pub/wporg-plugins/css/style-rtl.css	(revision 4467)
+++ wp-content/themes/pub/wporg-plugins/css/style-rtl.css	(working copy)
@@ -2276,17 +2276,20 @@
   border-bottom: 1px solid #eee;
 }
 
-#faq dt {
+#faq .button-link {
   border-top: 1px solid #eee;
   cursor: pointer;
   font-size: 16px;
   font-size: 1rem;
   font-weight: 600;
+  margin-bottom: 1px;
   padding: 16px 0;
   padding: 1rem 0;
+  text-align: right;
+  width: 100%;
 }
 
-#faq dt:before {
+#faq .button-link:before {
   content: "\f347";
   float: left;
   font-family: dashicons;
@@ -2294,7 +2297,15 @@
   margin: 0 1rem;
 }
 
-#faq dt.open:before {
+#faq .button-link:focus {
+  border: 0;
+  border-top: 1px solid #eee;
+  -webkit-box-shadow: none;
+  box-shadow: none;
+  outline: none;
+}
+
+#faq .button-link.open:before {
   content: "\f343";
 }
 
@@ -3403,4 +3414,4 @@
   .plugin-support .counter-count {
     top: 5px;
   }
-}
+}
\ No newline at end of file
Index: wp-content/themes/pub/wporg-plugins/css/style.css
===================================================================
--- wp-content/themes/pub/wporg-plugins/css/style.css	(revision 4467)
+++ wp-content/themes/pub/wporg-plugins/css/style.css	(working copy)
@@ -2276,17 +2276,20 @@
   border-bottom: 1px solid #eee;
 }
 
-#faq dt {
+#faq .button-link {
   border-top: 1px solid #eee;
   cursor: pointer;
   font-size: 16px;
   font-size: 1rem;
   font-weight: 600;
+  margin-bottom: 1px;
   padding: 16px 0;
   padding: 1rem 0;
+  text-align: left;
+  width: 100%;
 }
 
-#faq dt:before {
+#faq .button-link:before {
   content: "\f347";
   float: right;
   font-family: dashicons;
@@ -2294,7 +2297,15 @@
   margin: 0 1rem;
 }
 
-#faq dt.open:before {
+#faq .button-link:focus {
+  border: 0;
+  border-top: 1px solid #eee;
+  -webkit-box-shadow: none;
+  box-shadow: none;
+  outline: none;
+}
+
+#faq .button-link.open:before {
   content: "\f343";
 }
 
@@ -3404,3 +3415,4 @@
     top: 5px;
   }
 }
+/*# sourceMappingURL=style.css.map */
\ No newline at end of file
Index: wp-content/themes/pub/wporg-plugins/js/section-faq.js
===================================================================
--- wp-content/themes/pub/wporg-plugins/js/section-faq.js	(revision 4462)
+++ wp-content/themes/pub/wporg-plugins/js/section-faq.js	(working copy)
@@ -1,13 +1,13 @@
 ( function( $ ) {
-	$( '#faq' ).on( 'click', 'dt', function( event ) {
+	$( '#faq' ).on( 'click', '.button-link', function( event ) {
 		var $question = $( event.target );
 
 		if ( ! $question.is( '.open' ) ) {
-			$question.siblings( '.open' ).toggleClass( 'open' ).attr( 'aria-expanded', false ).next( 'dd' ).slideToggle( 200 );
+			$question.siblings( '.open' ).toggleClass( 'open' ).attr( 'aria-expanded', false ).parent().next( 'dd' ).slideToggle( 200 );
 		}
 
 		$question.toggleClass( 'open' ).attr( 'aria-expanded', function( index, attribute ) {
 			return 'true' !== attribute;
-		} ).next( 'dd' ).slideToggle( 200 );
+		} ).parent().next( 'dd' ).slideToggle( 200 );
 	});
 } )( jQuery );