diff --git a/app/Notifications/Oasis/PaymentRequiredNotification.php b/app/Notifications/Oasis/PaymentRequiredNotification.php
index 4fd038ab..f7631386 100644
--- a/app/Notifications/Oasis/PaymentRequiredNotification.php
+++ b/app/Notifications/Oasis/PaymentRequiredNotification.php
@@ -45,20 +45,19 @@ class PaymentRequiredNotification extends Notification
     {
         $url = url("/platba/{$this->order['id']}");
 
-        $name = $this->plan['product']['name'];
-        $price = Cashier::formatAmount($this->plan['plan']['amount']);
-        $storage = format_gigabytes($this->plan['product']['metadata']['capacity']);
-
         return (new MailMessage)
-            ->subject('🏝 Potvrzeni Objednavky - OasisDrive')
-            ->greeting('Vážený zákazníku,')
-            ->line('Právě jste si úspěšně vytvořil registraci bezpečnostní datové služby OasisDrive.')
-            ->line("Vámi vybraný tarif: $name - $storage za $price")
-            ->action('Pro aktivaci klikněte zde', $url)
-            ->line('Odkaz je platný 24 hodin.')
-            ->line('Po dokončení registrace v odkazu Vám bude služba automaticky aktivována a lze ji ihned využívat.')
-            ->line('S pozdravem a přáním hezkého dne')
-            ->salutation('Tým Oasis Drive');
+            ->subject(__t('mail_order_subject'))
+            ->greeting(__t('mail_greeting'))
+            ->line(__t('mail_order_line_1'))
+            ->line(__t('mail_tariff', [
+                'name'    => $this->plan['product']['name'],
+                'storage' => Cashier::formatAmount($this->plan['plan']['amount']),
+                'price'   => format_gigabytes($this->plan['product']['metadata']['capacity']),
+            ]))
+            ->action(__t('mail_activation_action'), $url)
+            ->line(__t('mail_order_line_2'))
+            ->line(__t('mail_order_line_3'))
+            ->salutation(__t('mail_salutation'));
     }
 
     /**
diff --git a/app/Notifications/Oasis/ReminderForPaymentRequiredNotification.php b/app/Notifications/Oasis/ReminderForPaymentRequiredNotification.php
index 674ad4e8..d6557def 100644
--- a/app/Notifications/Oasis/ReminderForPaymentRequiredNotification.php
+++ b/app/Notifications/Oasis/ReminderForPaymentRequiredNotification.php
@@ -27,7 +27,7 @@ class ReminderForPaymentRequiredNotification extends Notification
     /**
      * Get the notification's delivery channels.
      *
-     * @param  mixed  $notifiable
+     * @param mixed $notifiable
      * @return array
      */
     public function via($notifiable)
@@ -38,33 +38,32 @@ class ReminderForPaymentRequiredNotification extends Notification
     /**
      * Get the mail representation of the notification.
      *
-     * @param  mixed  $notifiable
+     * @param mixed $notifiable
      * @return \Illuminate\Notifications\Messages\MailMessage
      */
     public function toMail($notifiable)
     {
         $url = url("/platba/{$this->order['id']}");
 
-        $name = $this->plan['product']['name'];
-        $price = Cashier::formatAmount($this->plan['plan']['amount']);
-        $storage = format_gigabytes($this->plan['product']['metadata']['capacity']);
-
         return (new MailMessage)
-            ->subject('🏝 Potvrzeni Objednavky - OasisDrive')
-            ->greeting('Vážený zákazníku,')
-            ->line('Děkujeme za Vaši objednávku služby Oasis Drive pro bezpečné uložení Vašich firemních dokumentů.')
-            ->line("Vámi vybraný tarif: $name - $storage za $price")
-            ->line('Připomínáme dokončení aktivace služby a blížící se konec platnosti registračního odkazu:')
-            ->action('Pro aktivaci klikněte zde', $url)
-            ->line('Po dokončení registrace v odkazu Vám bude služba automaticky aktivována a lze ji ihned využívat.')
-            ->line('S pozdravem a přáním hezkého dne')
-            ->salutation('Tým Oasis Drive');
+            ->subject(__t('mail_order_subject'))
+            ->greeting(__t('mail_greeting'))
+            ->line(__t('mail_reminder_line_1'))
+            ->line(__t('mail_tariff', [
+                'name'    => $this->plan['product']['name'],
+                'storage' => Cashier::formatAmount($this->plan['plan']['amount']),
+                'price'   => format_gigabytes($this->plan['product']['metadata']['capacity']),
+            ]))
+            ->line(__t('mail_reminder_line_2'))
+            ->action(__t('mail_activation_action'), $url)
+            ->line(__t('mail_reminder_line_3'))
+            ->salutation(__t('mail_salutation'));
     }
 
     /**
      * Get the array representation of the notification.
      *
-     * @param  mixed  $notifiable
+     * @param mixed $notifiable
      * @return array
      */
     public function toArray($notifiable)
diff --git a/config/custom-language-translations.php b/config/custom-language-translations.php
index ef245a23..9f3a1dcf 100644
--- a/config/custom-language-translations.php
+++ b/config/custom-language-translations.php
@@ -7,5 +7,33 @@
  */
 
 return [
-    'custom' => 'translation'
+    'custom'                                    => 'translation',
+
+    // On boarding
+    'successful_payment_with_password_creation' => 'Dakujeme, platba bola uspesne zaznamenana. V poslednom kroku si prosim vytvorte heslo pre Vas ucet.',
+    'pay_order_description'                     => 'Zaplacenim objednavky se Vas ucet automaticky zaktivuje a vytvori se Vam digitalni prostor pro Vase dulezite dokumenty.',
+
+    'payment_page.payment_gateway' => 'Platebni karta',
+    'payment_page.company'         => 'Spolecnost',
+    'payment_page.ico'             => 'ICO',
+    'payment_page.address'         => 'Adresa',
+
+    // Mail notifications for ordering
+    'mail_greeting'                => 'Vážený zákazníku,',
+    'mail_salutation'              => 'S pozdravem a přáním hezkého dne, Tým Oasis Drive',
+    'mail_tariff'                  => 'Vámi vybraný tarif: :name - :storage za :price',
+    'mail_activation_action'       => 'Pro aktivaci klikněte zde',
+
+    'mail_order_subject' => '🏝 Potvrzeni Objednavky - OasisDrive',
+    'mail_order_line_1'  => 'Právě jste si úspěšně vytvořil registraci bezpečnostní datové služby OasisDrive.',
+    'mail_order_line_2'  => 'Odkaz je platný 24 hodin.',
+    'mail_order_line_3'  => 'Po dokončení registrace v odkazu Vám bude služba automaticky aktivována a lze ji ihned využívat.',
+
+    'mail_reminder_line_1' => 'Děkujeme za Vaši objednávku služby Oasis Drive pro bezpečné uložení Vašich firemních dokumentů.',
+    'mail_reminder_line_2' => 'Připomínáme dokončení aktivace služby a blížící se konec platnosti registračního odkazu:',
+    'mail_reminder_line_3' => 'Po dokončení registrace v odkazu Vám bude služba automaticky aktivována a lze ji ihned využívat.',
+
+    // Admin
+    'oasis.create_order'   => 'Vytvorit objednavku',
+    'oasis.create_user'    => 'Vytvorit Uzivatela',
 ];
