diff --git a/cp/bootstrap/app.php b/cp/bootstrap/app.php
index 71ec939..e670114 100644
--- a/cp/bootstrap/app.php
+++ b/cp/bootstrap/app.php
@@ -10,6 +10,7 @@ use Slim\Views\TwigMiddleware;
 use Twig\TwigFunction;
 use Gettext\Loader\PoLoader;
 use Gettext\Translations;
+use Punic\Language;
 
 if (session_status() == PHP_SESSION_NONE) {
     session_start();
@@ -51,12 +52,20 @@ if (isset($_SESSION['_lang']) && in_array($_SESSION['_lang'], $allowedLanguages)
     // Use regex to validate the format: two letters, underscore, two letters
     if (preg_match('/^[a-z]{2}_[A-Z]{2}$/', $_SESSION['_lang'])) {
         $desiredLanguage = $_SESSION['_lang'];
+        $parts = explode('_', $_SESSION['_lang']);
+        if (isset($parts[1])) {
+            $uiLang = strtolower($parts[1]);
+        }
     } else {
         $desiredLanguage = 'en_US';
+		$uiLang = 'us';
     }
 } else {
     $desiredLanguage = 'en_US';
+	$uiLang = 'us';
 }
+$lang_full = Language::getName($desiredLanguage, 'en');
+$lang = trim(strstr($lang_full, ' (', true));
 
 $languageFile = '../lang/' . $desiredLanguage . '/messages.po';
 if (!file_exists($languageFile)) {
@@ -87,7 +96,7 @@ $container->set('flash', function() {
     return new \Slim\Flash\Messages;
 });
 
-$container->set('view', function ($container) use ($translations) {
+$container->set('view', function ($container) use ($translations, $uiLang, $lang) {
     $view = Twig::create(__DIR__ . '/../resources/views', [
         'cache' => false,
     ]);
@@ -95,13 +104,15 @@ $container->set('view', function ($container) use ($translations) {
         'isLogin' => $container->get('auth')->isLogin(),
         'user' => $container->get('auth')->user(),
     ]);
+    $view->getEnvironment()->addGlobal('uiLang', $uiLang);
+    $view->getEnvironment()->addGlobal('lang', $lang);
     $view->getEnvironment()->addGlobal('flash', $container->get('flash'));   
     if (isset($_SESSION['_screen_mode'])) {
         $view->getEnvironment()->addGlobal('screen_mode', $_SESSION['_screen_mode']);
     } else {
         $view->getEnvironment()->addGlobal('screen_mode', 'light');
     }
-	
+
     $translateFunction = new TwigFunction('__', function ($text) use ($translations) {
         // Find the translation
         $translation = $translations->find(null, $text);
@@ -119,11 +130,11 @@ $container->set('view', function ($container) use ($translations) {
     });
     $view->getEnvironment()->addFunction($route);
     
-	// Define the route_is function
-	$routeIs = new \Twig\TwigFunction('route_is', function ($routeName) {
-		return strpos($_SERVER['REQUEST_URI'], $routeName) !== false;
-	});
-	$view->getEnvironment()->addFunction($routeIs);
+    // Define the route_is function
+    $routeIs = new \Twig\TwigFunction('route_is', function ($routeName) {
+        return strpos($_SERVER['REQUEST_URI'], $routeName) !== false;
+    });
+    $view->getEnvironment()->addFunction($routeIs);
 
     //assets
     $assets = new TwigFunction('assets', function ($location) {
@@ -156,4 +167,4 @@ $app->add(new \App\Middleware\CsrfViewMiddleware($container));
 $app->add('csrf');
 $app->setBasePath(routePath());
 
-require __DIR__ . '/../routes/web.php';
+require __DIR__ . '/../routes/web.php';
\ No newline at end of file
diff --git a/cp/resources/views/layouts/app.twig b/cp/resources/views/layouts/app.twig
index 6c1699d..d02ee49 100644
--- a/cp/resources/views/layouts/app.twig
+++ b/cp/resources/views/layouts/app.twig
@@ -34,10 +34,10 @@
           <div class="navbar-nav flex-row order-md-last">
             <div class="nav-item d-none d-md-flex me-3">
               <div class="btn-list">
-                <div class="dropdown">
-                  <a href="#" class="btn dropdown-toggle" data-bs-toggle="dropdown"><span class="flag flag-country-gb-eng"></span>&nbsp;English</a>
+                <div class="dropdown small-dropdown">
+                  <a href="#" class="btn dropdown-toggle" data-bs-toggle="dropdown"><span class="flag flag-country-{{ uiLang }}"></span>&nbsp;{{ lang }}</a>
                     <div class="dropdown-menu">
-                      <a href="/lang?en_US" class="dropdown-item"><span class="flag flag-country-gb-eng"></span>&nbsp;English</a>
+                      <a href="/lang?en_US" class="dropdown-item"><span class="flag flag-country-us"></span>&nbsp;English</a>
                       <a href="/lang?uk_UA" class="dropdown-item"><span class="flag flag-country-ua"></span>&nbsp;Ukrainian</a>
                     </div>
                 </div>
diff --git a/cp/resources/views/partials/css-tables.twig b/cp/resources/views/partials/css-tables.twig
index e28fe1f..f2c8946 100644
--- a/cp/resources/views/partials/css-tables.twig
+++ b/cp/resources/views/partials/css-tables.twig
@@ -3,4 +3,15 @@
 <link href="/assets/css/tabler-payments.min.css" rel="stylesheet"/>
 <link href="/assets/css/tabler-vendors.min.css" rel="stylesheet"/>
 <link href="/assets/css/tabulator.min.css" rel="stylesheet">
-<link href="/assets/css/tabulator_bootstrap5.min.css" rel="stylesheet">
\ No newline at end of file
+<link href="/assets/css/tabulator_bootstrap5.min.css" rel="stylesheet">
+<style>
+    .small-dropdown .dropdown-item {
+        padding: 0.25rem 1.5rem;
+    }
+
+    .small-dropdown .flag {
+        width: 20px;
+        height: 15px;
+        display: inline-block;
+    }
+</style>
\ No newline at end of file
diff --git a/cp/resources/views/partials/css.twig b/cp/resources/views/partials/css.twig
index d34697d..747964f 100644
--- a/cp/resources/views/partials/css.twig
+++ b/cp/resources/views/partials/css.twig
@@ -2,3 +2,14 @@
 <link href="/assets/css/tabler-flags.min.css" rel="stylesheet"/>
 <link href="/assets/css/tabler-payments.min.css" rel="stylesheet"/>
 <link href="/assets/css/tabler-vendors.min.css" rel="stylesheet"/>
+<style>
+    .small-dropdown .dropdown-item {
+        padding: 0.25rem 1.5rem;
+    }
+
+    .small-dropdown .flag {
+        width: 20px;
+        height: 15px;
+        display: inline-block;
+    }
+</style>
\ No newline at end of file