Pablo López
--- a/core/modules/navigation/src/Form/SettingsForm.php
+++ b/core/modules/navigation/src/Form/SettingsForm.php
+    $logo_managed = $form_state->getValue('logo_managed');
+    $config = $this->config('navigation.settings');
+    if (empty($logo_managed)) {
+      return;
+    }
+
+    // Skip if the fid has not been modified.
+    $fid = reset($logo_managed);
+    if ($fid == $config->get('logo_managed')) {
+      return;
+    }
+
+    $file = $this->entityTypeManager->getStorage('file')
+      ->load($fid);
+    if ($fid && !$this->adjustLogoDimensions($file)) {
+      /* cspell:disable-next-line */
--- a/core/modules/navigation/tests/src/FunctionalJavascript/NavigationSettingsFormTest.php 0 → 100644
+++ b/core/modules/navigation/tests/src/FunctionalJavascript/NavigationSettingsFormTest.php 0 → 100644
+    // saved as permanent if settings are not submitted.
+    $image_field = $this->assertSession()->hiddenFieldExists('logo_managed[fids]');
+    $file = File::load($image_field->getValue());
+    $this->assertFalse($file->isPermanent());
+
+    $page->pressButton('Save configuration');
+    \Drupal::entityTypeManager()->getStorage('file')->resetCache();
+
+    $this->drupalGet("/admin/config/user-interface/navigation/settings");
+
+    // Assert the uploaded file is saved as permanent.
+    $image_field = $this->assertSession()->hiddenFieldExists('logo_managed[fids]');
+    $file = File::load($image_field->getValue());
+    $this->assertTrue($file->isPermanent());
+
+    // Ensure that image has been resized to fit in the expected container.
-    // Ensure that image has been resized to fit in the expected container.
+    // Ensure that the image has been resized to fit in the expected container.
--- a/core/modules/navigation/navigation.post_update.php
+++ b/core/modules/navigation/navigation.post_update.php
    return $needs_save;
  });
 }
+
+/**
+ * Defines the values for the default logo dimensions and adjust the logo.
- * Defines the values for the default logo dimensions and adjust the logo.
+ * Defines the values for the default logo dimensions.
--- a/core/modules/navigation/src/Form/SettingsForm.php
+++ b/core/modules/navigation/src/Form/SettingsForm.php
+    $logo_managed = $form_state->getValue('logo_managed');
+    $config = $this->config('navigation.settings');
+    if (empty($logo_managed)) {
+      return;
+    }
+
+    // Skip if the fid has not been modified.
+    $fid = reset($logo_managed);
+    if ($fid == $config->get('logo_managed')) {
+      return;
+    }
+
+    $file = $this->entityTypeManager->getStorage('file')
+      ->load($fid);
+    if ($fid && !$this->adjustLogoDimensions($file)) {
+      $form_state->setErrorByName('logo_managed', 'Image dimensions are bigger than the expected %widthx%heightpx and cannot be used as Navigation logo');