diff --git a/application/core/LsDefaultDataSets.php b/application/core/LsDefaultDataSets.php
index 75c196fc17c..cb6bd97119e 100644
--- a/application/core/LsDefaultDataSets.php
+++ b/application/core/LsDefaultDataSets.php
@@ -168,7 +168,7 @@ public static function getTemplateConfigurationData()
             'files_css'         => '{"add":["css/ajaxify.css","css/theme.css","css/custom.css"]}',
             'files_js'          =>  '{"add":["scripts/theme.js","scripts/ajaxify.js","scripts/custom.js"]}',
             'files_print_css'   => '{"add":["css/print_theme.css"]}',
-            'options'           => '{"ajaxmode":"on","brandlogo":"on","container":"on", "hideprivacyinfo": "off", "brandlogofile":"./files/logo.png","font":"noto", "showpopups":"1", "showclearall":"off", "questionhelptextposition":"top"}',
+            'options'           => '{"ajaxmode":"on","brandlogo":"on","container":"on", "hideprivacyinfo": "off", "brandlogofile":"themes/survey/vanilla/files/logo.png","font":"noto", "showpopups":"1", "showclearall":"off", "questionhelptextposition":"top"}',
             'cssframework_name' => 'bootstrap',
             'cssframework_css'  => '{}',
             'cssframework_js'   => '',
@@ -184,7 +184,7 @@ public static function getTemplateConfigurationData()
             'files_css'         => '{"add":["css/ajaxify.css","css/animate.css","css/variations/sea_green.css","css/theme.css","css/custom.css"]}',
             'files_js'          => '{"add":["scripts/theme.js","scripts/ajaxify.js","scripts/custom.js"]}',
             'files_print_css'   => '{"add":["css/print_theme.css"]}',
-            'options'           => '{"ajaxmode":"on","brandlogo":"on","brandlogofile":"./files/logo.png","container":"on","backgroundimage":"off","backgroundimagefile":null,"animatebody":"off","bodyanimation":"fadeInRight","bodyanimationduration":"500","animatequestion":"off","questionanimation":"flipInX","questionanimationduration":"500","animatealert":"off","alertanimation":"shake","alertanimationduration":"500","font":"noto","bodybackgroundcolor":"#ffffff","fontcolor":"#444444","questionbackgroundcolor":"#ffffff","questionborder":"on","questioncontainershadow":"on","checkicon":"f00c","animatecheckbox":"on","checkboxanimation":"rubberBand","checkboxanimationduration":"500","animateradio":"on","radioanimation":"zoomIn","radioanimationduration":"500","zebrastriping":"off","stickymatrixheaders":"off","greyoutselected":"off","hideprivacyinfo":"off","crosshover":"off","showpopups":"1", "showclearall":"off", "questionhelptextposition":"top"}',
+            'options'           => '{"ajaxmode":"on","brandlogo":"on","brandlogofile":"themes/survey/fruity/files/logo.png","container":"on","backgroundimage":"off","backgroundimagefile":null,"animatebody":"off","bodyanimation":"fadeInRight","bodyanimationduration":"500","animatequestion":"off","questionanimation":"flipInX","questionanimationduration":"500","animatealert":"off","alertanimation":"shake","alertanimationduration":"500","font":"noto","bodybackgroundcolor":"#ffffff","fontcolor":"#444444","questionbackgroundcolor":"#ffffff","questionborder":"on","questioncontainershadow":"on","checkicon":"f00c","animatecheckbox":"on","checkboxanimation":"rubberBand","checkboxanimationduration":"500","animateradio":"on","radioanimation":"zoomIn","radioanimationduration":"500","zebrastriping":"off","stickymatrixheaders":"off","greyoutselected":"off","hideprivacyinfo":"off","crosshover":"off","showpopups":"1", "showclearall":"off", "questionhelptextposition":"top"}',
             'cssframework_name' => 'bootstrap',
             'cssframework_css'  => '{}',
             'cssframework_js'   => '',
@@ -200,7 +200,7 @@ public static function getTemplateConfigurationData()
             'files_css'         => '{"add":["css/ajaxify.css","css/theme.css","css/custom.css"]}',
             'files_js'          =>  '{"add":["scripts/theme.js","scripts/ajaxify.js","scripts/custom.js"]}',
             'files_print_css'   => '{"add":["css/print_theme.css"]}',
-            'options'           => '{"ajaxmode":"on","brandlogo":"on","container":"on","brandlogofile":"./files/logo.png", "showpopups":"1", "showclearall":"off", "questionhelptextposition":"top"}',
+            'options'           => '{"ajaxmode":"on","brandlogo":"on","container":"on","brandlogofile":"themes/survey/bootswatch/files/logo.png", "showpopups":"1", "showclearall":"off", "questionhelptextposition":"top"}',
             'cssframework_name' => 'bootstrap',
             'cssframework_css'  => '{"replace":[["css/bootstrap.css","css/variations/flatly.min.css"]]}',
             'cssframework_js'   => '',
