diff --git a/includes/faq-category-questions-inline.tpl.php b/includes/faq-category-questions-inline.tpl.php
index 3970611..5e1806e 100644
--- a/includes/faq-category-questions-inline.tpl.php
+++ b/includes/faq-category-questions-inline.tpl.php
@@ -130,15 +130,15 @@ else {
       </div> <!-- Close div: faq-question -->
 
       <div class="faq-answer">
-      <?php if (!empty($answer_label)): ?>
-        <strong class="faq-answer-label">
-        <?php print $answer_label; ?>
-        </strong>
-      <?php endif; ?>
-      <?php print $node['body']; ?>
-      <?php if (isset($node['links'])): ?>
-        <?php print $node['links']; ?>
-      <?php endif; ?>
+        <?php if (!empty($answer_label)): ?>
+          <strong class="faq-answer-label">
+            <?php print $answer_label; ?>
+          </strong>
+        <?php endif; ?>
+        <?php print $node['body']; ?>
+        <?php if (isset($node['links'])): ?>
+          <?php print $node['links']; ?>
+        <?php endif; ?>
       </div> <!-- Close div: faq-answer -->
     <?php endforeach; ?>
   <?php endif; ?>
diff --git a/includes/faq-category-questions-top.tpl.php b/includes/faq-category-questions-top.tpl.php
index c0424c9..2481f36 100644
--- a/includes/faq-category-questions-top.tpl.php
+++ b/includes/faq-category-questions-top.tpl.php
@@ -157,15 +157,24 @@ else {
     <?php foreach ($nodes as $i => $node): ?>
 
       <div class="faq-question"><?php // Strong question label here? ?>
+        <?php if (!empty($question_label)) : ?>
+          <strong class="faq-question-label">
+            <?php print $question_label; ?>
+          </strong>
+        <?php endif; ?>
       <?php print $node['question']; ?>
       </div> <!-- Close div: faq-question -->
 
       <div class="faq-answer">
-      <strong><?php print $answer_label; ?></strong>
-      <?php print $node['body']; ?>
-      <?php if (isset($node['links'])): ?>
-        <?php print $node['links']; ?>
-      <?php endif; ?>
+        <?php if (!empty($answer_label)) : ?>
+          <strong class="faq-answer-label">
+            <?php print $answer_label; ?>
+          </strong>
+        <?php endif; ?>
+        <?php print $node['body']; ?>
+        <?php if (isset($node['links'])): ?>
+          <?php print $node['links']; ?>
+        <?php endif; ?>
       </div> <!-- Close div: faq-answer -->
     <?php endforeach; ?>
   <?php endif; ?>
diff --git a/includes/faq.questions_top.inc b/includes/faq.questions_top.inc
index d2681d5..b31d68f 100644
--- a/includes/faq.questions_top.inc
+++ b/includes/faq.questions_top.inc
@@ -76,6 +76,14 @@ function template_preprocess_faq_category_questions_top(&$variables) {
   $show_term_page_children = variable_get('faq_show_term_page_children', FALSE);
   $group_questions_top = variable_get('faq_group_questions_top', FALSE);
   $default_sorting = variable_get('faq_default_sorting', 'DESC');
+  
+  // Configure labels.
+  $variables['question_label'] = '';
+  $variables['answer_label'] = '';
+  if (variable_get('faq_qa_mark', FALSE)) {
+    $variables['question_label'] = check_plain(variable_get('faq_question_label', "Q:"));
+    $variables['answer_label'] = check_plain(variable_get('faq_answer_label', "A:"));
+  }
 
   // Initialise some variables.
   $default_weight = 0;