diff --git a/app/code/Magento/Theme/Model/Design/Backend/Favicon.php b/app/code/Magento/Theme/Model/Design/Backend/Favicon.php
index e7067aae785efa0468f85019473854806490141e..9579eadafe222908f71ddd1f8ac4d754f432798b 100644
--- a/app/code/Magento/Theme/Model/Design/Backend/Favicon.php
+++ b/app/code/Magento/Theme/Model/Design/Backend/Favicon.php
@@ -41,7 +41,7 @@ class Favicon extends File
      *
      * @return string[]
      */
-    protected function _getAllowedExtensions()
+    public function getAllowedExtensions()
     {
         return ['ico', 'png', 'gif', 'jpg', 'jpeg', 'apng', 'svg'];
     }
diff --git a/app/code/Magento/Theme/Model/Design/Backend/File.php b/app/code/Magento/Theme/Model/Design/Backend/File.php
index 48eb89bae2cefbd24a6ba85f47a7a5d0b2fa4840..bb8a2b90a776b0abaec9b5050892634ccc126168 100644
--- a/app/code/Magento/Theme/Model/Design/Backend/File.php
+++ b/app/code/Magento/Theme/Model/Design/Backend/File.php
@@ -134,7 +134,6 @@ class File extends BackendFile
     protected function _getUploadDir()
     {
         $fieldConfig = $this->getFieldConfig();
-        /* @var $fieldConfig \Magento\Framework\Simplexml\Element */
 
         if (!array_key_exists('upload_dir', $fieldConfig)) {
             throw new \Magento\Framework\Exception\LocalizedException(
@@ -142,9 +141,12 @@ class File extends BackendFile
             );
         }
 
+        $uploadDir = (string)$fieldConfig['upload_dir'];
         if (is_array($fieldConfig['upload_dir'])) {
             $uploadDir = $fieldConfig['upload_dir']['value'];
-            if (array_key_exists('scope_info', $fieldConfig['upload_dir']) && $fieldConfig['upload_dir']['scope_info']
+            if (
+                array_key_exists('scope_info', $fieldConfig['upload_dir'])
+                && $fieldConfig['upload_dir']['scope_info']
             ) {
                 $uploadDir = $this->_appendScopeInfo($uploadDir);
             }
@@ -152,8 +154,6 @@ class File extends BackendFile
             if (array_key_exists('config', $fieldConfig['upload_dir'])) {
                 $uploadDir = $this->_mediaDirectory->getRelativePath($uploadDir);
             }
-        } else {
-            $uploadDir = (string)$fieldConfig['upload_dir'];
         }
 
         return $uploadDir;
diff --git a/app/code/Magento/Theme/Model/Design/Backend/Logo.php b/app/code/Magento/Theme/Model/Design/Backend/Logo.php
index 55e5a5b62ce4c01dd612a6ff00bb723b1b40e108..95da4e6e5ddb5da30434c2c84fc24cd7784e9bd2 100644
--- a/app/code/Magento/Theme/Model/Design/Backend/Logo.php
+++ b/app/code/Magento/Theme/Model/Design/Backend/Logo.php
@@ -39,7 +39,7 @@ class Logo extends File
      *
      * @return string[]
      */
-    protected function _getAllowedExtensions()
+    public function getAllowedExtensions()
     {
         return ['jpg', 'jpeg', 'gif', 'png', 'svg'];
     }