diff --git a/core/modules/poll/poll-bar--block.tpl.php b/core/modules/poll/poll-bar--block.tpl.php
deleted file mode 100644
index 3b91afc..0000000
--- a/core/modules/poll/poll-bar--block.tpl.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-/**
- * @file
- * Default theme implementation to display the bar for a single choice in a
- * poll.
- *
- * Variables available:
- * - $title: The title of the poll.
- * - $votes: The number of votes for this choice
- * - $total_votes: The number of votes for this choice
- * - $percentage: The percentage of votes for this choice.
- * - $vote: The choice number of the current user's vote.
- * - $voted: Set to TRUE if the user voted for this choice.
- *
- * @see template_preprocess_poll_bar()
- */
-?>
-
-<div class="text"><?php print $title; ?></div>
-<div class="bar">
-  <div style="width: <?php print $percentage; ?>%;" class="foreground"></div>
-</div>
-<div class="percent">
-  <?php print $percentage; ?>%
-</div>
diff --git a/core/modules/poll/poll-bar.tpl.php b/core/modules/poll/poll-bar.tpl.php
index 9426ff5..02047c4 100644
--- a/core/modules/poll/poll-bar.tpl.php
+++ b/core/modules/poll/poll-bar.tpl.php
@@ -17,10 +17,10 @@
  */
 ?>
 
-<div class="text"><?php print $title; ?></div>
-<div class="bar">
-  <div style="width: <?php print $percentage; ?>%;" class="foreground"></div>
-</div>
-<div class="percent">
-  <?php print $percentage; ?>% (<?php print format_plural($votes, '1 vote', '@count votes'); ?>)
-</div>
+<div class="choice-title"><?php print $title; ?></div>
+<meter class="bar" min="0" max="<?php print $total_votes; ?>" value="<?php print $votes; ?>">
+  <?php print $percentage; ?>%
+  <?php if ($block): ?>
+    (<?php print format_plural($votes, '1 vote', '@count votes'); ?>)
+  <?php endif; ?>
+</meter>
diff --git a/core/modules/poll/poll-results--block.tpl.php b/core/modules/poll/poll-results--block.tpl.php
deleted file mode 100644
index f8387f5..0000000
--- a/core/modules/poll/poll-results--block.tpl.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
- * @file
- * Default theme implementation to display the poll results in a block.
- *
- * Variables available:
- * - $title: The title of the poll.
- * - $results: The results of the poll.
- * - $votes: The total results in the poll.
- * - $links: Links in the poll.
- * - $nid: The nid of the poll
- * - $cancel_form: A form to cancel the user's vote, if allowed.
- * - $raw_links: The raw array of links. Should be run through theme('links')
- *   if used.
- * - $vote: The choice number of the current user's vote.
- *
- * @see template_preprocess_poll_results()
- */
-?>
-
-<div class="poll">
-  <div class="title"><?php print $title ?></div>
-  <?php print $results ?>
-  <div class="total">
-    <?php print t('Total votes: @votes', array('@votes' => $votes)); ?>
-  </div>
-</div>
-<div class="links"><?php print $links; ?></div>
diff --git a/core/modules/poll/poll-results.tpl.php b/core/modules/poll/poll-results.tpl.php
index 5e14dec..9fdfbd6 100644
--- a/core/modules/poll/poll-results.tpl.php
+++ b/core/modules/poll/poll-results.tpl.php
@@ -17,7 +17,10 @@
  * @see template_preprocess_poll_results()
  */
 ?>
-<div class="poll">
+<article class="poll">
+  <?php if ($block): ?>
+    <h3 class="poll-title"><?php print $title; ?></h3>
+  <?php endif; ?>
   <?php print $results; ?>
   <div class="total">
     <?php print t('Total votes: @votes', array('@votes' => $votes)); ?>
@@ -25,4 +28,7 @@
   <?php if (!empty($cancel_form)): ?>
     <?php print $cancel_form; ?>
   <?php endif; ?>
