diff --git a/core/modules/content_translation/content_translation.admin.inc b/core/modules/content_translation/content_translation.admin.inc
index b1b5f6de3d..f7491fa690 100644
--- a/core/modules/content_translation/content_translation.admin.inc
+++ b/core/modules/content_translation/content_translation.admin.inc
@@ -141,8 +141,6 @@ function _content_translation_form_language_content_settings_form_alter(array &$
           if ($definition->isComputed() || (!empty($storage_definitions[$field_name]) && _content_translation_is_field_translatability_configurable($entity_type, $storage_definitions[$field_name]))) {
             $form['settings'][$entity_type_id][$bundle]['fields'][$field_name] = [
               '#title' => $definition->getLabel(),
-              // @todo Remove this?
-              '#label' => $definition->getLabel(),
               '#type' => 'checkbox',
               '#default_value' => $definition->isTranslatable(),
             ];
diff --git a/core/modules/field_ui/src/Form/EntityDisplayFormBase.php b/core/modules/field_ui/src/Form/EntityDisplayFormBase.php
index 009316e32e..bc1e9c0ad4 100644
--- a/core/modules/field_ui/src/Form/EntityDisplayFormBase.php
+++ b/core/modules/field_ui/src/Form/EntityDisplayFormBase.php
@@ -460,6 +460,9 @@ protected function buildFieldRow(FieldDefinitionInterface $field_definition, arr
             '#title' => $this->t('Edit'),
             '#name' => $field_name . '_settings_edit',
             '#src' => 'core/misc/icons/787878/cog.svg',
+            // The title will be copied to the 'alt' tag in
+            // \Drupal\Core\Render\Element\ImageButton::preRenderButton(), so
+            // there's no need to do it here.
             '#attributes' => ['class' => ['field-plugin-settings-edit']],
             '#op' => 'edit',
             // Do not check errors for the 'Edit' button, but make sure we get
diff --git a/core/modules/language/src/Form/ContentLanguageSettingsForm.php b/core/modules/language/src/Form/ContentLanguageSettingsForm.php
index 0b74ef81e4..341ee97ad3 100644
--- a/core/modules/language/src/Form/ContentLanguageSettingsForm.php
+++ b/core/modules/language/src/Form/ContentLanguageSettingsForm.php
@@ -148,8 +148,6 @@ public function buildForm(array $form, FormStateInterface $form_state) {
       foreach ($bundles[$entity_type_id] as $bundle => $bundle_info) {
         $form['settings'][$entity_type_id][$bundle]['settings'] = [
           '#type' => 'item',
-          // @todo Remove this?
-          '#label' => $bundle_info['label'],
           '#title' => $bundle_info['label'],
           '#title_display' => 'invisible',
           'language' => [
diff --git a/core/modules/node/src/Plugin/Search/NodeSearch.php b/core/modules/node/src/Plugin/Search/NodeSearch.php
index 47ef8c2baa..1137e24aa6 100644
--- a/core/modules/node/src/Plugin/Search/NodeSearch.php
+++ b/core/modules/node/src/Plugin/Search/NodeSearch.php
@@ -859,8 +859,6 @@ public function buildConfigurationForm(array $form, FormStateInterface $form_sta
         '#title' => $this->t("Influence of '@title'", ['@title' => $values['title']]),
         '#title_display' => 'invisible',
         '#options' => $options,
-        // @todo Is this still necessary with the invisible title?
-        '#attributes' => ['aria-label' => $this->t("Influence of '@title'", ['@title' => $values['title']])],
         '#default_value' => isset($this->configuration['rankings'][$var]) ? $this->configuration['rankings'][$var] : 0,
       ];
     }