\ No newline at end of file
diff --git a/config/language-translations.php b/config/language-translations.php
index 08391790..ea7f4ba1 100644
--- a/config/language-translations.php
+++ b/config/language-translations.php
@@ -107,7 +107,7 @@ return [
         "page_upgrade_account.change_payment.change_payment"  => "change your default payment method",
         "page_upgrade_account.change_payment.pay_by_new_card" => "pay by new credit card",
         "page_upgrade_account.change_payment.you_can"         => "Also you can",
-        "page_upgrade_account.desription"                     => "Choose plan witch perfect fit your needs. All plans is billed monthly automatically via your credit card.",
+        "page_upgrade_account.desription"                     => "To finish your order, please fill your payment method and set billing informations",
         "page_upgrade_account.errors.pay_by_another_card"     => "Please pay by another payment card",
         "page_upgrade_account.section_billing"                => "Billing Information",
         "page_upgrade_account.section_card"                   => "Payment Card",
@@ -166,6 +166,7 @@ return [
         "user_payments.set_as_default"                        => "Set as default card",
         "user_payments.store_card"                            => "Store Payment Card",
         "user_payments.title"                                 => "Payment Methods",
+        "user_subscription.title"                             => "Subscription",
         "user_subscription.billed"                            => "Billed",
         "user_subscription.cancel_plan"                       => "Cancel Plan",
         "user_subscription.canceled_at"                       => "Canceled At",
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index e445b0e6..8a7db87c 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -17,7 +17,7 @@
     "/chunks/app-email.js": "/chunks/app-email.js?id=c578a85112c6a4b1ed0e",
     "/chunks/app-index.js": "/chunks/app-index.js?id=7f07dceace5c9c8255bb",
     "/chunks/app-language.js": "/chunks/app-language.js?id=e97b8b4e0a0f5ac93c97",
-    "/chunks/app-language~chunks/dashboard~chunks/files~chunks/invoices~chunks/pages~chunks/plans~chunks/s~38c276fc.js": "/chunks/app-language~chunks/dashboard~chunks/files~chunks/invoices~chunks/pages~chunks/plans~chunks/s~38c276fc.js?id=91d6a4649c9277a7bb29",
+    "/chunks/app-language~chunks/dashboard~chunks/files~chunks/invoices~chunks/pages~chunks/plans~chunks/s~38c276fc.js": "/chunks/app-language~chunks/dashboard~chunks/files~chunks/invoices~chunks/pages~chunks/plans~chunks/s~38c276fc.js?id=e4abf38870f961cb6979",
     "/chunks/app-others.js": "/chunks/app-others.js?id=9156adba3b1697a8bf3e",
     "/chunks/app-payments.js": "/chunks/app-payments.js?id=7e1a982c90174f568fb2",
     "/chunks/app-settings.js": "/chunks/app-settings.js?id=bbf2a2e436d939f7fc07",
@@ -59,7 +59,7 @@
     "/chunks/profile~chunks/settings-password.js": "/chunks/profile~chunks/settings-password.js?id=d448806bfefc6cc43f0d",
     "/chunks/purchase-code.js": "/chunks/purchase-code.js?id=e00ee12cde704060e15b",
     "/chunks/settings.js": "/chunks/settings.js?id=2637c005a9c8b01cfc9b",
-    "/chunks/settings-create-payment-methods.js": "/chunks/settings-create-payment-methods.js?id=c12436dc2933527ce1f5",
+    "/chunks/settings-create-payment-methods.js": "/chunks/settings-create-payment-methods.js?id=88849e6ddce9226d49a5",
     "/chunks/settings-invoices.js": "/chunks/settings-invoices.js?id=444b9bbc310647ddd297",
     "/chunks/settings-password.js": "/chunks/settings-password.js?id=d24053a92c2594439d04",
     "/chunks/settings-payment-methods.js": "/chunks/settings-payment-methods.js?id=3bc709a228c0849a6f62",
@@ -72,22 +72,22 @@
     "/chunks/shared/file-browser.js": "/chunks/shared/file-browser.js?id=3127fab4cfd3d5f00a72",
     "/chunks/shared/single-file.js": "/chunks/shared/single-file.js?id=e8aedb75df7fe227d693",
     "/chunks/sign-in.js": "/chunks/sign-in.js?id=61e5b97e8273aec430ad",
-    "/chunks/sign-up.js": "/chunks/sign-up.js?id=ce15b1156cf37c0a9703",
+    "/chunks/sign-up.js": "/chunks/sign-up.js?id=dfca62ee98c8c8ef69cf",
     "/chunks/stripe-credentials.js": "/chunks/stripe-credentials.js?id=1acdec3a157c8943a88d",
     "/chunks/subscription-plans.js": "/chunks/subscription-plans.js?id=a843f8cf90ff1e3168e8",
     "/chunks/subscription-service.js": "/chunks/subscription-service.js?id=90c1aa9431689a89eb3d",
-    "/chunks/upgrade-billing.js": "/chunks/upgrade-billing.js?id=d76e4522f424ce996e8f",
+    "/chunks/upgrade-billing.js": "/chunks/upgrade-billing.js?id=dde60e039a9a742dc14d",
     "/chunks/upgrade-billing~chunks/upgrade-plan.js": "/chunks/upgrade-billing~chunks/upgrade-plan.js?id=e1658ebec711765f67fc",
-    "/chunks/upgrade-plan.js": "/chunks/upgrade-plan.js?id=35179531a8241da128e9",
+    "/chunks/upgrade-plan.js": "/chunks/upgrade-plan.js?id=d2b16765656a0f790ea2",
     "/chunks/user.js": "/chunks/user.js?id=6e9af0d22327a4cc82e9",
-    "/chunks/user-create.js": "/chunks/user-create.js?id=0ede0db725f2c822c336",
+    "/chunks/user-create.js": "/chunks/user-create.js?id=ac94ccbe8af18aba5279",
     "/chunks/user-delete.js": "/chunks/user-delete.js?id=5af2fc09b4b639452756",
     "/chunks/user-detail.js": "/chunks/user-detail.js?id=b9b70e43cf551a574443",
     "/chunks/user-invoices.js": "/chunks/user-invoices.js?id=6c4d0e9e058be11dc1f7",
     "/chunks/user-password.js": "/chunks/user-password.js?id=a4b4ab4f4af11533eb4d",
     "/chunks/user-storage.js": "/chunks/user-storage.js?id=4aec2d7b60ec0bc35fb9",
     "/chunks/user-subscription.js": "/chunks/user-subscription.js?id=99efdd410910267db66e",
-    "/chunks/users.js": "/chunks/users.js?id=f1057be5cf73ebc32c14",
+    "/chunks/users.js": "/chunks/users.js?id=09bad885c75e355d134e",
     "/vendors~chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~0d496e20.js": "/vendors~chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~0d496e20.js?id=a9facd8e57a0dd054f8c",
     "/vendors~chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~7afe9e20.js": "/vendors~chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~7afe9e20.js?id=6d6e7e4191c9e2705c8a",
     "/vendors~chunks/files~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/file-browser~ch~52c14f2e.js": "/vendors~chunks/files~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/file-browser~ch~52c14f2e.js?id=66afa0e341251a68c3d3",
@@ -131,5 +131,129 @@
     "/chunks/app-language.9ee4a795d26a6e44820c.hot-update.js": "/chunks/app-language.9ee4a795d26a6e44820c.hot-update.js",
     "/js/main.8517a680822ffe9748c9.hot-update.js": "/js/main.8517a680822ffe9748c9.hot-update.js",
     "/chunks/admin.9396f79fef53ad7070fe.hot-update.js": "/chunks/admin.9396f79fef53ad7070fe.hot-update.js",
-    "/chunks/platform.9396f79fef53ad7070fe.hot-update.js": "/chunks/platform.9396f79fef53ad7070fe.hot-update.js"
+    "/chunks/platform.9396f79fef53ad7070fe.hot-update.js": "/chunks/platform.9396f79fef53ad7070fe.hot-update.js",
+    "/js/main.1e457fda341c9068f93f.hot-update.js": "/js/main.1e457fda341c9068f93f.hot-update.js",
+    "/chunks/admin.1e457fda341c9068f93f.hot-update.js": "/chunks/admin.1e457fda341c9068f93f.hot-update.js",
+    "/chunks/admin-account.1e457fda341c9068f93f.hot-update.js": "/chunks/admin-account.1e457fda341c9068f93f.hot-update.js",
+    "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~74bf0fcb.js": "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~74bf0fcb.js?id=a2084ef7d279144d8e8c",
+    "/chunks/admin~chunks/platform.1e457fda341c9068f93f.hot-update.js": "/chunks/admin~chunks/platform.1e457fda341c9068f93f.hot-update.js",
+    "/chunks/app-appearance.1e457fda341c9068f93f.hot-update.js": "/chunks/app-appearance.1e457fda341c9068f93f.hot-update.js",
+    "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~8cc7d96f.1e457fda341c9068f93f.hot-update.js": "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~8cc7d96f.1e457fda341c9068f93f.hot-update.js",
+    "/chunks/app-settings.1e457fda341c9068f93f.hot-update.js": "/chunks/app-settings.1e457fda341c9068f93f.hot-update.js",
+    "/chunks/app-setup.1e457fda341c9068f93f.hot-update.js": "/chunks/app-setup.1e457fda341c9068f93f.hot-update.js",
+    "/chunks/billings-detail.1e457fda341c9068f93f.hot-update.js": "/chunks/billings-detail.1e457fda341c9068f93f.hot-update.js",
+    "/chunks/contact-us~chunks/dynamic-page~chunks/homepage.1e457fda341c9068f93f.hot-update.js": "/chunks/contact-us~chunks/dynamic-page~chunks/homepage.1e457fda341c9068f93f.hot-update.js",
+    "/chunks/create-new-password.1e457fda341c9068f93f.hot-update.js": "/chunks/create-new-password.1e457fda341c9068f93f.hot-update.js",
+    "/chunks/dashboard.1e457fda341c9068f93f.hot-update.js": "/chunks/dashboard.1e457fda341c9068f93f.hot-update.js",
+    "/chunks/dashboard~chunks/files~chunks/invoices~chunks/pages~chunks/plans~chunks/settings-payment-meth~0bfeabca.js": "/chunks/dashboard~chunks/files~chunks/invoices~chunks/pages~chunks/plans~chunks/settings-payment-meth~0bfeabca.js?id=ba900a636cef05c9f291",
+    "/chunks/database.1e457fda341c9068f93f.hot-update.js": "/chunks/database.1e457fda341c9068f93f.hot-update.js",
+    "/chunks/environment-setup.1e457fda341c9068f93f.hot-update.js": "/chunks/environment-setup.1e457fda341c9068f93f.hot-update.js",
+    "/chunks/files~chunks/oasis/platba~chunks/settings-subscription~chunks/shared-files~chunks/shared/file~9d1352fd.js": "/chunks/files~chunks/oasis/platba~chunks/settings-subscription~chunks/shared-files~chunks/shared/file~9d1352fd.js?id=4030b241faac6b31341f",
+    "/chunks/files~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/file-browser.1e457fda341c9068f93f.hot-update.js": "/chunks/files~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/file-browser.1e457fda341c9068f93f.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared/file-browser.1e457fda341c9068f93f.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared/file-browser.1e457fda341c9068f93f.hot-update.js",
+    "/chunks/forgotten-password.1e457fda341c9068f93f.hot-update.js": "/chunks/forgotten-password.1e457fda341c9068f93f.hot-update.js",
+    "/chunks/installation-disclaimer.1e457fda341c9068f93f.hot-update.js": "/chunks/installation-disclaimer.1e457fda341c9068f93f.hot-update.js",
+    "/chunks/invoices.1e457fda341c9068f93f.hot-update.js": "/chunks/invoices.1e457fda341c9068f93f.hot-update.js",
+    "/chunks/oasis/platba.js": "/chunks/oasis/platba.js?id=caf1edc9b2ee500b4eee",
+    "/chunks/oasis/platba~chunks/upgrade-billing~chunks/upgrade-plan.js": "/chunks/oasis/platba~chunks/upgrade-billing~chunks/upgrade-plan.js?id=7b1bc3a7d76622b569a3",
+    "/chunks/page-edit.1e457fda341c9068f93f.hot-update.js": "/chunks/page-edit.1e457fda341c9068f93f.hot-update.js",
+    "/chunks/pages.1e457fda341c9068f93f.hot-update.js": "/chunks/pages.1e457fda341c9068f93f.hot-update.js",
+    "/chunks/plan.1e457fda341c9068f93f.hot-update.js": "/chunks/plan.1e457fda341c9068f93f.hot-update.js",
+    "/chunks/plan-create.1e457fda341c9068f93f.hot-update.js": "/chunks/plan-create.1e457fda341c9068f93f.hot-update.js",
+    "/chunks/plans.1e457fda341c9068f93f.hot-update.js": "/chunks/plans.1e457fda341c9068f93f.hot-update.js",
+    "/chunks/platform.1e457fda341c9068f93f.hot-update.js": "/chunks/platform.1e457fda341c9068f93f.hot-update.js",
+    "/chunks/platform~chunks/shared.1e457fda341c9068f93f.hot-update.js": "/chunks/platform~chunks/shared.1e457fda341c9068f93f.hot-update.js",
+    "/chunks/profile.1e457fda341c9068f93f.hot-update.js": "/chunks/profile.1e457fda341c9068f93f.hot-update.js",
+    "/chunks/profile~chunks/settings-password.1e457fda341c9068f93f.hot-update.js": "/chunks/profile~chunks/settings-password.1e457fda341c9068f93f.hot-update.js",
+    "/chunks/settings.1e457fda341c9068f93f.hot-update.js": "/chunks/settings.1e457fda341c9068f93f.hot-update.js",
+    "/chunks/settings-create-payment-methods.1e457fda341c9068f93f.hot-update.js": "/chunks/settings-create-payment-methods.1e457fda341c9068f93f.hot-update.js",
+    "/chunks/settings-invoices.1e457fda341c9068f93f.hot-update.js": "/chunks/settings-invoices.1e457fda341c9068f93f.hot-update.js",
+    "/chunks/settings-payment-methods.1e457fda341c9068f93f.hot-update.js": "/chunks/settings-payment-methods.1e457fda341c9068f93f.hot-update.js",
+    "/chunks/settings-storage.1e457fda341c9068f93f.hot-update.js": "/chunks/settings-storage.1e457fda341c9068f93f.hot-update.js",
+    "/chunks/settings-subscription.1e457fda341c9068f93f.hot-update.js": "/chunks/settings-subscription.1e457fda341c9068f93f.hot-update.js",
+    "/chunks/sign-in.1e457fda341c9068f93f.hot-update.js": "/chunks/sign-in.1e457fda341c9068f93f.hot-update.js",
+    "/chunks/sign-up.1e457fda341c9068f93f.hot-update.js": "/chunks/sign-up.1e457fda341c9068f93f.hot-update.js",
+    "/chunks/stripe-credentials.1e457fda341c9068f93f.hot-update.js": "/chunks/stripe-credentials.1e457fda341c9068f93f.hot-update.js",
+    "/chunks/subscription-plans.1e457fda341c9068f93f.hot-update.js": "/chunks/subscription-plans.1e457fda341c9068f93f.hot-update.js",
+    "/chunks/upgrade-billing.1e457fda341c9068f93f.hot-update.js": "/chunks/upgrade-billing.1e457fda341c9068f93f.hot-update.js",
+    "/chunks/upgrade-plan.1e457fda341c9068f93f.hot-update.js": "/chunks/upgrade-plan.1e457fda341c9068f93f.hot-update.js",
+    "/chunks/user.1e457fda341c9068f93f.hot-update.js": "/chunks/user.1e457fda341c9068f93f.hot-update.js",
+    "/chunks/user-create.1e457fda341c9068f93f.hot-update.js": "/chunks/user-create.1e457fda341c9068f93f.hot-update.js",
+    "/chunks/user-detail.1e457fda341c9068f93f.hot-update.js": "/chunks/user-detail.1e457fda341c9068f93f.hot-update.js",
+    "/chunks/user-subscription.1e457fda341c9068f93f.hot-update.js": "/chunks/user-subscription.1e457fda341c9068f93f.hot-update.js",
+    "/chunks/users.1e457fda341c9068f93f.hot-update.js": "/chunks/users.1e457fda341c9068f93f.hot-update.js",
+    "/vendors~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-i~0a9c5e33.js": "/vendors~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-i~0a9c5e33.js?id=b28978d3c8aae9b949a5",
+    "/vendors~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-i~8394cf85.js": "/vendors~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-i~8394cf85.js?id=d25da0762af813ea588c",
+    "/js/main.37eab5ba064cf62aa832.hot-update.js": "/js/main.37eab5ba064cf62aa832.hot-update.js",
+    "/chunks/admin.37eab5ba064cf62aa832.hot-update.js": "/chunks/admin.37eab5ba064cf62aa832.hot-update.js",
+    "/chunks/admin-account.37eab5ba064cf62aa832.hot-update.js": "/chunks/admin-account.37eab5ba064cf62aa832.hot-update.js",
+    "/chunks/admin-account~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks/~bf1a428e.js": "/chunks/admin-account~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks/~bf1a428e.js?id=8fdc7e994d43c02f9e55",
+    "/chunks/admin~chunks/admin-account~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-o~dff69265.js": "/chunks/admin~chunks/admin-account~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-o~dff69265.js?id=3c64e7c02f8a927c5868",
+    "/chunks/app-appearance.37eab5ba064cf62aa832.hot-update.js": "/chunks/app-appearance.37eab5ba064cf62aa832.hot-update.js",
+    "/chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks/app-payments~chunks/p~9f637d93.js": "/chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks/app-payments~chunks/p~9f637d93.js?id=dcc55ee97d74889fad68",
+    "/chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks/app-payments~chunks/p~a38d7c8a.js": "/chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks/app-payments~chunks/p~a38d7c8a.js?id=c374779fafe36c5bd52a",
+    "/chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks/app-payments~chunks/p~cefa6629.js": "/chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks/app-payments~chunks/p~cefa6629.js?id=11ee23e5b7651829a175",
+    "/chunks/app-settings.37eab5ba064cf62aa832.hot-update.js": "/chunks/app-settings.37eab5ba064cf62aa832.hot-update.js",
+    "/chunks/app-setup.37eab5ba064cf62aa832.hot-update.js": "/chunks/app-setup.37eab5ba064cf62aa832.hot-update.js",
+    "/chunks/billings-detail.37eab5ba064cf62aa832.hot-update.js": "/chunks/billings-detail.37eab5ba064cf62aa832.hot-update.js",
+    "/chunks/contact-us~chunks/dynamic-page~chunks/homepage.37eab5ba064cf62aa832.hot-update.js": "/chunks/contact-us~chunks/dynamic-page~chunks/homepage.37eab5ba064cf62aa832.hot-update.js",
+    "/chunks/create-new-password.37eab5ba064cf62aa832.hot-update.js": "/chunks/create-new-password.37eab5ba064cf62aa832.hot-update.js",
+    "/chunks/dashboard.37eab5ba064cf62aa832.hot-update.js": "/chunks/dashboard.37eab5ba064cf62aa832.hot-update.js",
+    "/chunks/database.37eab5ba064cf62aa832.hot-update.js": "/chunks/database.37eab5ba064cf62aa832.hot-update.js",
+    "/chunks/environment-setup.37eab5ba064cf62aa832.hot-update.js": "/chunks/environment-setup.37eab5ba064cf62aa832.hot-update.js",
+    "/chunks/files~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/file-browser.37eab5ba064cf62aa832.hot-update.js": "/chunks/files~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/file-browser.37eab5ba064cf62aa832.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared/file-browser.37eab5ba064cf62aa832.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared/file-browser.37eab5ba064cf62aa832.hot-update.js",
+    "/chunks/forgotten-password.37eab5ba064cf62aa832.hot-update.js": "/chunks/forgotten-password.37eab5ba064cf62aa832.hot-update.js",
+    "/chunks/installation-disclaimer.37eab5ba064cf62aa832.hot-update.js": "/chunks/installation-disclaimer.37eab5ba064cf62aa832.hot-update.js",
+    "/chunks/invoices.37eab5ba064cf62aa832.hot-update.js": "/chunks/invoices.37eab5ba064cf62aa832.hot-update.js",
+    "/chunks/oasis/platba.37eab5ba064cf62aa832.hot-update.js": "/chunks/oasis/platba.37eab5ba064cf62aa832.hot-update.js",
+    "/chunks/page-edit.37eab5ba064cf62aa832.hot-update.js": "/chunks/page-edit.37eab5ba064cf62aa832.hot-update.js",
+    "/chunks/pages.37eab5ba064cf62aa832.hot-update.js": "/chunks/pages.37eab5ba064cf62aa832.hot-update.js",
+    "/chunks/plan.37eab5ba064cf62aa832.hot-update.js": "/chunks/plan.37eab5ba064cf62aa832.hot-update.js",
+    "/chunks/plan-create.37eab5ba064cf62aa832.hot-update.js": "/chunks/plan-create.37eab5ba064cf62aa832.hot-update.js",
+    "/chunks/plans.37eab5ba064cf62aa832.hot-update.js": "/chunks/plans.37eab5ba064cf62aa832.hot-update.js",
+    "/chunks/platform.37eab5ba064cf62aa832.hot-update.js": "/chunks/platform.37eab5ba064cf62aa832.hot-update.js",
+    "/chunks/platform~chunks/shared.37eab5ba064cf62aa832.hot-update.js": "/chunks/platform~chunks/shared.37eab5ba064cf62aa832.hot-update.js",
+    "/chunks/profile.37eab5ba064cf62aa832.hot-update.js": "/chunks/profile.37eab5ba064cf62aa832.hot-update.js",
+    "/chunks/profile~chunks/settings-password.37eab5ba064cf62aa832.hot-update.js": "/chunks/profile~chunks/settings-password.37eab5ba064cf62aa832.hot-update.js",
+    "/chunks/settings.37eab5ba064cf62aa832.hot-update.js": "/chunks/settings.37eab5ba064cf62aa832.hot-update.js",
+    "/chunks/settings-create-payment-methods.37eab5ba064cf62aa832.hot-update.js": "/chunks/settings-create-payment-methods.37eab5ba064cf62aa832.hot-update.js",
+    "/chunks/settings-invoices.37eab5ba064cf62aa832.hot-update.js": "/chunks/settings-invoices.37eab5ba064cf62aa832.hot-update.js",
+    "/chunks/settings-payment-methods.37eab5ba064cf62aa832.hot-update.js": "/chunks/settings-payment-methods.37eab5ba064cf62aa832.hot-update.js",
+    "/chunks/settings-storage.37eab5ba064cf62aa832.hot-update.js": "/chunks/settings-storage.37eab5ba064cf62aa832.hot-update.js",
+    "/chunks/settings-subscription.37eab5ba064cf62aa832.hot-update.js": "/chunks/settings-subscription.37eab5ba064cf62aa832.hot-update.js",
+    "/chunks/sign-in.37eab5ba064cf62aa832.hot-update.js": "/chunks/sign-in.37eab5ba064cf62aa832.hot-update.js",
+    "/chunks/sign-up.37eab5ba064cf62aa832.hot-update.js": "/chunks/sign-up.37eab5ba064cf62aa832.hot-update.js",
+    "/chunks/stripe-credentials.37eab5ba064cf62aa832.hot-update.js": "/chunks/stripe-credentials.37eab5ba064cf62aa832.hot-update.js",
+    "/chunks/subscription-plans.37eab5ba064cf62aa832.hot-update.js": "/chunks/subscription-plans.37eab5ba064cf62aa832.hot-update.js",
+    "/chunks/upgrade-billing.37eab5ba064cf62aa832.hot-update.js": "/chunks/upgrade-billing.37eab5ba064cf62aa832.hot-update.js",
+    "/chunks/upgrade-plan.37eab5ba064cf62aa832.hot-update.js": "/chunks/upgrade-plan.37eab5ba064cf62aa832.hot-update.js",
+    "/chunks/user.37eab5ba064cf62aa832.hot-update.js": "/chunks/user.37eab5ba064cf62aa832.hot-update.js",
+    "/chunks/user-create.37eab5ba064cf62aa832.hot-update.js": "/chunks/user-create.37eab5ba064cf62aa832.hot-update.js",
+    "/chunks/user-detail.37eab5ba064cf62aa832.hot-update.js": "/chunks/user-detail.37eab5ba064cf62aa832.hot-update.js",
+    "/chunks/user-subscription.37eab5ba064cf62aa832.hot-update.js": "/chunks/user-subscription.37eab5ba064cf62aa832.hot-update.js",
+    "/chunks/users.37eab5ba064cf62aa832.hot-update.js": "/chunks/users.37eab5ba064cf62aa832.hot-update.js",
+    "/vendors~chunks/admin~chunks/admin-account~chunks/app-billings~chunks/app-email~chunks/app-index~chun~0fce7c48.js": "/vendors~chunks/admin~chunks/admin-account~chunks/app-billings~chunks/app-email~chunks/app-index~chun~0fce7c48.js?id=96589120d0f9b4a34422",
+    "/vendors~chunks/admin~chunks/admin-account~chunks/app-billings~chunks/app-email~chunks/app-index~chun~7a87ebb1.js": "/vendors~chunks/admin~chunks/admin-account~chunks/app-billings~chunks/app-email~chunks/app-index~chun~7a87ebb1.js?id=6b44cb573865b187830b",
+    "/chunks/files~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/file-browser.ba29ad37b3a7d4f26e19.hot-update.js": "/chunks/files~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/file-browser.ba29ad37b3a7d4f26e19.hot-update.js",
+    "/js/main.f5f6f0b8ebc76ba930d2.hot-update.js": "/js/main.f5f6f0b8ebc76ba930d2.hot-update.js",
+    "/chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/~ece89b0f.js": "/chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/~ece89b0f.js?id=92372114537103b630c1",
+    "/chunks/app-appearance.f5f6f0b8ebc76ba930d2.hot-update.js": "/chunks/app-appearance.f5f6f0b8ebc76ba930d2.hot-update.js",
+    "/vendors~chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~c548f929.js": "/vendors~chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~c548f929.js?id=b63ab8944445756b8141",
+    "/vendors~chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~ede83e4b.js": "/vendors~chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~ede83e4b.js?id=395a8fc2150d034ccc0f",
+    "/chunks/app-language~chunks/dashboard~chunks/files~chunks/invoices~chunks/pages~chunks/plans~chunks/s~38c276fc.9af40e5d70e94abd8d87.hot-update.js": "/chunks/app-language~chunks/dashboard~chunks/files~chunks/invoices~chunks/pages~chunks/plans~chunks/s~38c276fc.9af40e5d70e94abd8d87.hot-update.js",
+    "/chunks/upgrade-billing.12d867a7d4ddfa5b1f89.hot-update.js": "/chunks/upgrade-billing.12d867a7d4ddfa5b1f89.hot-update.js",
+    "/chunks/user-detail.b536c84bba50a6689198.hot-update.js": "/chunks/user-detail.b536c84bba50a6689198.hot-update.js",
+    "/chunks/users.5c5bb3a5cafa10a87fc7.hot-update.js": "/chunks/users.5c5bb3a5cafa10a87fc7.hot-update.js",
+    "/chunks/app-language~chunks/dashboard~chunks/files~chunks/invoices~chunks/pages~chunks/plans~chunks/s~38c276fc.b319461fab48b40c0b48.hot-update.js": "/chunks/app-language~chunks/dashboard~chunks/files~chunks/invoices~chunks/pages~chunks/plans~chunks/s~38c276fc.b319461fab48b40c0b48.hot-update.js",
+    "/chunks/user-create.75cd241e6296414d164e.hot-update.js": "/chunks/user-create.75cd241e6296414d164e.hot-update.js",
+    "/chunks/user-create.71a72bc62ccaa693d1b9.hot-update.js": "/chunks/user-create.71a72bc62ccaa693d1b9.hot-update.js",
+    "/chunks/user-create.25b6ba74c3d025d77426.hot-update.js": "/chunks/user-create.25b6ba74c3d025d77426.hot-update.js",
+    "/chunks/upgrade-billing.790f668d87df336b5aa5.hot-update.js": "/chunks/upgrade-billing.790f668d87df336b5aa5.hot-update.js",
+    "/chunks/oasis/platba.c458ce1ca12cf2106c76.hot-update.js": "/chunks/oasis/platba.c458ce1ca12cf2106c76.hot-update.js",
+    "/chunks/settings-create-payment-methods.c458ce1ca12cf2106c76.hot-update.js": "/chunks/settings-create-payment-methods.c458ce1ca12cf2106c76.hot-update.js",
+    "/chunks/upgrade-billing.c458ce1ca12cf2106c76.hot-update.js": "/chunks/upgrade-billing.c458ce1ca12cf2106c76.hot-update.js",
+    "/chunks/oasis/platba.baad278f2981042be0b8.hot-update.js": "/chunks/oasis/platba.baad278f2981042be0b8.hot-update.js",
+    "/chunks/oasis/platba.5c558c7324da51e9dcea.hot-update.js": "/chunks/oasis/platba.5c558c7324da51e9dcea.hot-update.js",
+    "/chunks/users.5c558c7324da51e9dcea.hot-update.js": "/chunks/users.5c558c7324da51e9dcea.hot-update.js"
 }
diff --git a/resources/js/Oasis/Admin/UserCreate.vue b/resources/js/Oasis/Admin/UserCreate.vue
index 267f022e..c868318f 100644
--- a/resources/js/Oasis/Admin/UserCreate.vue
+++ b/resources/js/Oasis/Admin/UserCreate.vue
@@ -1,8 +1,8 @@
 <template>
     <div id="single-page">
         <div id="page-content" class="small-width">
-            <MobileHeader :title="$router.currentRoute.meta.title"/>
-            <PageHeader :can-back="true" :title="$router.currentRoute.meta.title"/>
+            <MobileHeader :title="$t($router.currentRoute.meta.title)"/>
+            <PageHeader :can-back="true" :title="$t($router.currentRoute.meta.title)"/>
 
             <div class="content-page">
                 <ValidationObserver @submit.prevent="createUser" ref="createUser" v-slot="{ invalid }" tag="form" class="form block-form">
@@ -63,7 +63,7 @@
                         <div class="block-wrapper">
                             <label>{{ $t('admin_page_user.select_role') }}:</label>
                             <ValidationProvider tag="div" mode="passive" class="input-wrapper" name="permission" rules="required" v-slot="{ errors }">
-                                <SelectInput v-model="user.role" :options="roles" :placeholder="$t('admin_page_user.select_role')" :isError="errors[0]"/>
+                                <SelectInput v-model="user.role" :options="$translateSelectOptions(roles)" :placeholder="$t('admin_page_user.select_role')" :isError="errors[0]"/>
                                 <span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
                             </ValidationProvider>
                         </div>
diff --git a/resources/js/Oasis/Admin/UserCreateOrder.vue b/resources/js/Oasis/Admin/UserCreateOrder.vue
index dc4bce2b..00865dc5 100644
--- a/resources/js/Oasis/Admin/UserCreateOrder.vue
+++ b/resources/js/Oasis/Admin/UserCreateOrder.vue
@@ -1,8 +1,8 @@
 <template>
     <div id="single-page">
         <div id="page-content" class="small-width">
-            <MobileHeader :title="$router.currentRoute.meta.title" />
-            <PageHeader :can-back="true" :title="$router.currentRoute.meta.title" />
+            <MobileHeader :title="$t($router.currentRoute.meta.title)" />
+            <PageHeader :can-back="true" :title="$t($router.currentRoute.meta.title)" />
 
             <div class="content-page">
                 <ValidationObserver @submit.prevent="createUser" ref="createUser" v-slot="{ invalid }" tag="form" class="form block-form">
diff --git a/resources/js/Oasis/Admin/Users.vue b/resources/js/Oasis/Admin/Users.vue
index 2370eda2..ba4a92e9 100644
--- a/resources/js/Oasis/Admin/Users.vue
+++ b/resources/js/Oasis/Admin/Users.vue
@@ -1,8 +1,8 @@
 <template>
     <div id="single-page">
         <div id="page-content">
-            <MobileHeader :title="$router.currentRoute.meta.title"/>
-            <PageHeader :title="$router.currentRoute.meta.title"/>
+            <MobileHeader :title="$t($router.currentRoute.meta.title)"/>
+            <PageHeader :title="$t($router.currentRoute.meta.title)"/>
 
             <div class="content-page">
 
@@ -11,12 +11,12 @@
                     <div class="buttons">
                         <router-link :to="{name: 'CreateSubscriptionRequest'}">
                             <MobileActionButton icon="dollar-sign">
-                                Vytvorit objednavku
+                                {{ $t('oasis.create_order') }}
                             </MobileActionButton>
                         </router-link>
                         <router-link :to="{name: 'UserCreate'}">
                             <MobileActionButton icon="user-plus">
-                                Vytvorit Uzivatela
+                                {{ $t('oasis.create_user') }}
                             </MobileActionButton>
                         </router-link>
                     </div>
@@ -85,7 +85,7 @@
             </div>
         </div>
         <div id="loader" v-if="isLoading">
-            <Spinner></Spinner>
+            <Spinner/>
         </div>
     </div>
 </template>
diff --git a/resources/js/Oasis/Onboarding/PayForPlan.vue b/resources/js/Oasis/Onboarding/PayForPlan.vue
index d9095220..b4fe2e4a 100644
--- a/resources/js/Oasis/Onboarding/PayForPlan.vue
+++ b/resources/js/Oasis/Onboarding/PayForPlan.vue
@@ -17,8 +17,8 @@
                             <!-- Pay by new credit card -->
                             <div class="register-card">
                                 <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>
+                                    <p>For test your payment please use <b class="text-theme">4242 4242 4242 4242</b> or <b class="text-theme">5555 5555 5555 4444</b> as a card number, <b class="text-theme">11/22</b>
+                                        as the expiration date and <b class="text-theme">123</b> as CVC number and ZIP <b class="text-theme">12345</b>.</p>
                                 </InfoBox>
 
                                 <div ref="stripeCard" class="stripe-card" :class="{'is-error': isError }"></div>
diff --git a/resources/js/Oasis/Onboarding/SelectPlan.vue b/resources/js/Oasis/Onboarding/SelectPlan.vue
index 50b6e106..430b1e3d 100644
--- a/resources/js/Oasis/Onboarding/SelectPlan.vue
+++ b/resources/js/Oasis/Onboarding/SelectPlan.vue
@@ -16,7 +16,7 @@
             </div>
         </div>
         <div id="loader" v-if="isLoading">
-            <Spinner></Spinner>
+            <Spinner />
         </div>
     </div>
 </template>
diff --git a/resources/js/Oasis/Pages/CreatePasswordAfterPayment.vue b/resources/js/Oasis/Pages/CreatePasswordAfterPayment.vue
index 5dd074b8..17e8dd2d 100644
--- a/resources/js/Oasis/Pages/CreatePasswordAfterPayment.vue
+++ b/resources/js/Oasis/Pages/CreatePasswordAfterPayment.vue
@@ -7,8 +7,8 @@
                     <img v-if="config.app_logo" class="logo" :src="$getImage(config.app_logo)" :alt="config.app_name">
                     <b v-if="! config.app_logo" class="auth-logo-text">{{ config.app_name }}</b>
 
-                    <h1>Oasis Drive</h1>
-                    <h2>Dakujeme, platba bola uspesne zaznamenana. V poslednom kroku si prosim vytvorte heslo pre Vas ucet.</h2>
+                    <h1>{{ config.app_name }}</h1>
+                    <h2>{{ $t('successful_payment_with_password_creation') }}</h2>
                 </div>
 
                 <ValidationObserver @submit.prevent="signUp" ref="setPassword" v-slot="{ invalid }" tag="form"
@@ -41,7 +41,7 @@
             </div>
         </div>
         <div id="loader" v-if="isLoadingPage">
-            <Spinner></Spinner>
+            <Spinner />
         </div>
     </div>
 </template>
diff --git a/resources/js/Oasis/Pages/SubscriptionRequestPayment.vue b/resources/js/Oasis/Pages/SubscriptionRequestPayment.vue
index 2e2b010b..b1823e9c 100644
--- a/resources/js/Oasis/Pages/SubscriptionRequestPayment.vue
+++ b/resources/js/Oasis/Pages/SubscriptionRequestPayment.vue
@@ -7,8 +7,8 @@
                     <img v-if="config.app_logo" class="logo" :src="$getImage(config.app_logo)" :alt="config.app_name">
                     <b v-if="! config.app_logo" class="auth-logo-text">{{ config.app_name }}</b>
 
-                    <h1>Oasis Drive</h1>
-                    <h2>Zaplacenim objednavky se Vas ucet automaticky zaktivuje a vytvori se Vam digitalni prostor pro Vase dulezite dokumenty.</h2>
+                    <h1>{{ config.app_name }}</h1>
+                    <h2>{{ $t('pay_order_description') }}</h2>
                 </div>
 
                 <div class="order">
@@ -19,13 +19,13 @@
                             <!-- Pay by new credit card -->
                             <div class="register-card form block-form">
                                 <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>
+                                    <p>For test your payment please use <b class="text-theme">4242 4242 4242 4242</b> or <b class="text-theme">5555 5555 5555 4444</b> as a card number, <b class="text-theme">11/22</b>
+                                        as the expiration date and <b class="text-theme">123</b> as CVC number and ZIP <b class="text-theme">12345</b>.</p>
                                 </InfoBox>
 
 
                                 <div class="block-wrapper">
-                                    <label>Platebni karta:</label>
+                                    <label>{{ $t('payment_page.payment_gateway') }}:</label>
                                     <div ref="stripeCard" class="stripe-card" :class="{'is-error': isError }"></div>
 
                                     <div class="card-error-message" v-if="isError">
@@ -35,9 +35,9 @@
 
                                 <InfoBox v-if="requestedPlan">
                                     <ListInfo class="billing">
-                                        <ListInfoItem class="billing-item" title="Spolecnost" :content="requestedPlan.data.relationships.user.data.attributes.name" />
-                                        <ListInfoItem v-if="requestedPlan.data.relationships.user.data.attributes.ico" class="billing-item" title="ICO" :content="requestedPlan.data.relationships.user.data.attributes.ico" />
-                                        <ListInfoItem class="billing-item" title="Adresa" :content="address" />
+                                        <ListInfoItem class="billing-item" :title="$t('payment_page.company')" :content="requestedPlan.data.relationships.user.data.attributes.name" />
+                                        <ListInfoItem v-if="requestedPlan.data.relationships.user.data.attributes.ico" class="billing-item" :title="$t('payment_page.ico')" :content="requestedPlan.data.relationships.user.data.attributes.ico" />
+                                        <ListInfoItem class="billing-item" :title="$t('payment_page.address')" :content="address" />
                                     </ListInfo>
                                 </InfoBox>
                             </div>
@@ -102,7 +102,7 @@
             </div>
         </div>
         <div id="loader" v-if="isLoading">
-            <Spinner></Spinner>
+            <Spinner/>
         </div>
     </div>
 </template>
diff --git a/resources/js/components/FilesView/MobileActionButton.vue b/resources/js/components/FilesView/MobileActionButton.vue
index 0c5d67bd..58c68941 100644
--- a/resources/js/components/FilesView/MobileActionButton.vue
+++ b/resources/js/components/FilesView/MobileActionButton.vue
@@ -32,6 +32,7 @@
         components: {
             SortingAndPreviewIcon,
             CheckSquareIcon,
+            DollarSignIcon,
             CreditCardIcon,
             FolderPlusIcon,
             UserPlusIcon,
diff --git a/resources/js/views/Upgrade/UpgradeBilling.vue b/resources/js/views/Upgrade/UpgradeBilling.vue
index 9c34e969..30da226c 100644
--- a/resources/js/views/Upgrade/UpgradeBilling.vue
+++ b/resources/js/views/Upgrade/UpgradeBilling.vue
@@ -17,8 +17,8 @@
                             <!-- Pay by new credit card -->
                             <div class="register-card" v-show="! defaultPaymentMethod || payByNewCard">
                                 <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>
+                                    <p>For test your payment please use <b class="text-theme">4242 4242 4242 4242</b> or <b class="text-theme">5555 5555 5555 4444</b> as a card number, <b class="text-theme">11/22</b>
+                                        as the expiration date and <b class="text-theme">123</b> as CVC number and ZIP <b class="text-theme">12345</b>.</p>
                                 </InfoBox>
 
                                 <div ref="stripeCard" class="stripe-card" :class="{'is-error': isError }"></div>
diff --git a/resources/js/views/User/CreatePaymentMethod.vue b/resources/js/views/User/CreatePaymentMethod.vue
index d1c914f8..8333901b 100644
--- a/resources/js/views/User/CreatePaymentMethod.vue
+++ b/resources/js/views/User/CreatePaymentMethod.vue
@@ -7,8 +7,8 @@
                 <!-- Register new credit card -->
                 <div class="register-card">
                     <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>
+                        <p>For test your payment please use <b class="text-theme">4242 4242 4242 4242</b> or <b class="text-theme">5555 5555 5555 4444</b> as a card number, <b class="text-theme">11/22</b>
+                            as the expiration date and <b class="text-theme">123</b> as CVC number and ZIP <b class="text-theme">12345</b>.</p>
                     </InfoBox>
 
                     <div class="block-wrapper">