diff --git a/core/modules/locale/lib/Drupal/locale/Form/TranslateEditForm.php b/core/modules/locale/lib/Drupal/locale/Form/TranslateEditForm.php
index 8cceda8..1f8bc3d 100644
--- a/core/modules/locale/lib/Drupal/locale/Form/TranslateEditForm.php
+++ b/core/modules/locale/lib/Drupal/locale/Form/TranslateEditForm.php
@@ -118,9 +118,9 @@ public function buildForm(array $form, array &$form_state) {
           );
           $form['strings'][$string->lid]['original'] = array(
             '#type' => 'item',
-            '#title' => $this->translator->translate('Source string'),
+            '#title' => $this->translator->translate('Source string (@language)', array('@language' => $this->translator->translate('Built-in English'))),
             '#title_display' => 'invisible',
-            '#markup' => String::checkPlain($source_array[0]),
+            '#markup' => '<span lang="en">' . String::checkPlain($source_array[0]) . '</span>',
           );
         }
         else {
@@ -132,18 +132,19 @@ public function buildForm(array $form, array &$form_state) {
           $form['strings'][$string->lid]['original_singular'] = array(
             '#type' => 'item',
             '#title' => $this->translator->translate('Singular form'),
-            '#markup' => String::checkPlain($source_array[0]),
+            '#markup' => '<span lang="en">' . String::checkPlain($source_array[0]) . '</span>',
+            '#prefix' => '<span class="visually-hidden">' . $this->translator->translate('Source string (@language)', array('@language' => $this->translator->translate('Built-in English'))) . '</span>'
           );
           $form['strings'][$string->lid]['original_plural'] = array(
             '#type' => 'item',
             '#title' => $this->translator->translate('Plural form'),
-            '#markup' => String::checkPlain($source_array[1]),
+            '#markup' => '<span lang="en">' . String::checkPlain($source_array[1]) . '</span>',
           );
         }
         if (!empty($string->context)) {
           $form['strings'][$string->lid]['context'] = array(
             '#type' => 'value',
-            '#value' => String::checkPlain($string->context),
+            '#value' => '<span lang="en">' . String::checkPlain($string->context) . '</span>',
           );
         }
         // Approximate the number of rows to use in the default textarea.
@@ -151,10 +152,11 @@ public function buildForm(array $form, array &$form_state) {
         if (empty($form['strings'][$string->lid]['plural']['#value'])) {
           $form['strings'][$string->lid]['translations'][0] = array(
             '#type' => 'textarea',
-            '#title' => $this->translator->translate('Translated string'),
+            '#title' => $this->translator->translate('Translated string (@language)', array('@language' => $langname)),
             '#title_display' => 'invisible',
             '#rows' => $rows,
             '#default_value' => $translation_array[0],
+            '#attributes' => array('lang' => $langcode),
           );
         }
         else {
@@ -167,6 +169,8 @@ public function buildForm(array $form, array &$form_state) {
                 '#title' => ($i == 0 ? $this->translator->translate('Singular form') : format_plural($i, 'First plural form', '@count. plural form')),
                 '#rows' => $rows,
                 '#default_value' => isset($translation_array[$i]) ? $translation_array[$i] : '',
+                '#attributes' => array('lang' => $langcode),
+                '#prefix' => $i == 0 ? ('<span class="visually-hidden">' . $this->translator->translate('Translated string (@language)',  array('@language' => $langname)) . '</span>') : '',
               );
             }
           }
@@ -177,12 +181,15 @@ public function buildForm(array $form, array &$form_state) {
               '#title' => $this->translator->translate('Singular form'),
               '#rows' => $rows,
               '#default_value' => $translation_array[0],
+              '#attributes' => array('lang' => $langcode),
+              '#prefix' => '<span class="visually-hidden">' . $this->translator->translate('Translated string (@language)',  array('@language' => $langname)) . '</span>',
             );
             $form['strings'][$string->lid]['translations'][1] = array(
               '#type' => 'textarea',
               '#title' => $this->translator->translate('Plural form'),
               '#rows' => $rows,
               '#default_value' => isset($translation_array[1]) ? $translation_array[1] : '',
+              '#attributes' => array('lang' => $langcode),
             );
           }
         }
diff --git a/core/modules/locale/lib/Drupal/locale/Form/TranslateFilterForm.php b/core/modules/locale/lib/Drupal/locale/Form/TranslateFilterForm.php
index 92ca824..40db3a3 100644
--- a/core/modules/locale/lib/Drupal/locale/Form/TranslateFilterForm.php
+++ b/core/modules/locale/lib/Drupal/locale/Form/TranslateFilterForm.php
@@ -29,7 +29,7 @@ public function buildForm(array $form, array &$form_state) {
     $filter_values = $this->translateFilterValues($this->request);
 
     $form['#attached']['css'] = array(
-      drupal_get_path('module', 'locale') . '/locale.admin.css',
+      drupal_get_path('module', 'locale') . '/css/locale.admin.css',
     );
 
     $form['filters'] = array(