diff --git a/core/modules/toolbar/lib/Drupal/toolbar/Tests/ToolbarMenuTranslationTest.php b/core/modules/toolbar/lib/Drupal/toolbar/Tests/ToolbarMenuTranslationTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..a11eaab29c8285ce27306403774dfa5f7577236a
--- /dev/null
+++ b/core/modules/toolbar/lib/Drupal/toolbar/Tests/ToolbarMenuTranslationTest.php
@@ -0,0 +1,100 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\toolbar\Tests\ToolbarMenuTranslationTest.
+ */
+
+namespace Drupal\toolbar\Tests;
+
+use Drupal\simpletest\WebTestBase;
+
+/**
+ * Tests maintaining inclusion of icons for translated menu items.
+ */
+class ToolbarMenuTranslationTest extends WebTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('toolbar', 'toolbar_test', 'locale');
+
+  public static function getInfo() {
+    return array(
+      'name' => 'Toolbar menu translation',
+      'description' => 'Tests that the toolbar icon class remains for translated menu items.',
+      'group' => 'Toolbar',
+    );
+  }
+
+  function setUp() {
+    parent::setUp();
+
+    // Create an administrative user and log it in.
+    $this->admin_user = $this->drupalCreateUser(array('access toolbar', 'translate interface', 'administer languages', 'access administration pages'));
+    $this->drupalLogin($this->admin_user);
+  }
+
+  /**
+   * Tests that toolbar classes don't change when adding a translation.
+   */
+  function testToolbarClasses() {
+    $langcode = 'es';
+
+    // Add Spanish.
+    $edit['predefined_langcode'] = $langcode;
+    $this->drupalPost('admin/config/regional/language/add', $edit, t('Add language'));
+
+    // The menu item 'Structure' in the toolbar will be translated.
+    $menu_item = 'Structure';
+
+    // Visit a page that has the string on it so it can be translated.
+    $this->drupalGet($langcode . '/admin/structure');
+
+    // Search for the menu item.
+    $search = array(
+      'string' => $menu_item,
+      'langcode' => $langcode,
+      'translation' => 'untranslated',
+    );
+    $this->drupalPost('admin/config/regional/translate/translate', $search, t('Filter'));
+    // Make sure will be able to translate the menu item.
+    $this->assertNoText('No strings available.', 'Search found the menu item as untranslated.');
+
+    // Check that the class is on the item before we translate it.
+    $xpath = $this->xpath('//a[contains(@class, "icon-structure")]');
+    $this->assertEqual(count($xpath), 1, 'The menu item class ok before translation.');
+
+    // Translate the menu item.
+    $menu_item_translated = $this->randomName();
+    $textarea = current($this->xpath('//textarea'));
+    $lid = (string) $textarea[0]['name'];
+    $edit = array(
+      $lid => $menu_item_translated,
+    );
+    $this->drupalPost('admin/config/regional/translate/translate', $edit, t('Save translations'));
+
+    // Search for the translated menu item.
+    $search = array(
+      'string' => $menu_item,
+      'langcode' => $langcode,
+      'translation' => 'translated',
+    );
+    $this->drupalPost('admin/config/regional/translate/translate', $search, t('Filter'));
+    // Make sure the menu item string was translated.
+    $this->assertText($menu_item_translated, 'Search found the menu item as translated: ' . $menu_item_translated . '.');
+
+    // Go to another page in the custom language and make sure the menu item
+    // was translated.
+    $this->drupalGet($langcode . '/admin/structure');
+    $this->assertText($menu_item_translated, t('Found the menu translated.'));
+
+    // Toolbar icons are included based on the presence of a specific class on
+    // the menu item. Ensure that class also exists for a translated menu item.
+    $xpath = $this->xpath('//a[contains(@class, "icon-structure")]');
+    $this->assertEqual(count($xpath), 1, 'The menu item class is the same.');
+  }
+
+}
diff --git a/core/modules/toolbar/toolbar.module b/core/modules/toolbar/toolbar.module
index e543326c08fc8de7b33bec615c2898d4f14ad6f9..9096485e852b1df442af729f33aaa8c214c1e117 100644
--- a/core/modules/toolbar/toolbar.module
+++ b/core/modules/toolbar/toolbar.module
@@ -391,7 +391,7 @@ function toolbar_menu_navigation_links(&$tree) {
       'id' => 'toolbar-link-' . str_replace(array('/', '<', '>'), array('-', '', ''), $item['link']['link_path']),
       'class' => array(
         'icon',
-        'icon-' . strtolower(str_replace(' ', '-', $item['link']['title'])),
+        'icon-' . strtolower(str_replace(' ', '-', $item['link']['link_title'])),
       ),
     );
   }