diff --git a/themes/survey/bootswatch/config.xml b/themes/survey/bootswatch/config.xml
index 9174662f99e..557a14234be 100644
--- a/themes/survey/bootswatch/config.xml
+++ b/themes/survey/bootswatch/config.xml
@@ -64,7 +64,7 @@
     <options>
         <ajaxmode>on</ajaxmode>
         <brandlogo>on</brandlogo>
-        <brandlogofile>./files/logo.png</brandlogofile>
+        <brandlogofile>themes/survey/bootswatch/files/logo.png</brandlogofile>
         <container>on</container>
         <showpopups>1</showpopups>
         <showclearall>off</showclearall>
diff --git a/themes/survey/fruity/config.xml b/themes/survey/fruity/config.xml
index e1816e59724..0e657ba26fd 100644
--- a/themes/survey/fruity/config.xml
+++ b/themes/survey/fruity/config.xml
@@ -69,7 +69,7 @@
     <options>
         <ajaxmode>off</ajaxmode>
         <brandlogo>on</brandlogo>
-        <brandlogofile>./files/logo.png</brandlogofile>
+        <brandlogofile>themes/survey/fruity/files/logo.png</brandlogofile>
         <container>on</container>
         <backgroundimage>off</backgroundimage>
         <backgroundimagefile>./files/pattern.png</backgroundimagefile>
diff --git a/themes/survey/fruity/options/options.twig b/themes/survey/fruity/options/options.twig
index b4be7e5d08b..42b0c207dc3 100644
--- a/themes/survey/fruity/options/options.twig
+++ b/themes/survey/fruity/options/options.twig
@@ -775,7 +775,7 @@
                                 {% endfor %}
 
                                 {% if templateConfiguration.sid is not empty or templateConfiguration.gsid is not empty %}
-                                    {% set backgroundimagefileOptions = '<option data-lightbox-src="' ~ backgroundimagefileInheritPreview ~ '" value="inherit">' ~ gT("Inherit")~ ' [' ~ gT("inherited value:") ~ ' ' ~ backgroundimagefileInheritFilename ~ ')</option>' ~ backgroundimagefileOptions %}
+                                    {% set backgroundimagefileOptions = '<option data-lightbox-src="' ~ backgroundimagefileInheritPreview ~ '" value="inherit">' ~ gT("Inherit")~ ' [' ~ gT("inherited value:") ~ ' ' ~ backgroundimagefileInheritFilename ~ ']</option>' ~ backgroundimagefileOptions %}
                                 {% endif %}
 
                                 {{ backgroundimagefileOptions }}
@@ -830,7 +830,7 @@
                                 {% endfor %}
 
                                 {% if templateConfiguration.sid is not empty or templateConfiguration.gsid is not empty %}
-                                    {% set brandlogofileOptions = '<option data-lightbox-src="' ~ brandlogofileInheritPreview ~ '" value="inherit">' ~ gT("Inherit")~ ' [' ~ gT("inherited value:") ~ ' ' ~ brandlogofileInheritFilename ~ ')</option>' ~ brandlogofileOptions %}
+                                    {% set brandlogofileOptions = '<option data-lightbox-src="' ~ brandlogofileInheritPreview ~ '" value="inherit">' ~ gT("Inherit")~ ' [' ~ gT("inherited value:") ~ ' ' ~ brandlogofileInheritFilename ~ ']</option>' ~ brandlogofileOptions %}
                                 {% endif %}
 
                                 {{ brandlogofileOptions }}
diff --git a/themes/survey/vanilla/config.xml b/themes/survey/vanilla/config.xml
index be229240595..d0e44cfd358 100755
--- a/themes/survey/vanilla/config.xml
+++ b/themes/survey/vanilla/config.xml
@@ -72,7 +72,7 @@
         <container>on</container>
         <bodyanimation>fadeInRight</bodyanimation>
         <brandlogo>on</brandlogo>
-        <brandlogofile>./files/logo.png</brandlogofile>
+        <brandlogofile>themes/survey/vanilla/files/logo.png</brandlogofile>
         <font>noto</font>
         <showpopups>1</showpopups>
         <showclearall>off</showclearall>
diff --git a/themes/survey/vanilla/options/options.twig b/themes/survey/vanilla/options/options.twig
index eabc7e497fb..54d90223bff 100644
--- a/themes/survey/vanilla/options/options.twig
+++ b/themes/survey/vanilla/options/options.twig
@@ -308,7 +308,7 @@
                                 {% endfor %}
 
                                 {% if templateConfiguration.sid is not empty or templateConfiguration.gsid is not empty %}
-                                    {% set brandlogofileOptions = '<option data-lightbox-src="' ~ brandlogofileInheritPreview ~ '" value="inherit">' ~ gT("Inherit")~ ' [' ~ gT("inherited value:") ~ ' ' ~ brandlogofileInheritFilename ~ ')</option>' ~ brandlogofileOptions %}
+                                    {% set brandlogofileOptions = '<option data-lightbox-src="' ~ brandlogofileInheritPreview ~ '" value="inherit">' ~ gT("Inherit")~ ' [' ~ gT("inherited value:") ~ ' ' ~ brandlogofileInheritFilename ~ ']</option>' ~ brandlogofileOptions %}
                                 {% endif %}
 
                                 {{ brandlogofileOptions }}