diff --git a/core/modules/action/src/ActionListBuilder.php b/core/modules/action/src/ActionListBuilder.php
index 2d3af86..900ad44 100644
--- a/core/modules/action/src/ActionListBuilder.php
+++ b/core/modules/action/src/ActionListBuilder.php
@@ -113,10 +113,10 @@ public function getDefaultOperations(EntityInterface $entity) {
    * {@inheritdoc}
    */
   public function render() {
-    $build['action_header']['#markup'] = '<h3>' . t('Available actions:') . '</h3>';
+    $build['action_header']['#markup'] = '<h3>' . $this->t('Available actions:') . '</h3>';
     $build['action_table'] = parent::render();
     if (!$this->hasConfigurableActions) {
-      unset($build['action_table']['#header']['operations']);
+      unset($build['action_table']['table']['#header']['operations']);
     }
     $build['action_admin_manage_form'] = \Drupal::formBuilder()->getForm('Drupal\action\Form\ActionAdminManageForm');
     return $build;
diff --git a/core/modules/action/src/Tests/ActionListTest.php b/core/modules/action/src/Tests/ActionListTest.php
new file mode 100644
index 0000000..3c94693
--- /dev/null
+++ b/core/modules/action/src/Tests/ActionListTest.php
@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\action\Tests\ActionListTest.
+ */
+
+namespace Drupal\action\Tests;
+
+use Drupal\system\Entity\Action;
+use Drupal\simpletest\WebTestBase;
+
+/**
+ * Test behaviors when visiting the action listing page.
+ *
+ * @group action
+ */
+class ActionListTest extends WebTestBase {
+
+  /**
+   * Modules to install.
+   *
+   * @var array
+   */
+  public static $modules = array('action');
+
+  /**
+   * Tests the behavior when there are no actions to list in the admin page.
+   */
+  function testEmptyActionList() {
+    // Create a user with permission to view the actions administration pages.
+    $this->drupalLogin(
+      $this->drupalCreateUser(array('administer actions'))
+    );
+
+    // Ensure the empty text appears on the action list page.
+    $actions = Action::loadMultiple();
+    entity_delete_multiple('action', array_keys($actions));
+    $this->drupalGet('/admin/config/system/actions');
+    $this->assertRaw('There is no Action yet.');
+  }
+}
diff --git a/core/modules/image/src/ImageStyleListBuilder.php b/core/modules/image/src/ImageStyleListBuilder.php
index b0ad227..085cb1c 100644
--- a/core/modules/image/src/ImageStyleListBuilder.php
+++ b/core/modules/image/src/ImageStyleListBuilder.php
@@ -9,9 +9,7 @@
 
 use Drupal\Core\Config\Entity\ConfigEntityListBuilder;
 use Drupal\Core\Entity\EntityInterface;
-use Drupal\Core\Entity\EntityStorageInterface;
-use Drupal\Core\Entity\EntityTypeInterface;
-use Drupal\Core\Routing\UrlGeneratorInterface;
+use Drupal\Core\Url;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
@@ -22,40 +20,6 @@
 class ImageStyleListBuilder extends ConfigEntityListBuilder {
 
   /**
-   * The URL generator.
-   *
-   * @var \Drupal\Core\Routing\UrlGeneratorInterface
-   */
-  protected $urlGenerator;
-
-  /**
-   * Constructs a new ImageStyleListBuilder object.
-   *
-   * @param EntityTypeInterface $entity_type
-   *   The entity type definition.
-   * @param \Drupal\Core\Entity\EntityStorageInterface $image_style_storage
-   *   The image style entity storage class.
-   * @param \Drupal\Core\Routing\UrlGeneratorInterface $url_generator
-   *   The URL generator.
-   */
-  public function __construct(EntityTypeInterface $entity_type, EntityStorageInterface $image_style_storage, UrlGeneratorInterface $url_generator) {
-    parent::__construct($entity_type, $image_style_storage);
-    $this->urlGenerator = $url_generator;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function createInstance(ContainerInterface $container, EntityTypeInterface $entity_type) {
-    return new static(
-      $entity_type,
-      $container->get('entity.manager')->getStorage($entity_type->id()),
-      $container->get('url_generator'),
-      $container->get('string_translation')
-    );
-  }
-
-  /**
    * {@inheritdoc}
    */
   public function buildHeader() {
@@ -91,9 +55,9 @@ public function getDefaultOperations(EntityInterface $entity) {
    */
   public function render() {
     $build = parent::render();
-    $build['#empty'] = $this->t('There are currently no styles. <a href="!url">Add a new one</a>.', array(
-      '!url' => $this->urlGenerator->generateFromPath('admin/config/media/image-styles/add'),
-    ));
+    $build['table']['#empty'] = $this->t('There are currently no styles. <a href="@url">Add a new one</a>.', [
+      '@url' => Url::fromRoute('image.style_add')->toString()
+    ]);
     return $build;
   }
 
diff --git a/core/modules/image/src/Tests/ImageAdminStylesTest.php b/core/modules/image/src/Tests/ImageAdminStylesTest.php
index 194c016..28a322d 100644
--- a/core/modules/image/src/Tests/ImageAdminStylesTest.php
+++ b/core/modules/image/src/Tests/ImageAdminStylesTest.php
@@ -273,6 +273,11 @@ function testStyle() {
 
     $this->assertFalse(ImageStyle::load($style_name), format_string('Image style %style successfully deleted.', array('%style' => $style->label())));
 
+    // Ensure the empty text appears on the image style admin page.
+    $styles = ImageStyle::loadMultiple();
+    entity_delete_multiple('image_style', array_keys($styles));
+    $this->drupalGet($admin_path);
+    $this->assertRaw(t('There are currently no styles. <a href="@url">Add a new one</a>.', array('@url' => \Drupal::url('image.style_add'))));
   }
 
   /**