diff --git a/core/modules/file/file.module b/core/modules/file/file.module
index 769d480..0d6ea1e 100644
--- a/core/modules/file/file.module
+++ b/core/modules/file/file.module
@@ -1607,8 +1607,9 @@ function theme_file_icon($variables) {
   $icon_directory = $variables['icon_directory'];
 
   $mime = check_plain($file->getMimeType());
+  $title = !empty($file->filename) ? check_plain($file->filename) : '';
   $icon_url = file_icon_url($file, $icon_directory);
-  return '<img class="file-icon" alt="" title="' . $mime . '" src="' . $icon_url . '" />';
+  return '<img class="file-icon" alt="' . $mime . '" title="' . $title . '" src="' . $icon_url . '" />';
 }
 
 /**
diff --git a/core/modules/file/lib/Drupal/file/Tests/FileFieldDisplayTest.php b/core/modules/file/lib/Drupal/file/Tests/FileFieldDisplayTest.php
index f6c399d..7ce188d 100644
--- a/core/modules/file/lib/Drupal/file/Tests/FileFieldDisplayTest.php
+++ b/core/modules/file/lib/Drupal/file/Tests/FileFieldDisplayTest.php
@@ -58,6 +58,7 @@ function testNodeDisplay() {
 
     // Check that the default formatter is displaying with the file name.
     $node = node_load($nid, TRUE);
+
     $node_file = file_load($node->{$field_name}->target_id);
     $file_link = array(
       '#theme' => 'file_link',
@@ -66,6 +67,11 @@ function testNodeDisplay() {
     $default_output = drupal_render($file_link);
     $this->assertRaw($default_output, 'Default formatter displaying correctly on full node view.');
 
+    $this->assertRaw('title="' . $node_file->filename . '"', t('Theme icon includes title attribute correctly'));
+    $this->assertRaw('type="' . $node_file->filemime . '; length=' . $node_file->filesize . '"', t('File link includes type attribute correctly'));
+    $this->assertRaw('href="' . file_create_url($node_file->uri) .'"', t('File link includes href attribute correctly'));
+    $this->assertRaw($default_output, t('Default formatter displaying correctly on full node view.'));
+
     // Turn the "display" option off and check that the file is no longer displayed.
     $edit = array($field_name . '[0][display]' => FALSE);
     $this->drupalPostForm('node/' . $nid . '/edit', $edit, t('Save and keep published'));