diff --git a/assets/js/components/dashboard.js b/assets/js/components/dashboard.js
index b658e4c2..da5a4137 100644
--- a/assets/js/components/dashboard.js
+++ b/assets/js/components/dashboard.js
@@ -97,10 +97,7 @@ module.exports = () => ({
                 continue;
             }
 
-            if (
-                null === project.currentEnvironment && null === environment
-                || (null !== project.currentEnvironment && null !== environment && project.currentEnvironment.code === environment.code)
-            ) {
+            if (null !== project.currentEnvironment && project.currentEnvironment.code === environment.code) {
                continue;
             }
 
@@ -162,8 +159,12 @@ module.exports = () => ({
             query.push(`endDate=${encodeURIComponent(end.format('YYYY-MM-DD'))}`);
             query.push(`projects[]=${encodeURIComponent(project.code)}`);
 
-            if (null !== project.currentEnvironment) {
-                query.push(`environment=${encodeURIComponent(project.currentEnvironment.code)}`);
+            if (project.environments.length) {
+                if (null !== project.currentEnvironment && null !== project.currentEnvironment.code) {
+                    query.push(`environment=${encodeURIComponent(project.currentEnvironment.code)}`);
+                }
+            } else {
+                query.push('environment=*');
             }
 
             const promise = fetch(this.request.endpoint + '?' + query.join('&'), {
@@ -248,6 +249,10 @@ module.exports = () => ({
             throw new Error('Invalid project data, the required keys are "code", "name" and "color".');
         }
 
+        if (project.environments.length) {
+            project.currentEnvironment = project.environments[0];
+        }
+
         this.projects.push(project);
     },
 
diff --git a/src/Api/Internal/Controller/StatisticsController.php b/src/Api/Internal/Controller/StatisticsController.php
index aab0f6f5..f2cc59aa 100644
--- a/src/Api/Internal/Controller/StatisticsController.php
+++ b/src/Api/Internal/Controller/StatisticsController.php
@@ -110,7 +110,7 @@ private function buildData(array $projectIdsByCodes, string $locale, DateTimeImm
         }
 
         $period = Period::create($startDate, $endDate);
-        $environmentImpl = '//default//' === $environment ? new DefaultEnvironment() : (is_string($environment) ? new NamedEnvironment($environment) : null);
+        $environmentImpl = empty($environment) ? new DefaultEnvironment() : ('*' !== $environment ? new NamedEnvironment($environment) : null);
 
         foreach ($projectIdsByCodes as $code => $projectId) {
             $consentStatistics = $this->projectStatisticsCalculator->calculateConsentStatistics(
diff --git a/src/Api/V1/Controller/CookiesController.php b/src/Api/V1/Controller/CookiesController.php
index 2d79691a..1e5d5ba5 100644
--- a/src/Api/V1/Controller/CookiesController.php
+++ b/src/Api/V1/Controller/CookiesController.php
@@ -15,6 +15,7 @@
 use App\Application\Cookie\TemplateRendererInterface;
 use App\Application\GlobalSettings\EnabledEnvironmentsResolver;
 use App\Application\GlobalSettings\GlobalSettingsInterface;
+use App\Domain\GlobalSettings\ValueObject\Environment;
 use App\Domain\Project\ValueObject\Environments;
 use App\Domain\Project\ValueObject\ProjectId;
 use App\Domain\Shared\ValueObject\Locale;
@@ -40,12 +41,17 @@ public function __construct(
         private readonly EtagStoreInterface $etagStore,
     ) {}
 
-    public static function getTemplateUrl(string $projectCode, ?string $locale = null): string
+    public static function getTemplateUrl(string $projectCode, ?string $locale = null, ?string $environment = null): string
     {
+        $query = http_build_query([
+            'locale' => $locale,
+            'environment' => $environment,
+        ]);
+
         return sprintf(
             '/api/v1/cookies/%s/template%s',
             $projectCode,
-            null !== $locale ? '?locale=' . $locale : '',
+            '' !== $query ? ('?' . $query) : '',
         );
     }
 
@@ -104,12 +110,13 @@ public function getJson(ApiRequest $request, ApiResponse $response): ApiResponse
         $projectCode = $request->getParameter('project');
         $requestEntity = $request->getEntity();
         assert($requestEntity instanceof CookiesRequestBody);
+        $environment = empty($requestEntity->environment) ? null : $requestEntity->environment;
 
         $etagKey = sprintf(
             '%s/%s/%s/[%s]/json',
             $projectCode,
             $requestEntity->locale ?? '_',
-            $requestEntity->environment ?? '__default__',
+            $environment ?? '#default',
             implode(',', (array) $requestEntity->category),
         );
 
@@ -130,7 +137,7 @@ public function getJson(ApiRequest $request, ApiResponse $response): ApiResponse
                 ]);
         }
 
-        $errorResponse = $this->tryCreateErrorResponseOnInvalidEnvironment($project->environments, $requestEntity, $response);
+        $errorResponse = $this->tryCreateErrorResponseOnInvalidEnvironment($project->environments, $environment, $response);
 
         if (null !== $errorResponse) {
             return $errorResponse;
@@ -142,7 +149,13 @@ public function getJson(ApiRequest $request, ApiResponse $response): ApiResponse
 
         $responseBody = json_encode([
             'status' => 'success',
-            'data' => $this->getCookiesData($project->id, $locale, $project->locales->defaultLocale(), $requestEntity->category, $requestEntity->environment),
+            'data' => $this->getCookiesData(
+                projectId: $project->id,
+                locale: $locale,
+                defaultLocale: $project->locales->defaultLocale(),
+                environments: $this->createEnvironmentsForQuery($environment, $project->environments),
+                categories: $requestEntity->category,
+            ),
         ], JSON_THROW_ON_ERROR);
 
         $response = $response->withStatus(ApiResponse::S200_OK)
@@ -169,12 +182,13 @@ public function getTemplate(ApiRequest $request, ApiResponse $response): ApiResp
         $projectCode = $request->getParameter('project');
         $requestEntity = $request->getEntity();
         assert($requestEntity instanceof CookiesRequestBody);
+        $environment = empty($requestEntity->environment) ? null : $requestEntity->environment;
 
         $etagKey = sprintf(
             '%s/%s/%s/[%s]/html',
             $projectCode,
             $requestEntity->locale ?? '_',
-            $requestEntity->environment ?? '__default__',
+            $environment ?? '#default',
             implode(',', (array) $requestEntity->category),
         );
 
@@ -195,7 +209,7 @@ public function getTemplate(ApiRequest $request, ApiResponse $response): ApiResp
                 ]);
         }
 
-        $errorResponse = $this->tryCreateErrorResponseOnInvalidEnvironment($projectTemplate->environments, $requestEntity, $response);
+        $errorResponse = $this->tryCreateErrorResponseOnInvalidEnvironment($projectTemplate->environments, $environment, $response);
 
         if (null !== $errorResponse) {
             return $errorResponse;
@@ -205,14 +219,20 @@ public function getTemplate(ApiRequest $request, ApiResponse $response): ApiResp
             ? Locale::fromValue($requestEntity->locale)
             : $projectTemplate->projectLocalesConfig->defaultLocale();
 
-        $data = $this->getCookiesData($projectTemplate->projectId, $locale, $projectTemplate->projectLocalesConfig->defaultLocale(), $requestEntity->category, $requestEntity->environment);
+        $data = $this->getCookiesData(
+            projectId: $projectTemplate->projectId,
+            locale: $locale,
+            defaultLocale: $projectTemplate->projectLocalesConfig->defaultLocale(),
+            environments: $this->createEnvironmentsForQuery($environment, $projectTemplate->environments),
+            categories: $requestEntity->category,
+        );
         $data = json_encode($data, JSON_THROW_ON_ERROR);
         $data = json_decode($data, false, 512, JSON_THROW_ON_ERROR);
 
         $template = Template::create(
             $projectTemplate->projectId->toString(),
             $projectTemplate->template->value(),
-            TemplateArguments::create($data->providers, $data->cookies, $requestEntity->environment),
+            TemplateArguments::create($data->providers, $data->cookies, $environment),
         );
 
         $responseBody = $this->templateRenderer->render($template);
@@ -257,24 +277,25 @@ private function applyCacheHeaders(string $etagKey, string $responseBody, ApiRes
     /**
      * @param mixed $categories
      */
-    private function getCookiesData(ProjectId $projectId, Locale $locale, ?Locale $defaultLocale, string|array|null $categories = null, ?string $environment = null): array
+    private function getCookiesData(ProjectId $projectId, Locale $locale, ?Locale $defaultLocale, array $environments, string|array|null $categories = null): array
     {
         $data = [
             'providers' => [],
             'cookies' => [],
         ];
 
-        $query = FindCookiesForApiQuery::create($projectId->toString(), null !== $defaultLocale && $defaultLocale->equals($locale) ? null : $locale->value())
-            ->withBatchSize(100);
+        $query = FindCookiesForApiQuery::create(
+            projectId: $projectId->toString(),
+            environments: $environments,
+            locale: null !== $defaultLocale && $defaultLocale->equals($locale) ? null : $locale->value(),
+        );
+
+        $query = $query->withBatchSize(100);
 
         if (null !== $categories) {
             $query = $query->withCategoryCodes((array) $categories);
         }
 
-        if (null !== $environment) {
-            $query = $query->withEnvironment($environment);
-        }
-
         foreach ($this->queryBus->dispatch($query) as $batch) {
             assert($batch instanceof Batch);
 
@@ -308,9 +329,29 @@ private function getCookiesData(ProjectId $projectId, Locale $locale, ?Locale $d
         return $data;
     }
 
-    private function tryCreateErrorResponseOnInvalidEnvironment(Environments $projectEnvironments, CookiesRequestBody $body, ApiResponse $response): ?ApiResponse
+    /**
+     * @return array<string|null>
+     */
+    private function createEnvironmentsForQuery(?string $environment, Environments $projectEnvironments): array
+    {
+        if ('*' !== $environment) {
+            return [$environment];
+        }
+
+        $environments = array_map(
+            static fn (Environment $environment): string => $environment->code,
+            EnabledEnvironmentsResolver::resolveProjectEnvironments(
+                globalSettingsEnvironments: $this->globalSettings->environments(),
+                projectEnvironments: $projectEnvironments,
+            ),
+        );
+
+        return [null, ...$environments];
+    }
+
+    private function tryCreateErrorResponseOnInvalidEnvironment(Environments $projectEnvironments, ?string $environment, ApiResponse $response): ?ApiResponse
     {
-        if (null === $body->environment || '' === $body->environment) {
+        if (null === $environment || '*' === $environment) {
             return null;
         }
 
@@ -319,8 +360,8 @@ private function tryCreateErrorResponseOnInvalidEnvironment(Environments $projec
             projectEnvironments: $projectEnvironments,
         );
 
-        foreach ($environments as $environment) {
-            if ($environment->code === $body->environment) {
+        foreach ($environments as $env) {
+            if ($env->code === $environment) {
                 return null;
             }
         }
@@ -332,7 +373,7 @@ private function tryCreateErrorResponseOnInvalidEnvironment(Environments $projec
                     'code' => ApiResponse::S400_BAD_REQUEST,
                     'error' => sprintf(
                         'Project does not have the "%s" environment.',
-                        $body->environment,
+                        $environment,
                     ),
                 ],
             ]);
diff --git a/src/Domain/GlobalSettings/ValueObject/Environment.php b/src/Domain/GlobalSettings/ValueObject/Environment.php
index ec1e62aa..2ba30a96 100644
--- a/src/Domain/GlobalSettings/ValueObject/Environment.php
+++ b/src/Domain/GlobalSettings/ValueObject/Environment.php
@@ -42,6 +42,10 @@ public static function fromNative(mixed $native): self
             }
         }
 
+        if (!preg_match('/^[a-z0-9_\-\.]+$/', $native['code'])) {
+            throw UnableToCreateEnvironmentFromNativeValue::invalidNativeValueType($key, 'a string that matches the pattern "^[a-z0-9_\-\.]+$".');
+        }
+
         return new Environment(
             code: $native['code'],
             name: $native['name'],
diff --git a/src/Infrastructure/Cookie/Doctrine/ReadModel/FindCookiesForApiQueryHandler.php b/src/Infrastructure/Cookie/Doctrine/ReadModel/FindCookiesForApiQueryHandler.php
index 88830a96..39c9e89f 100644
--- a/src/Infrastructure/Cookie/Doctrine/ReadModel/FindCookiesForApiQueryHandler.php
+++ b/src/Infrastructure/Cookie/Doctrine/ReadModel/FindCookiesForApiQueryHandler.php
@@ -13,6 +13,7 @@
 use App\ReadModel\Cookie\FindCookiesForApiQuery;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Query\Expr\Join;
+use Doctrine\ORM\Query\Expr\Orx;
 use Generator;
 use SixtyEightPublishers\ArchitectureBundle\Infrastructure\Doctrine\ReadModel\BatchGeneratorFactory;
 use SixtyEightPublishers\ArchitectureBundle\ReadModel\Query\QueryHandlerInterface;
@@ -37,11 +38,20 @@ public function __invoke(FindCookiesForApiQuery $query): Generator
             ->leftJoin(ProjectHasCookieProvider::class, 'phc', Join::WITH, 'phc.cookieProviderId = cp.id AND phc.project = p')
             ->where('c.deletedAt IS NULL')
             ->andWhere('c.active = true')
-            ->andWhere('(c.allEnvironments = true OR JSONB_CONTAINS(c.environments, :environment) = true)')
             ->andWhere('(phc.id IS NOT NULL OR cp.id = p.cookieProviderId)')
             ->orderBy('c.createdAt', 'ASC')
-            ->setParameter('projectId', $query->projectId())
-            ->setParameter('environment', json_encode([$query->environment()]));
+            ->setParameter('projectId', $query->projectId());
+
+        $environmentsConditions = [
+            'c.allEnvironments = true',
+        ];
+
+        foreach ($query->environments() as $index => $environment) {
+            $environmentsConditions[] = "JSONB_CONTAINS(c.environments, :environment_$index) = true";
+            $qb->setParameter('environment_' . $index, json_encode([$environment]));
+        }
+
+        $qb->andWhere(new Orx($environmentsConditions));
 
         $qb->leftJoin('c.translations', 'ct_default', Join::WITH, 'ct_default.locale = p.locales.defaultLocale')
             ->leftJoin('cat.translations', 'catt_default', Join::WITH, 'catt_default.locale = p.locales.defaultLocale')
diff --git a/src/ReadModel/Cookie/FindCookiesForApiQuery.php b/src/ReadModel/Cookie/FindCookiesForApiQuery.php
index a222da1e..7b9e41f6 100644
--- a/src/ReadModel/Cookie/FindCookiesForApiQuery.php
+++ b/src/ReadModel/Cookie/FindCookiesForApiQuery.php
@@ -11,10 +11,14 @@
  */
 final class FindCookiesForApiQuery extends AbstractBatchedQuery
 {
-    public static function create(string $projectId, ?string $locale = null): self
+    /**
+     * @param non-empty-list<string|null> $environments
+     */
+    public static function create(string $projectId, array $environments, ?string $locale = null): self
     {
         return self::fromParameters([
             'project_id' => $projectId,
+            'environments' => $environments,
             'locale' => $locale,
         ]);
     }
@@ -27,11 +31,6 @@ public function withCategoryCodes(array $categoryCodes): self
         return $this->withParam('category_codes', $categoryCodes);
     }
 
-    public function withEnvironment(string $environment): self
-    {
-        return $this->withParam('environment', $environment);
-    }
-
     public function projectId(): string
     {
         return $this->getParam('project_id');
@@ -50,8 +49,11 @@ public function categoryCodes(): ?array
         return $this->getParam('category_codes');
     }
 
-    public function environment(): ?string
+    /**
+     * @return non-empty-list<string|null>
+     */
+    public function environments(): array
     {
-        return $this->getParam('environment');
+        return $this->getParam('environments');
     }
 }
diff --git a/src/Web/AdminModule/ApplicationModule/Control/EnvironmentsForm/EnvironmentsFormControl.php b/src/Web/AdminModule/ApplicationModule/Control/EnvironmentsForm/EnvironmentsFormControl.php
index 2c851400..bfa3d5ca 100644
--- a/src/Web/AdminModule/ApplicationModule/Control/EnvironmentsForm/EnvironmentsFormControl.php
+++ b/src/Web/AdminModule/ApplicationModule/Control/EnvironmentsForm/EnvironmentsFormControl.php
@@ -50,6 +50,7 @@ protected function createComponentForm(): Form
             $container->addText('code')
                 ->setHtmlAttribute('placeholder', 'code.placeholder')
                 ->setRequired('code.required')
+                ->addRule(Form::Pattern, 'code.rule.pattern', '[a-z0-9_\-\.]+')
                 ->addRule(UniqueMultiplierValuesValidator::Validator, 'code.rule.values_are_not_unique');
 
             $container->addText('name')
diff --git a/src/Web/AdminModule/CookieModule/Control/CookieForm/templates/form.imports.latte b/src/Web/AdminModule/CookieModule/Control/CookieForm/templates/form.imports.latte
index 3008ef2a..9b14b575 100644
--- a/src/Web/AdminModule/CookieModule/Control/CookieForm/templates/form.imports.latte
+++ b/src/Web/AdminModule/CookieModule/Control/CookieForm/templates/form.imports.latte
@@ -40,7 +40,7 @@
             <div class="ml-3 text-sm">
                 {if '' === $k}
                     <label n:name="$control:$k" class="inline-flex items-center gap-x-1.5 rounded-md px-2 py-0.5">
-                        <svg class="h-1.5 w-1.5 fill-white" viewBox="0 0 6 6" aria-hidden="true">
+                        <svg class="h-1.5 w-1.5 fill-white rounded border border-black" viewBox="0 0 6 6" aria-hidden="true">
                             <circle cx="3" cy="3" r="3" />
                         </svg>
                         {=$control->translate($v)}
diff --git a/src/Web/AdminModule/CookieModule/Control/CookieList/templates/datagrid.latte b/src/Web/AdminModule/CookieModule/Control/CookieList/templates/datagrid.latte
index f563ddc5..b0f48673 100644
--- a/src/Web/AdminModule/CookieModule/Control/CookieList/templates/datagrid.latte
+++ b/src/Web/AdminModule/CookieModule/Control/CookieList/templates/datagrid.latte
@@ -103,10 +103,10 @@
     <div class="min-w-[150px]">
         {if true === $item->environments}
             <span class="inline-flex items-center gap-x-1.5 rounded-md px-1 py-1 select-all">
-                <svg class="h-1.5 w-1.5 fill-white" viewBox="0 0 6 6" aria-hidden="true">
+                <svg class="h-1.5 w-1.5 fill-black" viewBox="0 0 6 6" aria-hidden="true">
                     <circle cx="3" cy="3" r="3" />
                 </svg>
-                {_all_environments}
+                {_//layout.all_environments}
             </span>
         {else}
             {var $environments = $item->environments}
@@ -132,7 +132,7 @@
                         'x-tooltip.interactive.theme.light-border.placement.right.html.raw' => $tooltip
                     ]}
 
-                    <span n:attr="$attrs">&nbsp;{_and_more_projects, count($environments)}</span>
+                    <span n:attr="$attrs">{_and_more_projects, count($environments)}</span>
                 {/if}
             </div>
         {/if}
@@ -161,7 +161,7 @@
 {define #environment-badge, string|null $environment, bool $vertical = false}
     {if null === $environment}
         <span n:class="$vertical ? 'flex my-1.5' : 'inline-flex', 'items-center gap-x-1.5 rounded-md px-1 py-1 select-all'">
-            <svg class="h-1.5 w-1.5 fill-white" viewBox="0 0 6 6" aria-hidden="true">
+            <svg class="h-1.5 w-1.5 fill-white rounded border border-black" viewBox="0 0 6 6" aria-hidden="true">
                 <circle cx="3" cy="3" r="3" />
             </svg>
             {_//layout.default_environment}
@@ -169,14 +169,14 @@
     {elseif null !== $_globalEnvironments->getByCode($environment)}
         {var $globalEnvironment = $_globalEnvironments->getByCode($environment)}
         <span n:class="$vertical ? 'flex my-1.5' : 'inline-flex', 'items-center gap-x-1.5 rounded-md px-1 py-1 select-all'">
-            <svg class="h-1.5 w-1.5 fill-white" viewBox="0 0 6 6" aria-hidden="true" style="fill: {$globalEnvironment->color->value()|noescape}">
+            <svg class="h-1.5 w-1.5" viewBox="0 0 6 6" aria-hidden="true" style="fill: {$globalEnvironment->color->value()|noescape}">
                 <circle cx="3" cy="3" r="3" />
             </svg>
             {$globalEnvironment->name}
         </span>
     {else}
         <span n:class="$vertical ? 'flex my-1.5' : 'inline-flex', 'items-center gap-x-1.5 rounded-md px-1 py-1 select-all'">
-            <svg class="h-1.5 w-1.5 fill-white" viewBox="0 0 6 6" aria-hidden="true">
+            <svg class="h-1.5 w-1.5 fill-white rounded border border-black" viewBox="0 0 6 6" aria-hidden="true">
                 <circle cx="3" cy="3" r="3" />
             </svg>
             {$environment}
diff --git a/src/Web/AdminModule/ImportModule/Control/ImportDetail/templates/importDetailControl.latte b/src/Web/AdminModule/ImportModule/Control/ImportDetail/templates/importDetailControl.latte
index 75b6efec..911adcb0 100644
--- a/src/Web/AdminModule/ImportModule/Control/ImportDetail/templates/importDetailControl.latte
+++ b/src/Web/AdminModule/ImportModule/Control/ImportDetail/templates/importDetailControl.latte
@@ -6,7 +6,7 @@
             error: true,
             warning: true,
             isVisible(el) {
-                const dt = el.getAttribute('data-type');
+                var dt = el.getAttribute('data-type');
 
                 return dt === 'unknown' || (dt === 'success' && this.success) || (dt === 'error' && this.error) || (dt === 'warning' && this.warning);
             }
diff --git a/src/Web/AdminModule/Presenter/DashboardPresenter.php b/src/Web/AdminModule/Presenter/DashboardPresenter.php
index 101a90f3..4e776e8d 100644
--- a/src/Web/AdminModule/Presenter/DashboardPresenter.php
+++ b/src/Web/AdminModule/Presenter/DashboardPresenter.php
@@ -9,12 +9,11 @@
 use App\Application\Acl\ProjectConsentResource;
 use App\Application\Acl\ProjectCookieProviderResource;
 use App\Application\Acl\ProjectCookieResource;
-use App\Application\GlobalSettings\EnabledEnvironmentsResolver;
-use App\Domain\GlobalSettings\ValueObject\Environment;
 use App\ReadModel\Project\FindUserProjectsQuery;
 use App\ReadModel\Project\ProjectView;
 use App\ReadModel\User\UserView;
 use App\Web\Utils\Color;
+use App\Web\Utils\ProjectEnvironmentOptions;
 use Nette\Application\UI\InvalidLinkException;
 use SixtyEightPublishers\ArchitectureBundle\Bus\QueryBusInterface;
 use SixtyEightPublishers\UserBundle\Application\Exception\IdentityException;
@@ -41,49 +40,35 @@ protected function beforeRender(): void
         $globalEnvironments = $this->globalSettings->environments();
         $projects = $this->queryBus->dispatch(FindUserProjectsQuery::create($this->getIdentity()->id()->toString()));
 
-        $template->projectsData = array_map(fn (ProjectView $project) => [
-            'code' => $project->code->value(),
-            'domain' => filter_var('http://' . $project->domain->value(), FILTER_VALIDATE_URL) ?: null,
-            'name' => $project->name->value(),
-            'color' => $project->color->value(),
-            'fontColor' => Color::resolveFontColor($project->color->value()),
-            'environments' => 1 < count($projectEnvironments = array_merge(
-                [
-                    [
-                        'code' => '//default//',
-                        'name' => $this->getTranslator()->translate('//layout.default_environment'),
-                        'color' => '#ffffff',
-                    ],
-                ],
-                array_values(
-                    array_map(
-                        static fn (Environment $environment): array => [
-                            'code' => $environment->code,
-                            'name' => $environment->name,
-                            'color' => $environment->color->value(),
-                        ],
-                        EnabledEnvironmentsResolver::resolveProjectEnvironments(
-                            globalSettingsEnvironments: $globalEnvironments,
-                            projectEnvironments: $project->environments,
-                        ),
-                    ),
+        $template->projectsData = array_map(
+            fn (ProjectView $project): array => [
+                'code' => $project->code->value(),
+                'domain' => filter_var('http://' . $project->domain->value(), FILTER_VALIDATE_URL) ?: null,
+                'name' => $project->name->value(),
+                'color' => $project->color->value(),
+                'fontColor' => Color::resolveFontColor($project->color->value()),
+                'environments' => ProjectEnvironmentOptions::create(
+                    globalSettingsEnvironments: $globalEnvironments,
+                    projectEnvironments: $project->environments,
+                    translator: $this->getTranslator(),
                 ),
-            )) ? $projectEnvironments : [],
-            'links' => [
-                'consents' => $this->getUser()->isAllowed(ProjectConsentResource::class, ProjectConsentResource::READ)
-                    ? $this->link(':Admin:Project:Consents:', ['project' => $project->code->value()])
-                    : null,
-                'providers' => $this->getUser()->isAllowed(ProjectCookieProviderResource::class, ProjectCookieProviderResource::UPDATE)
-                    ? $this->link(':Admin:Project:Providers:', ['project' => $project->code->value()])
-                    : null,
-                'cookies' => $this->getUser()->isAllowed(ProjectCookieResource::class, ProjectCookieResource::READ)
-                    ? $this->link(':Admin:Project:Cookies:', ['project' => $project->code->value()])
-                    : null,
-                'cookieSuggestions' => $this->getUser()->isAllowed(FoundCookiesResource::class, FoundCookiesResource::READ)
-                    ? $this->link(':Admin:Cookie:FoundCookies:', ['id' => $project->id->toString()])
-                    : null,
+                'links' => [
+                    'consents' => $this->getUser()->isAllowed(ProjectConsentResource::class, ProjectConsentResource::READ)
+                        ? $this->link(':Admin:Project:Consents:', ['project' => $project->code->value()])
+                        : null,
+                    'providers' => $this->getUser()->isAllowed(ProjectCookieProviderResource::class, ProjectCookieProviderResource::UPDATE)
+                        ? $this->link(':Admin:Project:Providers:', ['project' => $project->code->value()])
+                        : null,
+                    'cookies' => $this->getUser()->isAllowed(ProjectCookieResource::class, ProjectCookieResource::READ)
+                        ? $this->link(':Admin:Project:Cookies:', ['project' => $project->code->value()])
+                        : null,
+                    'cookieSuggestions' => $this->getUser()->isAllowed(FoundCookiesResource::class, FoundCookiesResource::READ)
+                        ? $this->link(':Admin:Cookie:FoundCookies:', ['id' => $project->id->toString()])
+                        : null,
+                ],
             ],
-        ], $projects);
+            $projects,
+        );
 
         $identity = $this->getIdentity();
         $userData = $identity->data();
diff --git a/src/Web/AdminModule/Presenter/templates/Dashboard.default.latte b/src/Web/AdminModule/Presenter/templates/Dashboard.default.latte
index 7c667644..e3b001c3 100644
--- a/src/Web/AdminModule/Presenter/templates/Dashboard.default.latte
+++ b/src/Web/AdminModule/Presenter/templates/Dashboard.default.latte
@@ -79,22 +79,15 @@
                             <div x-show="project.environments.length">
                                 <div x-data="dropdown" x-bind="dropdown" class="relative inline-block text-left">
                                     <div>
-                                        <button x-bind="dropdownButton" type="button" class="inline-flex items-center pl-4 pr-6 py-2 border border-transparent rounded-md text-sm font-medium bg-gray-50 hover:bg-gray-200 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-gray-200">
-                                            <span
-                                                x-show="null === project.currentEnvironment"
-                                                class="flex w-full items-center gap-x-1.5 rounded-md text-xs font-medium text-gray-900"
-                                            >
-                                                <svg class="h-1.5 w-1.5 fill-white" viewBox="0 0 6 6" aria-hidden="true">
-                                                    <circle cx="3" cy="3" r="3" />
-                                                </svg>
-                                                {{_all_environments}}
-                                            </span>
-
-                                            <span
-                                                x-show="null !== project.currentEnvironment"
-                                                class="flex w-full items-center gap-x-1.5 rounded-md text-xs font-medium text-gray-900"
-                                            >
-                                                <svg :style="{ fill: project.currentEnvironment ? project.currentEnvironment.color : '#ffffff' }" class="h-1.5 w-1.5" viewBox="0 0 6 6" aria-hidden="true">
+                                        <button x-bind="dropdownButton" type="button" class="inline-flex items-center pl-4 pr-6 py-2 border border-transparent rounded-md text-sm text-gray-700 bg-gray-50 hover:bg-gray-200 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-gray-200">
+                                            <span class="flex w-full items-center gap-x-1.5 rounded-md">
+                                                <svg
+                                                    :style="{ fill: project.currentEnvironment ? project.currentEnvironment.color : '#ffffff' }"
+                                                    :class="project.currentEnvironment && ['#ffffff', '#fff'].includes(project.currentEnvironment.color) ? 'rounded border border-black' : ''"
+                                                    class="h-1.5 w-1.5"
+                                                    viewBox="0 0 6 6"
+                                                    aria-hidden="true"
+                                                >
                                                     <circle cx="3" cy="3" r="3" />
                                                 </svg>
                                                 <span x-text="project.currentEnvironment ? project.currentEnvironment.name : ''"></span>
@@ -103,21 +96,17 @@
                                     </div>
 
                                     <div x-bind="dropdownPanel" x-cloak class="absolute right-0 z-10 mt-2 w-48 origin-top-right rounded-md bg-white shadow-lg py-1 ring-1 ring-black ring-opacity-5 focus:outline-none" role="menu" tabindex="-1">
-                                        <div class="px-1">
-                                            <button @click="changeProjectEnvironment(project.code, null) && close()" type="button" class="flex w-full items-center px-3 py-2 text-sm text-gray-700 rounded hover:bg-gray-100 active:bg-gray-100 focus:bg-gray-100 border-none" role="menuitem" tabindex="-1">
-                                                <span class="flex w-full items-center gap-x-1.5 rounded-md text-xs font-medium text-gray-900">
-                                                    <svg class="h-1.5 w-1.5 fill-white" viewBox="0 0 6 6" aria-hidden="true">
-                                                        <circle cx="3" cy="3" r="3" />
-                                                    </svg>
-                                                    {{_all_environments}}
-                                                </span>
-                                            </button>
-                                        </div>
-                                        <template x-for="environment in project.environments" :key="environment.code" hidden>
+                                        <template x-for="environment in project.environments" :key="environment.code || ''" hidden>
                                             <div class="px-1">
                                                 <button @click="changeProjectEnvironment(project.code, environment) && close()" type="button" class="flex w-full items-center px-3 py-2 text-sm text-gray-700 rounded hover:bg-gray-100 active:bg-gray-100 focus:bg-gray-100 border-none" role="menuitem" tabindex="-1">
-                                                    <span class="flex w-full items-center gap-x-1.5 rounded-md text-xs font-medium text-gray-900">
-                                                        <svg :style="{ fill: environment.color }" class="h-1.5 w-1.5" viewBox="0 0 6 6" aria-hidden="true">
+                                                    <span class="flex w-full items-center gap-x-1.5 rounded-md">
+                                                        <svg
+                                                            :style="{ fill: environment.color }"
+                                                            :class="['#ffffff', '#fff'].includes(environment.color) ? 'rounded border border-black' : ''"
+                                                            class="h-1.5 w-1.5"
+                                                            viewBox="0 0 6 6"
+                                                            aria-hidden="true"
+                                                        >
                                                             <circle cx="3" cy="3" r="3" />
                                                         </svg>
                                                         <span x-text="environment.name"></span>
diff --git a/src/Web/AdminModule/ProjectModule/Control/ConsentHistory/templates/consentHistoryControl.latte b/src/Web/AdminModule/ProjectModule/Control/ConsentHistory/templates/consentHistoryControl.latte
index eca7efa9..da8b3f29 100644
--- a/src/Web/AdminModule/ProjectModule/Control/ConsentHistory/templates/consentHistoryControl.latte
+++ b/src/Web/AdminModule/ProjectModule/Control/ConsentHistory/templates/consentHistoryControl.latte
@@ -103,19 +103,19 @@
                             <td colspan="2" class="whitespace-nowrap px-2 py-2 text-sm text-left">
                                 <span class="inline-flex items-center gap-x-1.5 rounded-md">
                                     {if null === $environment}
-                                        {*<svg class="h-1.5 w-1.5 fill-white" viewBox="0 0 6 6" aria-hidden="true">
+                                        <svg class="h-1.5 w-1.5 fill-white rounded border border-black" viewBox="0 0 6 6" aria-hidden="true">
                                             <circle cx="3" cy="3" r="3" />
-                                        </svg>*}
+                                        </svg>
                                         {_//layout.default_environment}
                                     {elseif isset($environments[$environment->value()])}
-                                       <svg class="h-1.5 w-1.5 fill-white" viewBox="0 0 6 6" aria-hidden="true" style="fill: {$environments[$environment->value()]->color->value()|noescape}">
+                                       <svg class="h-1.5 w-1.5" viewBox="0 0 6 6" aria-hidden="true" style="fill: {$environments[$environment->value()]->color->value()|noescape}">
                                             <circle cx="3" cy="3" r="3" />
                                         </svg>
                                         {$environments[$environment->value()]->name}
                                     {else}
-                                        {*<svg class="h-1.5 w-1.5 fill-white" viewBox="0 0 6 6" aria-hidden="true">
+                                        <svg class="h-1.5 w-1.5 fill-white rounded border border-black" viewBox="0 0 6 6" aria-hidden="true">
                                             <circle cx="3" cy="3" r="3" />
-                                        </svg>*}
+                                        </svg>
                                         {$environment->value()}
                                     {/if}
                                 </span>
diff --git a/src/Web/AdminModule/ProjectModule/Control/ConsentList/ConsentListControl.php b/src/Web/AdminModule/ProjectModule/Control/ConsentList/ConsentListControl.php
index ce95df55..3f51fbb7 100644
--- a/src/Web/AdminModule/ProjectModule/Control/ConsentList/ConsentListControl.php
+++ b/src/Web/AdminModule/ProjectModule/Control/ConsentList/ConsentListControl.php
@@ -25,7 +25,6 @@
 use App\Web\Ui\DataGrid\DataGrid;
 use App\Web\Ui\DataGrid\DataGridFactoryInterface;
 use App\Web\Ui\DataGrid\DataSource\ReadModelDataSource;
-use App\Web\Ui\DataGrid\Helper\FilterHelper;
 use Nette\Application\UI\Multiplier;
 use Nette\InvalidStateException;
 use Ramsey\Uuid\Uuid;
@@ -84,8 +83,10 @@ protected function createComponentGrid(): DataGrid
             $grid->addColumnText('environment', 'environment', 'environment')
                 ->setAlign('center')
                 ->setFilterSelect(
-                    options: FilterHelper::all($translator)
-                    + [ConsentsDataGridQueryHandler::FILTER_ENVIRONMENT_DEFAULT_ENV_VALUE => $this->getTranslator()->translate('//layout.default_environment')]
+                    options: [
+                        '' => $translator->translate('//layout.all_environments'),
+                        ConsentsDataGridQueryHandler::FILTER_ENVIRONMENT_DEFAULT_ENV_VALUE => $translator->translate('//layout.default_environment'),
+                    ]
                     + array_map(
                         static fn (Environment $environment): string => $environment->name,
                         $environments,
diff --git a/src/Web/AdminModule/ProjectModule/Control/ConsentList/templates/datagrid.latte b/src/Web/AdminModule/ProjectModule/Control/ConsentList/templates/datagrid.latte
index 22a3508e..0b48851d 100644
--- a/src/Web/AdminModule/ProjectModule/Control/ConsentList/templates/datagrid.latte
+++ b/src/Web/AdminModule/ProjectModule/Control/ConsentList/templates/datagrid.latte
@@ -12,13 +12,10 @@
 {define col-settings_short_identifier}
     {if NULL !== $item->settingsShortIdentifier}
         {if NULL !== $item->settingsId}
-            <div class="flex justify-between">
-                <a id="show-consent-settings-{$item->id}" href="{$linkFactory('openModal!', ['consentSettingsDetail-' . Ramsey\Uuid\Uuid::fromString($item->settingsId)->getHex()->toString()])}" class="ajax text-indigo-700 inline-flex items-center mr-1">
-                    {_settingsShortIdentifierValue, ['shortIdentifier' => $item->settingsShortIdentifier]}
-                    {svg common/eye.svg, class: 'h-5 w-5 ml-1'}
-                </a>
-                <div data-spinner-for="show-consent-settings-{$item->id}" class="h-6 w-6"></div>
-            </div>
+            <a href="{$linkFactory('openModal!', ['consentSettingsDetail-' . Ramsey\Uuid\Uuid::fromString($item->settingsId)->getHex()->toString()])}" data-spinner-for="self" class="ajax text-indigo-700 inline-flex items-center mr-1 !overflow-visible">
+                {_settingsShortIdentifierValue, ['shortIdentifier' => $item->settingsShortIdentifier]}
+                {svg common/eye.svg, class: 'h-5 w-5 ml-1'}
+            </a>
         {else}
             {_settingsShortIdentifierValue, ['shortIdentifier' => $item->settingsShortIdentifier]}
         {/if}
@@ -32,17 +29,17 @@
 {define #environment-badge, string|null $code}
     <span class="inline-flex items-center gap-x-1.5 rounded-md px-2 py-1">
         {if null === $code}
-            <svg class="h-1.5 w-1.5 fill-white" viewBox="0 0 6 6" aria-hidden="true">
+            <svg class="h-1.5 w-1.5 fill-white rounded border border-black" viewBox="0 0 6 6" aria-hidden="true">
                 <circle cx="3" cy="3" r="3" />
             </svg>
             {_//layout.default_environment}
         {elseif isset($environments[$code])}
-           <svg class="h-1.5 w-1.5 fill-white" viewBox="0 0 6 6" aria-hidden="true" style="fill: {$environments[$code]->color->value()|noescape}">
+           <svg class="h-1.5 w-1.5" viewBox="0 0 6 6" aria-hidden="true" style="fill: {$environments[$code]->color->value()|noescape}">
                 <circle cx="3" cy="3" r="3" />
             </svg>
             {$environments[$code]->name}
         {else}
-            <svg class="h-1.5 w-1.5 fill-white" viewBox="0 0 6 6" aria-hidden="true">
+            <svg class="h-1.5 w-1.5 fill-white rounded border border-black" viewBox="0 0 6 6" aria-hidden="true">
                 <circle cx="3" cy="3" r="3" />
             </svg>
             {$code}
diff --git a/src/Web/AdminModule/ProjectModule/Control/ProjectForm/templates/form.imports.latte b/src/Web/AdminModule/ProjectModule/Control/ProjectForm/templates/form.imports.latte
index 607bd026..ef4a6595 100644
--- a/src/Web/AdminModule/ProjectModule/Control/ProjectForm/templates/form.imports.latte
+++ b/src/Web/AdminModule/ProjectModule/Control/ProjectForm/templates/form.imports.latte
@@ -14,7 +14,7 @@
             <div class="ml-3 text-sm">
                 {if '' === $k}
                     <label n:name="$control:$k" class="inline-flex items-center gap-x-1.5 rounded-md px-2 py-0.5">
-                        <svg class="h-1.5 w-1.5 fill-white" viewBox="0 0 6 6" aria-hidden="true">
+                        <svg class="h-1.5 w-1.5 fill-white rounded border border-black" viewBox="0 0 6 6" aria-hidden="true">
                             <circle cx="3" cy="3" r="3" />
                         </svg>
                         {=$control->translate($v)}
diff --git a/src/Web/AdminModule/ProjectModule/Control/TemplatesForm/TemplatesFormControl.php b/src/Web/AdminModule/ProjectModule/Control/TemplatesForm/TemplatesFormControl.php
index b08813e3..b2040841 100644
--- a/src/Web/AdminModule/ProjectModule/Control/TemplatesForm/TemplatesFormControl.php
+++ b/src/Web/AdminModule/ProjectModule/Control/TemplatesForm/TemplatesFormControl.php
@@ -4,6 +4,8 @@
 
 namespace App\Web\AdminModule\ProjectModule\Control\TemplatesForm;
 
+use App\Api\V1\Controller\CookiesController;
+use App\Application\GlobalSettings\GlobalSettingsInterface;
 use App\Application\GlobalSettings\ValidLocalesProvider;
 use App\Domain\Project\Command\UpdateProjectTemplatesCommand;
 use App\Domain\Project\Exception\InvalidTemplateException;
@@ -15,7 +17,7 @@
 use App\Web\Ui\Control;
 use App\Web\Ui\Form\FormFactoryInterface;
 use App\Web\Ui\Form\FormFactoryOptionsTrait;
-use Nepada\FormRenderer\TemplateRenderer;
+use App\Web\Utils\ProjectEnvironmentOptions;
 use Nette\Application\UI\Form;
 use SixtyEightPublishers\ArchitectureBundle\Bus\CommandBusInterface;
 use SixtyEightPublishers\ArchitectureBundle\Bus\QueryBusInterface;
@@ -31,25 +33,44 @@ public function __construct(
         private readonly FormFactoryInterface $formFactory,
         private readonly CommandBusInterface $commandBus,
         private readonly QueryBusInterface $queryBus,
+        private readonly GlobalSettingsInterface $globalSettings,
     ) {}
 
     protected function createComponentForm(): Form
     {
-        $form = $this->formFactory->create($this->getFormFactoryOptions());
         $translator = $this->getPrefixedTranslator();
-        $renderer = $form->getRenderer();
         $locales = [];
 
-        assert($renderer instanceof TemplateRenderer);
-
         foreach ($this->validLocalesProvider->getValidLocales() as $locale) {
             $locales[$localeCode = $locale->code()] = $translator->translate('locale_tab', ['code' => $localeCode, 'name' => $locale->name()]);
         }
 
+        $form = $this->formFactory->create(array_merge(
+            $this->getFormFactoryOptions(),
+            [
+                FormFactoryInterface::OPTION_IMPORTS => __DIR__ . '/templates/form.imports.latte',
+                FormFactoryInterface::OPTION_TEMPLATE_VARIABLES => [
+                    'locales' => $locales,
+                    'projectCode' => $this->projectView->code->value(),
+                    'environments' => ProjectEnvironmentOptions::create(
+                        globalSettingsEnvironments: $this->globalSettings->environments(),
+                        projectEnvironments: $this->projectView->environments,
+                        translator: $translator,
+                        additionalMapper: function (object $environment): object {
+                            $environment->link = CookiesController::getTemplateUrl(
+                                projectCode: $this->projectView->code->value(),
+                                locale: '__LOCALE__',
+                                environment: $environment->code,
+                            );
+
+                            return $environment;
+                        },
+                    ),
+                ],
+            ],
+        ));
+
         $form->setTranslator($translator);
-        $renderer->importTemplate(__DIR__ . '/templates/form.imports.latte');
-        $renderer->getTemplate()->locales = $locales;
-        $renderer->getTemplate()->projectCode = $this->projectView->code->value();
 
         $templatesContainer = $form->addContainer('templates');
 
diff --git a/src/Web/AdminModule/ProjectModule/Control/TemplatesForm/templates/form.imports.latte b/src/Web/AdminModule/ProjectModule/Control/TemplatesForm/templates/form.imports.latte
index 19b84958..f537c362 100644
--- a/src/Web/AdminModule/ProjectModule/Control/TemplatesForm/templates/form.imports.latte
+++ b/src/Web/AdminModule/ProjectModule/Control/TemplatesForm/templates/form.imports.latte
@@ -1,5 +1,6 @@
 {varType array $locales}
 {varType string $projectCode}
+{varType array $environments}
 
 {define #container-name-templates, $container}
     {var $active = array_key_first($locales)}
@@ -7,16 +8,47 @@
     <div
         x-data="{
             activeTab: '{$active}',
+            environments: JSON.parse('{Nette\Utils\Json::encode($environments)}'),
+            currentEnvironment: null,
             init() {
                 var activeTab = window.localStorage.getItem('cmp_integration_templates_active_tab');
 
                 if (activeTab && this.$el.querySelector('[data-tab=\'' + activeTab + '\']')) {
                     this.activeTab = activeTab;
                 }
+
+                var storedEnvironmentCode = window.localStorage.getItem('cmp_integration_templates_active_environment');
+                var storedEnvironment = undefined;
+                var defaultEnvironment = undefined;
+
+                for (var environment of this.environments) {
+                    if (storedEnvironmentCode === environment.code) {
+                        storedEnvironment = environment;
+                    }
+
+                    if (null === environment.code) {
+                        defaultEnvironment = environment;
+                    }
+
+                    environment.link = environment.link.replace('__LOCALE__', this.activeTab);
+                }
+
+                this.selectEnvironment(storedEnvironment || defaultEnvironment || this.environments[0] || null);
             },
             changeTab(tab) {
                 this.activeTab = tab;
                 window.localStorage.setItem('cmp_integration_templates_active_tab', tab);
+            },
+            selectEnvironment(environment) {
+                this.currentEnvironment = environment;
+
+                if (null === environment || null === environment.code) {
+                    window.localStorage.removeItem('cmp_integration_templates_active_environment');
+                } else {
+                    window.localStorage.setItem('cmp_integration_templates_active_environment', environment.code);
+                }
+
+                return true;
             }
         }"
         class="sm:border-b sm:border-gray-200 sm:pb-5 px-4 sm:px-6"
@@ -30,11 +62,59 @@
                 <div n:foreach="array_keys($locales) as $locale" n:attr="x-cloak => $active === $locale ? TRUE : NULL" x-show.transition.in.opacity.duration.200="activeTab === '{$locale}'">
                     {include #helpers-override-split, blockNamePrefix => control, control => $container[$locale]}
                     <div class="mt-4">
-                        <div class="mb-1">
-                            <a href="{App\Api\V1\Controller\CookiesController::getTemplateUrl($projectCode, $locale)}" target="_blank" class="text-indigo-700 inline-flex items-center">
-                                {$container[$locale]->translate(open_template)}
-                                {svg common/arrow-top-right-on-square.svg, class: 'h-5 w-5 ml-1'}
-                            </a>
+                        <div class="mb-2">
+                            {if 0 >= count($environments)}
+                                <a href="{App\Api\V1\Controller\CookiesController::getTemplateUrl($projectCode, $locale)}" target="_blank" class="text-indigo-700 inline-flex items-center">
+                                    {$container[$locale]->translate(open_template)}
+                                    {svg common/arrow-top-right-on-square.svg, class: 'h-5 w-5 ml-1'}
+                                </a>
+                            {else}
+                                <div :href="currentEnvironment.link" class="inline-flex items-center">
+                                    <a :href="currentEnvironment.link" target="_blank" class="text-indigo-700">{$container[$locale]->translate(open_template_for)}</a>
+                                    <div x-data="dropdown" x-bind="dropdown" class="relative inline-block text-left mx-2">
+                                        <div>
+                                            <button x-bind="dropdownButton" type="button" class="inline-flex items-center pl-4 pr-6 py-2 border border-transparent rounded-md text-sm text-gray-700 bg-gray-50 hover:bg-gray-200 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-gray-200">
+                                                <span class="flex w-full items-center gap-x-1.5 rounded-md">
+                                                    <svg
+                                                            :style="{ fill: currentEnvironment ? currentEnvironment.color : '#ffffff' }"
+                                                            :class="currentEnvironment && ['#ffffff', '#fff'].includes(currentEnvironment.color) ? 'rounded border border-black' : ''"
+                                                            class="h-1.5 w-1.5"
+                                                            viewBox="0 0 6 6"
+                                                            aria-hidden="true"
+                                                    >
+                                                        <circle cx="3" cy="3" r="3" />
+                                                    </svg>
+                                                    <span x-text="currentEnvironment ? currentEnvironment.name : ''"></span>
+                                                </span>
+                                            </button>
+                                        </div>
+
+                                        <div x-bind="dropdownPanel" x-cloak class="absolute left-0 z-10 mt-2 w-48 origin-top-left rounded-md bg-white shadow-lg py-1 ring-1 ring-black ring-opacity-5 focus:outline-none" role="menu" tabindex="-1">
+                                            <template x-for="environment in environments" :key="environment.code || ''" hidden>
+                                                <div class="px-1">
+                                                    <button @click="selectEnvironment(environment) && window.open(environment.link, '_blank') && close()" type="button" class="flex w-full items-center px-3 py-2 text-sm text-gray-700 rounded hover:bg-gray-100 active:bg-gray-100 focus:bg-gray-100 border-none" role="menuitem" tabindex="-1">
+                                                        <span class="flex w-full items-center gap-x-1.5 rounded-md">
+                                                            <svg
+                                                                    :style="{ fill: environment.color }"
+                                                                    :class="['#ffffff', '#fff'].includes(environment.color) ? 'rounded border border-black' : ''"
+                                                                    class="h-1.5 w-1.5"
+                                                                    viewBox="0 0 6 6"
+                                                                    aria-hidden="true"
+                                                            >
+                                                                <circle cx="3" cy="3" r="3" />
+                                                            </svg>
+                                                            <span x-text="environment.name"></span>
+                                                        </span>
+                                                    </button>
+                                                </div>
+                                            </template>
+                                        </div>
+                                    </div>
+                                    <a :href="currentEnvironment.link" target="_blank" class="text-indigo-700">
+                                        {svg common/arrow-top-right-on-square.svg, class: 'h-5 w-5'}
+                                    </a>
+                                </div>
+                            {/if}
                         </div>
                         <div>
                             {$container[$locale]->translate(more_about_syntax)}
diff --git a/src/Web/AdminModule/ProjectModule/Presenter/IntegrationPresenter.php b/src/Web/AdminModule/ProjectModule/Presenter/IntegrationPresenter.php
index bb9b9eef..3dffac1a 100644
--- a/src/Web/AdminModule/ProjectModule/Presenter/IntegrationPresenter.php
+++ b/src/Web/AdminModule/ProjectModule/Presenter/IntegrationPresenter.php
@@ -5,13 +5,12 @@
 namespace App\Web\AdminModule\ProjectModule\Presenter;
 
 use App\Application\Acl\ProjectIntegrationResource;
-use App\Application\GlobalSettings\EnabledEnvironmentsResolver;
-use App\Domain\GlobalSettings\ValueObject\Environment;
 use App\Web\AdminModule\ProjectModule\Control\TemplatesForm\Event\TemplatesFormProcessingFailedEvent;
 use App\Web\AdminModule\ProjectModule\Control\TemplatesForm\Event\TemplatesUpdatedEvent;
 use App\Web\AdminModule\ProjectModule\Control\TemplatesForm\TemplatesFormControl;
 use App\Web\AdminModule\ProjectModule\Control\TemplatesForm\TemplatesFormControlFactoryInterface;
 use App\Web\Ui\Form\FormFactoryInterface;
+use App\Web\Utils\ProjectEnvironmentOptions;
 use Nette\InvalidStateException;
 use SixtyEightPublishers\FlashMessageBundle\Domain\FlashMessage;
 use SixtyEightPublishers\SmartNetteComponent\Attribute\Allowed;
@@ -29,34 +28,15 @@ protected function beforeRender(): void
     {
         parent::beforeRender();
 
-        $environments = EnabledEnvironmentsResolver::resolveProjectEnvironments(
-            globalSettingsEnvironments: $this->globalSettings->environments(),
-            projectEnvironments: $this->projectView->environments,
-        );
-
         $template = $this->getTemplate();
         assert($template instanceof IntegrationTemplate);
 
         $template->appHost = $this->getHttpRequest()->getUrl()->getHostUrl();
-        $template->environments = 0 < count($environments) ? array_merge(
-            [
-                [
-                    'code' => '//default//',
-                    'name' => $this->getTranslator()->translate('//layout.default_environment'),
-                    'color' => '#ffffff',
-                ],
-            ],
-            array_values(
-                array_map(
-                    static fn (Environment $environment): array => [
-                        'code' => $environment->code,
-                        'name' => $environment->name,
-                        'color' => $environment->color->value(),
-                    ],
-                    $environments,
-                ),
-            ),
-        ) : [];
+        $template->environments = ProjectEnvironmentOptions::create(
+            globalSettingsEnvironments: $this->globalSettings->environments(),
+            projectEnvironments: $this->projectView->environments,
+            translator: $this->getTranslator(),
+        );
     }
 
     protected function createComponentTemplatesForm(): TemplatesFormControl
diff --git a/src/Web/AdminModule/ProjectModule/Presenter/templates/Integration.default.latte b/src/Web/AdminModule/ProjectModule/Presenter/templates/Integration.default.latte
index ec043db7..78b329b3 100644
--- a/src/Web/AdminModule/ProjectModule/Presenter/templates/Integration.default.latte
+++ b/src/Web/AdminModule/ProjectModule/Presenter/templates/Integration.default.latte
@@ -25,17 +25,38 @@
                 projectCode: '{$projectView->code->value()}',
                 init() {
                     this.self = this.$el;
-                    this.selectEnvironment(this.environments[0] || null);
+                    var storedEnvironmentCode = window.localStorage.getItem('cmp_integration_cookie_table_environment');
+                    var storedEnvironment = undefined;
+                    var defaultEnvironment = undefined;
+
+                    for (var environment of this.environments) {
+                        if (storedEnvironmentCode === environment.code) {
+                            storedEnvironment = environment;
+                        }
+
+                        if (null === environment.code) {
+                            defaultEnvironment = environment;
+                        }
+                    }
+
+                    this.selectEnvironment(storedEnvironment || defaultEnvironment || this.environments[0] || null);
                 },
                 selectEnvironment(environment) {
                     this.currentEnvironment = environment;
-                    const textarea = this.self.querySelector('textarea');
-                    let script = this.$refs.scriptTemplate.innerHTML;
+
+                    if (null === environment || null === environment.code) {
+                        window.localStorage.removeItem('cmp_integration_cookie_table_environment');
+                    } else {
+                        window.localStorage.setItem('cmp_integration_cookie_table_environment', environment.code);
+                    }
+
+                    var textarea = this.self.querySelector('textarea');
+                    var script = this.$refs.scriptTemplate.innerHTML;
 
                     script = script
                         .replace('{{ APP_HOST }}', this.appHost)
                         .replace('{{ PROJECT_CODE }}', this.projectCode)
-                        .replace('\'{{ ENVIRONMENT }}\'', null === environment || '//default//' === environment.code ? 'null' : '\'' + environment.code + '\'');
+                        .replace('\'{{ ENVIRONMENT }}\'', null === environment || null === environment.code ? 'null' : '\'' + environment.code + '\'');
 
                     textarea.CodeMirror ? textarea.CodeMirror.setValue(script) : textarea.innerHTML = script;
 
@@ -46,9 +67,15 @@
             <div x-show="environments.length">
                 <div x-data="dropdown" x-bind="dropdown" class="relative inline-block text-left mb-2">
                     <div>
-                        <button x-bind="dropdownButton" type="button" class="inline-flex items-center pl-4 pr-6 py-2 border border-transparent rounded-md text-sm font-medium bg-gray-50 hover:bg-gray-200 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-gray-200">
-                            <span class="flex w-full items-center gap-x-1.5 rounded-md text-xs font-medium text-gray-900">
-                                <svg :style="{ fill: currentEnvironment ? currentEnvironment.color : '#ffffff' }" class="h-1.5 w-1.5" viewBox="0 0 6 6" aria-hidden="true">
+                        <button x-bind="dropdownButton" type="button" class="inline-flex items-center pl-4 pr-6 py-2 border border-transparent rounded-md text-sm text-gray-700 bg-gray-50 hover:bg-gray-200 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-gray-200">
+                            <span class="flex w-full items-center gap-x-1.5 rounded-md">
+                                <svg
+                                    :style="{ fill: currentEnvironment ? currentEnvironment.color : '#ffffff' }"
+                                    :class="currentEnvironment && ['#ffffff', '#fff'].includes(currentEnvironment.color) ? 'rounded border border-black' : ''"
+                                    class="h-1.5 w-1.5"
+                                    viewBox="0 0 6 6"
+                                    aria-hidden="true"
+                                >
                                     <circle cx="3" cy="3" r="3" />
                                 </svg>
                                 <span x-text="currentEnvironment ? currentEnvironment.name : ''"></span>
@@ -57,11 +84,17 @@
                     </div>
 
                     <div x-bind="dropdownPanel" x-cloak class="absolute left-0 z-10 mt-2 w-48 origin-top-left rounded-md bg-white shadow-lg py-1 ring-1 ring-black ring-opacity-5 focus:outline-none" role="menu" tabindex="-1">
-                        <template x-for="environment in environments" :key="environment.code" hidden>
+                        <template x-for="environment in environments" :key="environment.code || ''" hidden>
                             <div class="px-1">
                                 <button @click="selectEnvironment(environment) && close()" type="button" class="flex w-full items-center px-3 py-2 text-sm text-gray-700 rounded hover:bg-gray-100 active:bg-gray-100 focus:bg-gray-100 border-none" role="menuitem" tabindex="-1">
-                                    <span class="flex w-full items-center gap-x-1.5 rounded-md text-xs font-medium text-gray-900">
-                                        <svg :style="{ fill: environment.color }" class="h-1.5 w-1.5" viewBox="0 0 6 6" aria-hidden="true">
+                                    <span class="flex w-full items-center gap-x-1.5 rounded-md">
+                                        <svg
+                                            :style="{ fill: environment.color }"
+                                            :class="['#ffffff', '#fff'].includes(environment.color) ? 'rounded border border-black' : ''"
+                                            class="h-1.5 w-1.5"
+                                            viewBox="0 0 6 6"
+                                            aria-hidden="true"
+                                        >
                                             <circle cx="3" cy="3" r="3" />
                                         </svg>
                                         <span x-text="environment.name"></span>
diff --git a/src/Web/Utils/ProjectEnvironmentOptions.php b/src/Web/Utils/ProjectEnvironmentOptions.php
new file mode 100644
index 00000000..d7669df6
--- /dev/null
+++ b/src/Web/Utils/ProjectEnvironmentOptions.php
@@ -0,0 +1,74 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Web\Utils;
+
+use App\Application\GlobalSettings\EnabledEnvironmentsResolver;
+use App\Domain\GlobalSettings\ValueObject\Environment;
+use App\Domain\GlobalSettings\ValueObject\Environments as GlobalSettingsEnvironments;
+use App\Domain\Project\ValueObject\Environments as ProjectEnvironments;
+use Closure;
+use Nette\Localization\Translator;
+
+/**
+ * @phpstan-type EnvironmentOption = object{
+ *      code: string|null,
+ *      name: string,
+ *      color: string,
+ *  }
+ */
+final class ProjectEnvironmentOptions
+{
+    private function __construct() {}
+
+    /**
+     * @param null|Closure(EnvironmentOption $environment): EnvironmentOption $additionalMapper
+     *
+     * @return array<int, EnvironmentOption>
+     */
+    public static function create(
+        GlobalSettingsEnvironments $globalSettingsEnvironments,
+        ProjectEnvironments $projectEnvironments,
+        Translator $translator,
+        ?Closure $additionalMapper = null,
+    ): array {
+        $environments = EnabledEnvironmentsResolver::resolveProjectEnvironments(
+            globalSettingsEnvironments: $globalSettingsEnvironments,
+            projectEnvironments: $projectEnvironments,
+        );
+
+        if (0 >= count($environments)) {
+            return [];
+        }
+
+        $additionalMapper = $additionalMapper ?? fn (object $environment): object => $environment;
+
+        return array_merge(
+            [
+                $additionalMapper((object) [
+                    'code' => '*',
+                    'name' => $translator->translate('//layout.all_environments'),
+                    'color' => '#000000',
+                ]),
+            ],
+            [
+                $additionalMapper((object) [
+                    'code' => null,
+                    'name' => $translator->translate('//layout.default_environment'),
+                    'color' => '#ffffff',
+                ]),
+            ],
+            array_values(
+                array_map(
+                    static fn (Environment $environment): object => $additionalMapper((object) [
+                        'code' => $environment->code,
+                        'name' => $environment->name,
+                        'color' => $environment->color->value(),
+                    ]),
+                    $environments,
+                ),
+            ),
+        );
+    }
+}
diff --git a/translations/App_Web_AdminModule_ApplicationModule_Control_EnvironmentsForm_EnvironmentsFormControl.cs.neon b/translations/App_Web_AdminModule_ApplicationModule_Control_EnvironmentsForm_EnvironmentsFormControl.cs.neon
index e9a4111a..1f75ddfe 100644
--- a/translations/App_Web_AdminModule_ApplicationModule_Control_EnvironmentsForm_EnvironmentsFormControl.cs.neon
+++ b/translations/App_Web_AdminModule_ApplicationModule_Control_EnvironmentsForm_EnvironmentsFormControl.cs.neon
@@ -5,6 +5,7 @@ code:
     placeholder: Kód
     required: Vyplňte prosím kód.
     rule:
+        pattern: 'Kód smí obsahovat pouze malá písmena (a-z), číslice a znaky "_", "-" a ".".'
         values_are_not_unique: Kód je duplicitní.
 
 name:
diff --git a/translations/App_Web_AdminModule_ApplicationModule_Control_EnvironmentsForm_EnvironmentsFormControl.en.neon b/translations/App_Web_AdminModule_ApplicationModule_Control_EnvironmentsForm_EnvironmentsFormControl.en.neon
index 2a35161a..f947ee36 100644
--- a/translations/App_Web_AdminModule_ApplicationModule_Control_EnvironmentsForm_EnvironmentsFormControl.en.neon
+++ b/translations/App_Web_AdminModule_ApplicationModule_Control_EnvironmentsForm_EnvironmentsFormControl.en.neon
@@ -5,6 +5,7 @@ code:
     placeholder: Code
     required: Please enter a code.
     rule:
+        pattern: 'Code can only contain lowercase letters (a-z), numbers, and the characters "_", "-" and ".".'
         values_are_not_unique: The code is duplicated.
 
 name:
diff --git a/translations/App_Web_AdminModule_CookieModule_Control_CookieList_CookieListControl.cs.neon b/translations/App_Web_AdminModule_CookieModule_Control_CookieList_CookieListControl.cs.neon
index 3786b4f5..149d636a 100644
--- a/translations/App_Web_AdminModule_CookieModule_Control_CookieList_CookieListControl.cs.neon
+++ b/translations/App_Web_AdminModule_CookieModule_Control_CookieList_CookieListControl.cs.neon
@@ -14,7 +14,6 @@ inactive_value: neaktivní
 session: Session
 persistent: Persistent
 
-all_environments: Všechna prostředí
 and_more_projects: "[1,4] a %count% další|[5,Inf[ a %count% dalších"
 
 tooltip:
diff --git a/translations/App_Web_AdminModule_CookieModule_Control_CookieList_CookieListControl.en.neon b/translations/App_Web_AdminModule_CookieModule_Control_CookieList_CookieListControl.en.neon
index 2354ba28..677871b2 100644
--- a/translations/App_Web_AdminModule_CookieModule_Control_CookieList_CookieListControl.en.neon
+++ b/translations/App_Web_AdminModule_CookieModule_Control_CookieList_CookieListControl.en.neon
@@ -14,7 +14,6 @@ inactive_value: inactive
 session: Session
 persistent: Persistent
 
-all_environments: All environments
 and_more_projects: "and %count% more"
 
 tooltip:
diff --git a/translations/App_Web_AdminModule_CookieModule_Presenter_CategoriesPresenter.cs.neon b/translations/App_Web_AdminModule_CookieModule_Presenter_CategoriesPresenter.cs.neon
index f99a140f..e6996018 100644
--- a/translations/App_Web_AdminModule_CookieModule_Presenter_CategoriesPresenter.cs.neon
+++ b/translations/App_Web_AdminModule_CookieModule_Presenter_CategoriesPresenter.cs.neon
@@ -1,2 +1,2 @@
-page_title: Karegorie
+page_title: Kategorie
 add_new_category: Přidat kategorii
diff --git a/translations/App_Web_AdminModule_Presenter_DashboardPresenter.cs.neon b/translations/App_Web_AdminModule_Presenter_DashboardPresenter.cs.neon
index fef0cccf..6999980b 100644
--- a/translations/App_Web_AdminModule_Presenter_DashboardPresenter.cs.neon
+++ b/translations/App_Web_AdminModule_Presenter_DashboardPresenter.cs.neon
@@ -22,7 +22,5 @@ last_consent: Poslední souhlas
 providers: Poskytovatelé
 cookies: Cookies
 
-all_environments: Všechna prostředí
-
 cookies_tooltip_message: '%common% cookies služeb, %private% projektových'
 cookie_suggestions_tooltip_message: Návrhy cookies
diff --git a/translations/App_Web_AdminModule_Presenter_DashboardPresenter.en.neon b/translations/App_Web_AdminModule_Presenter_DashboardPresenter.en.neon
index 03b1f20b..ef718f38 100644
--- a/translations/App_Web_AdminModule_Presenter_DashboardPresenter.en.neon
+++ b/translations/App_Web_AdminModule_Presenter_DashboardPresenter.en.neon
@@ -22,7 +22,5 @@ last_consent: Last consent
 providers: Providers
 cookies: Cookies
 
-all_environments: All environments
-
 cookies_tooltip_message: '%common% service cookies, %private% project cookies'
 cookie_suggestions_tooltip_message: Cookie suggestions
diff --git a/translations/App_Web_AdminModule_ProjectModule_Control_TemplatesForm_TemplatesFormControl.cs.neon b/translations/App_Web_AdminModule_ProjectModule_Control_TemplatesForm_TemplatesFormControl.cs.neon
index 6663f8a0..2b86fe8b 100644
--- a/translations/App_Web_AdminModule_ProjectModule_Control_TemplatesForm_TemplatesFormControl.cs.neon
+++ b/translations/App_Web_AdminModule_ProjectModule_Control_TemplatesForm_TemplatesFormControl.cs.neon
@@ -4,4 +4,5 @@ update:
     field: Uložit
 
 open_template: Zobrazit šablonu
+open_template_for: Zobrazit šablonu pro
 more_about_syntax: Více info o syntaxi na
diff --git a/translations/App_Web_AdminModule_ProjectModule_Control_TemplatesForm_TemplatesFormControl.en.neon b/translations/App_Web_AdminModule_ProjectModule_Control_TemplatesForm_TemplatesFormControl.en.neon
index 3250dff6..3d92f660 100644
--- a/translations/App_Web_AdminModule_ProjectModule_Control_TemplatesForm_TemplatesFormControl.en.neon
+++ b/translations/App_Web_AdminModule_ProjectModule_Control_TemplatesForm_TemplatesFormControl.en.neon
@@ -4,4 +4,5 @@ update:
     field: Save
 
 open_template: View template
+open_template_for: View template for
 more_about_syntax: More info about the syntax at
diff --git a/translations/layout.cs.neon b/translations/layout.cs.neon
index ebc9fe8b..75f84af4 100644
--- a/translations/layout.cs.neon
+++ b/translations/layout.cs.neon
@@ -42,6 +42,7 @@ cookie_provider_type:
     3rd_party: 3rd party
 
 default_environment: Výchozí prostředí
+all_environments: Všechna prostředí
 
 alert:
     missing_default_locale:
diff --git a/translations/layout.en.neon b/translations/layout.en.neon
index 2cb92246..00b607cc 100644
--- a/translations/layout.en.neon
+++ b/translations/layout.en.neon
@@ -42,6 +42,7 @@ cookie_provider_type:
     3rd_party: 3rd party
 
 default_environment: Default environment
+all_environments: All environments
 
 alert:
     missing_default_locale: