diff --git a/config/filesystems.php b/config/filesystems.php
index 0ae33b96b..1294721bb 100644
--- a/config/filesystems.php
+++ b/config/filesystems.php
@@ -13,7 +13,7 @@ $config = [
     |
     */
 
-    'default' => env('FILESYSTEM_DISK', 'local'),
+    'default' => env('PRIVATE_FILESYSTEM_DISK', 'local'),
 
     /*
     |--------------------------------------------------------------------------
@@ -56,7 +56,7 @@ $config = [
             'visibility' => 'public',
         ],
 
-        's3' => [
+        's3_public' => [
             'driver' => 's3',
             'key' => env('PUBLIC_AWS_ACCESS_KEY_ID'),
             'secret' => env('PUBLIC_AWS_SECRET_ACCESS_KEY'),
@@ -68,8 +68,10 @@ $config = [
         ],
 
         's3_private' => [
-            // This bucket (if different than the 's3' bucket above) can be configured within AWS to *never* permit public documents
-            // For security reasons, its best to use separate buckets for public and private documents in S3
+            // This bucket (if different than the 's3' bucket above) can be
+            // configured within AWS to *never* permit public documents
+            // For security reasons, its best to use separate buckets for
+            // public and private documents in S3
             'driver' => 's3',
             'key' => env('PRIVATE_AWS_ACCESS_KEY_ID'),
             'secret' => env('PRIVATE_AWS_SECRET_ACCESS_KEY'),
diff --git a/resources/views/layouts/default.blade.php b/resources/views/layouts/default.blade.php
index 03c1373ff..e03a65897 100644
--- a/resources/views/layouts/default.blade.php
+++ b/resources/views/layouts/default.blade.php
@@ -108,14 +108,14 @@
                  @if ($snipeSettings->brand == '3')
                       <a class="logo navbar-brand no-hover" href="{{ url('/') }}">
                           @if ($snipeSettings->logo!='')
-                          <img class="navbar-brand-img" src="{{ Storage::disk('public')->url('').e($snipeSettings->logo) }}" alt="{{ $snipeSettings->site_name }} logo">
+                          <img class="navbar-brand-img" src="{{ Storage::disk('public')->url('/').e($snipeSettings->logo) }}" alt="{{ $snipeSettings->site_name }} logo">
                           @endif
                           {{ $snipeSettings->site_name }}
                       </a>
                   @elseif ($snipeSettings->brand == '2')
                       <a class="logo navbar-brand no-hover" href="{{ url('/') }}">
                           @if ($snipeSettings->logo!='')
-                            <img class="navbar-brand-img" src="{{ Storage::disk('public')->url('').e($snipeSettings->logo) }}" alt="{{ $snipeSettings->site_name }} logo">
+                            <img class="navbar-brand-img" src="{{ Storage::disk('public')->url('/').e($snipeSettings->logo) }}" alt="{{ $snipeSettings->site_name }} logo">
                           @endif
                           <span class="sr-only">{{ $snipeSettings->site_name }}</span>
                       </a>