diff --git a/app/Http/helpers.php b/app/Http/helpers.php
index 577cf12d..362017a4 100644
--- a/app/Http/helpers.php
+++ b/app/Http/helpers.php
@@ -588,7 +588,7 @@ function get_image_meta_data($file)
  */
 function is_dev()
 {
-    return env('APP_ENV') === 'local' ? true : false;
+    return env('APP_ENV') === 'local' ? 1 : 0;
 }
 
 /**
diff --git a/app/Services/StripeService.php b/app/Services/StripeService.php
index 199a7992..299e88a2 100644
--- a/app/Services/StripeService.php
+++ b/app/Services/StripeService.php
@@ -198,6 +198,9 @@ class StripeService
                 'country'     => $user->settings->country,
                 'postal_code' => $user->settings->postal_code,
                 'state'       => $user->settings->state,
+            ],
+            'preferred_locales' => [
+                $user->settings->country, 'en'
             ]
         ]);
     }
diff --git a/resources/js/components/FilesView/ButtonBase.vue b/resources/js/components/FilesView/ButtonBase.vue
index e5d859c6..3a950dfe 100644
--- a/resources/js/components/FilesView/ButtonBase.vue
+++ b/resources/js/components/FilesView/ButtonBase.vue
@@ -1,7 +1,7 @@
 <template>
     <button class="button-base" :class="buttonStyle" type="button">
         <div v-if="loading" class="icon">
-            <refresh-cw-icon size="16" class="sync-alt"></refresh-cw-icon>
+            <refresh-cw-icon size="16" class="sync-alt" />
 		</div>
         <div class="content">
             <slot v-if="! loading"></slot>
@@ -52,10 +52,6 @@
             .content {
                 color: white;
             }
-
-            polyline, path {
-                color: inherit;
-            }
         }
 
         &.danger {
diff --git a/resources/js/components/FilesView/FilePreviewNavigationPanel.vue b/resources/js/components/FilesView/FilePreviewNavigationPanel.vue
index b84363e7..494a8afe 100644
--- a/resources/js/components/FilesView/FilePreviewNavigationPanel.vue
+++ b/resources/js/components/FilesView/FilePreviewNavigationPanel.vue
@@ -1,13 +1,13 @@
 <template>
 	<div class="navigation-panel" v-if="fileInfoDetail[0]">
 		<div class="name-wrapper">
-			<x-icon @click="closeFullPreview" size="22" class="icon-close"></x-icon>
+			<x-icon @click="closeFullPreview" size="22" class="icon-close hover-text-theme" />
 			<div class="name-count-wrapper">
 				<p class="title">{{ fileInfoDetail[0].name }}</p>				
 				<span class="file-count"> ({{ showingImageIndex + ' ' + $t('pronouns.of') + ' ' + filteredFiles.length }}) </span>
 			</div>
-			<span id="fast-preview-menu" class="fast-menu-icon" @click.stop="menuOpen" v-if="$checkPermission(['master', 'editor', 'visitor'])">
-				<more-horizontal-icon class="more-icon" size="14"> </more-horizontal-icon>
+			<span id="fast-preview-menu" class="fast-menu-icon group" @click.stop="menuOpen" v-if="$checkPermission(['master', 'editor', 'visitor'])">
+				<more-horizontal-icon class="more-icon group-hover-text-theme" size="14" />
 			</span>
 		</div>
 
@@ -162,14 +162,13 @@ export default {
 		border-radius: 6px;
 		vertical-align: middle;
 		cursor: pointer;
-		color: $text;
 		@include transition(150ms);
 
 		&:hover {
 			background: $light_background;
 
 			line {
-				stroke: $theme;
+				color: inherit;
 			}
 		}
 	}
@@ -191,7 +190,7 @@ export default {
 			background: $light_background;
 
 			svg circle {
-				stroke: $theme;
+				color: inherit;
 			}
 		}
 		.more-icon {
diff --git a/resources/js/helpers.js b/resources/js/helpers.js
index 4da2d06b..ea02f195 100644
--- a/resources/js/helpers.js
+++ b/resources/js/helpers.js
@@ -106,7 +106,7 @@ const Helpers = {
             // Push items to file queue
             [...event.dataTransfer.items].map(item => {
                 this.$store.commit('ADD_FILES_TO_QUEUE', {
-                    folder_id: parent_id,
+                    folder_id: parent_id ? parent_id : '',
                     file: item.getAsFile(),
                 })
             });
diff --git a/resources/js/store/modules/app.js b/resources/js/store/modules/app.js
index d3e189fa..cb12a653 100644
--- a/resources/js/store/modules/app.js
+++ b/resources/js/store/modules/app.js
@@ -23,6 +23,8 @@ const defaultState = {
         },
     ],
     countries: [
+        {label: 'Czech Republic', value: 'CZ'},
+        {label: 'Slovakia', value: 'SK'},
         {label: 'Afghanistan', value: 'AF'},
         {label: 'Åland Islands', value: 'AX'},
         {label: 'Albania', value: 'AL'},
@@ -80,7 +82,6 @@ const defaultState = {
         {label: 'Croatia', value: 'HR'},
         {label: 'Cuba', value: 'CU'},
         {label: 'Cyprus', value: 'CY'},
-        {label: 'Czech Republic', value: 'CZ'},
         {label: 'Denmark', value: 'DK'},
         {label: 'Djibouti', value: 'DJ'},
         {label: 'Dominica', value: 'DM'},
@@ -219,7 +220,6 @@ const defaultState = {
         {label: 'Seychelles', value: 'SC'},
         {label: 'Sierra Leone', value: 'SL'},
         {label: 'Singapore', value: 'SG'},
-        {label: 'Slovakia', value: 'SK'},
         {label: 'Slovenia', value: 'SI'},
         {label: 'Solomon Islands', value: 'SB'},
         {label: 'Somalia', value: 'SO'},
diff --git a/resources/js/views/Upgrade/UpgradeBilling.vue b/resources/js/views/Upgrade/UpgradeBilling.vue
index e9aca7fc..86c9018b 100644
--- a/resources/js/views/Upgrade/UpgradeBilling.vue
+++ b/resources/js/views/Upgrade/UpgradeBilling.vue
@@ -16,7 +16,7 @@
 
                             <!-- Pay by new credit card -->
                             <div class="register-card" v-show="! defaultPaymentMethod || payByNewCard">
-                                <InfoBox v-if="config.isDemo">
+                                <InfoBox v-if="config.isDemo || config.isDev">
                                     <p>For test your payment please use <b>4242 4242 4242 4242</b> or <b>5555 5555 5555 4444</b> as a card number, <b>11/22</b>
                                         as the expiration date and <b>123</b> as CVC number and ZIP <b>12345</b>.</p>
                                 </InfoBox>
diff --git a/resources/js/views/User/CreatePaymentMethod.vue b/resources/js/views/User/CreatePaymentMethod.vue
index 312de449..d1c914f8 100644
--- a/resources/js/views/User/CreatePaymentMethod.vue
+++ b/resources/js/views/User/CreatePaymentMethod.vue
@@ -6,7 +6,7 @@
 
                 <!-- Register new credit card -->
                 <div class="register-card">
-                    <InfoBox v-show="config.isDemo">
+                    <InfoBox v-if="config.isDemo || config.isDev">
                         <p>For test your payment please use <b>4242 4242 4242 4242</b> or <b>5555 5555 5555 4444</b> as a card number, <b>11/22</b>
                             as the expiration date and <b>123</b> as CVC number and ZIP <b>12345</b>.</p>
                     </InfoBox>
diff --git a/resources/views/index.blade.php b/resources/views/index.blade.php
index 32981e7b..e11d108d 100644
--- a/resources/views/index.blade.php
+++ b/resources/views/index.blade.php
@@ -25,7 +25,7 @@
 
     {{--Icons--}}
     <link rel="apple-touch-icon-precomposed" sizes="152x152" href="{{ asset('assets/images/app-icon.png') }}">
-    <link rel="icon" href="{{ $settings->app_favicon ?? asset('favicon.png') }}?v={{ get_version() }}">
+    <link rel="icon" href="{{ $settings->app_favicon ? url($settings->app_favicon) : asset('favicon.png') }}?v={{ get_version() }}">
 
     {{--Format Detection--}}
     <meta name="format-detection" content="telephone=no">
@@ -64,6 +64,8 @@
 
             isAuthenticated: {{ auth()->check() ? 1 : 0 }},
             isSaaS: {{ $settings && $settings->license === 'Extended' ? 1 : 0 }},
+
+            isDev: {{ is_dev() ? 1 : 0 }},
             isDemo: {{ config('vuefilemanager.is_demo') ? 1 : 0 }},
 
             legal: {!! $legal ?? 'undefined' !!},
diff --git a/resources/views/vuefilemanager/others/color-template.blade.php b/resources/views/vuefilemanager/others/color-template.blade.php
index 215e386b..074850d6 100644
--- a/resources/views/vuefilemanager/others/color-template.blade.php
+++ b/resources/views/vuefilemanager/others/color-template.blade.php
@@ -65,6 +65,12 @@
 
         {{-- ButtonBase --}}
         .button-base.theme-solid {background: {{ $settings->app_color }}}
+        .button-base.theme-solid polyline,
+        .button-base.theme-solid path {
+            color: white;
+        }
+
+
         .button-base.theme {background: {{ $settings->app_color }}10}
         .button-base.theme {color: {{ $settings->app_color }}}
         .button-base.theme .content {color: {{ $settings->app_color }}}
@@ -82,6 +88,9 @@
         .folder-item.is-dragenter {border-color: {{ $settings->app_color }} !important;}
         .favourites.is-dragenter .menu-list {border-color: {{ $settings->app_color }} !important;}
 
+        {{-- Stripe --}}
+        .StripeElement--focus {border-color: {{ $settings->app_color }} !important;}
+
         {{-- Dark mode --}}
         @media (prefers-color-scheme: dark) {
             .dark-text-theme {color: {{ $settings->app_color }}}