diff --git a/core/includes/theme.inc b/core/includes/theme.inc
index 3f00507..d94e506 100644
--- a/core/includes/theme.inc
+++ b/core/includes/theme.inc
@@ -344,11 +344,10 @@ function theme_get_setting($setting_name, $theme = NULL) {
       }
 
       // Generate the path to the logo image.
-      $logo_path = $cache[$theme]->get('logo.path');
       if ($cache[$theme]->get('logo.use_default')) {
         $cache[$theme]->set('logo.url', file_create_url($theme_object->getPath() . '/logo.svg'));
       }
-      elseif ($logo_path) {
+      elseif ($logo_path = $cache[$theme]->get('logo.path')) {
         $cache[$theme]->set('logo.url', file_create_url($logo_path));
       }
 
diff --git a/core/themes/bartik/css/components/header.css b/core/themes/bartik/css/components/header.css
index 1b938b1..8f878d8 100644
--- a/core/themes/bartik/css/components/header.css
+++ b/core/themes/bartik/css/components/header.css
@@ -174,7 +174,10 @@
   width: 154px;
 }
 .region-header .search-block-form {
-  float: right;
+  float: right; /* LTR */
+}
+[dir="rtl"] .region-header .search-block-form {
+  float: left;
 }
 
 /* Language switcher block in header region. */