-</div>
+</article>
+<?php if($block): ?>
+  <div class="links"><?php print $links; ?></div>
+<?php endif; ?>
diff --git a/core/modules/poll/poll-rtl.css b/core/modules/poll/poll-rtl.css
index 14d42e6..4a46526 100644
--- a/core/modules/poll/poll-rtl.css
+++ b/core/modules/poll/poll-rtl.css
@@ -5,6 +5,3 @@
 .poll .percent {
   text-align: left;
 }
-.poll .vote-form .choices {
-  text-align: right;
-}
diff --git a/core/modules/poll/poll-vote.tpl.php b/core/modules/poll/poll-vote.tpl.php
index 068ff7c..a749f91 100644
--- a/core/modules/poll/poll-vote.tpl.php
+++ b/core/modules/poll/poll-vote.tpl.php
@@ -14,16 +14,16 @@
  * @see template_preprocess_poll_vote()
  */
 ?>
-<div class="poll">
+<article class="poll">
   <div class="vote-form">
-    <div class="choices">
-      <?php if ($block): ?>
-        <div class="title"><?php print $title; ?></div>
-      <?php endif; ?>
-      <?php print $choice; ?>
-    </div>
+
+    <?php if ($block): ?>
+      <h3 class="poll-title"><?php print $title; ?></h3>
+    <?php endif; ?>
+    <?php print $choice; ?>
+
     <?php print $vote; ?>
   </div>
   <?php // This is the 'rest' of the form, in case items have been added. ?>
   <?php print $rest ?>
-</div>
+</article>
diff --git a/core/modules/poll/poll.css b/core/modules/poll/poll.css
index 8b04e38..8e71ac2 100644
--- a/core/modules/poll/poll.css
+++ b/core/modules/poll/poll.css
@@ -3,14 +3,7 @@
   overflow: hidden;
 }
 .poll .bar {
-  height: 1em;
-  margin: 1px 0;
-  background-color: #ddd;
-}
-.poll .bar .foreground {
-  background-color: #000;
-  height: 1em;
-  float: left; /* LTR */
+  width: 100%;
 }
 .poll .links {
   text-align: center;
@@ -24,12 +17,7 @@
 .poll .vote-form {
   text-align: center;
 }
-.poll .vote-form .choices {
-  text-align: left; /* LTR */
-  margin: 0 auto;
-  display: table;
-}
-.poll .vote-form .choices .title {
+.poll .vote-form .poll-title {
   font-weight: bold;
 }
 .node-form #edit-poll-more {
diff --git a/core/modules/poll/poll.module b/core/modules/poll/poll.module
index ec5452e..40e1cfe 100644
--- a/core/modules/poll/poll.module
+++ b/core/modules/poll/poll.module
@@ -47,20 +47,7 @@ function poll_theme() {
       'variables' => array('title' => NULL, 'votes' => NULL, 'total_votes' => NULL, 'vote' => NULL, 'block' => NULL),
     ),
   );
-  // The theme system automatically discovers the theme's functions and
-  // templates that implement more targeted "suggestions" of generic theme
-  // hooks. But suggestions implemented by a module must be explicitly
-  // registered.
-  $theme_hooks += array(
-    'poll_results__block' => array(
-      'template' => 'poll-results--block',
-      'variables' => $theme_hooks['poll_results']['variables'],
-    ),
-    'poll_bar__block' => array(
-      'template' => 'poll-bar--block',
-      'variables' => $theme_hooks['poll_bar']['variables'],
-    ),
-  );
+
   return $theme_hooks;
 }
 
@@ -903,10 +890,6 @@ function template_preprocess_poll_results(&$variables) {
     $variables['cancel_form'] = drupal_render($elements);
   }
   $variables['title'] = check_plain($variables['raw_title']);
-
-  if ($variables['block']) {
-    $variables['theme_hook_suggestions'][] = 'poll_results__block';
-  }
 }
 
 /**
@@ -919,9 +902,6 @@ function template_preprocess_poll_results(&$variables) {
  * @see theme_poll_bar()
  */
 function template_preprocess_poll_bar(&$variables) {
-  if ($variables['block']) {
-    $variables['theme_hook_suggestions'][] = 'poll_bar__block';
-  }
   $variables['title'] = check_plain($variables['title']);
   $variables['percentage'] = round($variables['votes'] * 100 / max($variables['total_votes'], 1));
 }