diff --git a/css/aggregator/aggregator.theme-rtl.css b/css/aggregator/aggregator.theme-rtl.css
new file mode 100644
index 0000000..f02ae91
--- /dev/null
+++ b/css/aggregator/aggregator.theme-rtl.css
@@ -0,0 +1,3 @@
+.aggregator .feed-icon {
+  float: left;
+}
diff --git a/css/aggregator/aggregator.theme.css b/css/aggregator/aggregator.theme.css
new file mode 100644
index 0000000..e2182ac
--- /dev/null
+++ b/css/aggregator/aggregator.theme.css
@@ -0,0 +1,4 @@
+.aggregator .feed-icon {
+  float: right; /* LTR */
+  display: block;
+}
diff --git a/template.php b/template.php
index 737ffb2..586d33f 100644
--- a/template.php
+++ b/template.php
@@ -5,12 +5,22 @@
  *
  * Backports the following CSS changes made to Drupal 8:
  * - #1216950: Clean up the CSS for Block module.
+ * - #1216948: Clean up the CSS for Aggregator module. 
  *
  */
 function html5_css_alter(&$css) {
   // Path to the theme's CSS directory.
   $dir = drupal_get_path('theme', 'html5') . '/css';
 
+  // Swap out aggregator.css with the aggregator.theme.css provided by this theme.
+  $aggregator = drupal_get_path('module', 'aggregator');
+  if (isset($css[$aggregator . '/aggregator.css'])) {
+    $css[$aggregator . '/aggregator.css']['data'] = $dir . '/aggregator/aggregator.theme.css';
+  }
+  if (isset($css[$aggregator . '/aggregator-rtl.css'])) {
+    $css[$aggregator . '/aggregator-rtl.css']['data'] = $dir . '/aggregator/aggregator.theme-rtl.css';
+  }
+
   // Swap out block.css with the block.admin.css provided by this theme.
   $block = drupal_get_path('module', 'block');
   if (isset($css[$block . '/block.css'])) {
diff --git a/templates/aggregator/aggregator-wrapper.tpl.php b/templates/aggregator/aggregator-wrapper.tpl.php
new file mode 100644
index 0000000..0c2f774
--- /dev/null
+++ b/templates/aggregator/aggregator-wrapper.tpl.php
@@ -0,0 +1,18 @@
+<?php
+
+/**
+ * @file
+ * Default theme implementation to wrap aggregator content.
+ *
+ * Available variables:
+ * - $content: All aggregator content.
+ * - $page: Pager links rendered through theme_pager().
+ *
+ * @see template_preprocess()
+ * @see template_preprocess_aggregator_wrapper()
+ */
+?>
+<div class="aggregator">
+  <?php print $content; ?>
+  <?php print $pager; ?>
+</div>