diff --git a/app/Presentation/@layout.latte b/app/Presentation/@layout.latte
index 428e843..57ff84c 100644
--- a/app/Presentation/@layout.latte
+++ b/app/Presentation/@layout.latte
@@ -28,7 +28,7 @@
 	</script>
 
 	{* naše vlastní styly *}
-	<link href="{$basePath}/css/base.css?v=6" rel="stylesheet">
+	<link href="{$basePath}/css/base.css?v=9" rel="stylesheet">
 
 	<title>{ifset title}{include title|stripHtml} | {/ifset}Obvody</title>
 </head>
diff --git a/app/Presentation/Obvod/list.latte b/app/Presentation/Obvod/list.latte
index eea24e7..39aaec1 100644
--- a/app/Presentation/Obvod/list.latte
+++ b/app/Presentation/Obvod/list.latte
@@ -11,7 +11,7 @@
 
     <section class="panel">
         <div class="filtry" n:if="$skupiny" role="group" aria-label="Filtr skupin">
-            <a n:foreach="$skupiny as $s" n:href="list, skupina: $s" n:class="$skupina === $s ? 'tlacitko is-aktivni' : 'tlacitko'">{$s}</a>
+            <a n:foreach="$skupiny as $s" n:href="list, skupina: $s" n:class="$skupina === $s ? 'tlacitko tlacitko-filtr is-aktivni' : 'tlacitko tlacitko-filtr'">{$s}</a>
         </div>
 
         <table class="tabulka">
diff --git a/app/Presentation/Obvod/view.latte b/app/Presentation/Obvod/view.latte
index 48b9ef3..a80d357 100644
--- a/app/Presentation/Obvod/view.latte
+++ b/app/Presentation/Obvod/view.latte
@@ -11,8 +11,8 @@
         </div>
         <div class="akce">
             <a n:href=":Mapa: obvod:$obvod->CISLO" class="tlacitko">Mapa</a>
-            <button type="button" class="tlacitko is-aktivni" data-bs-toggle="modal" data-bs-target="#modalPridelit">Přidělit</button>
-            <button type="button" class="tlacitko" data-bs-toggle="modal" data-bs-target="#modalVratit">Vrátit</button>
+            <button n:if="count($otevrene) === 0" type="button" class="tlacitko is-aktivni" data-bs-toggle="modal" data-bs-target="#modalPridelit">Přidělit</button>
+            <button n:if="count($otevrene) > 0" type="button" class="tlacitko" data-bs-toggle="modal" data-bs-target="#modalVratit">Vrátit</button>
         </div>
     </header>
 
@@ -60,7 +60,7 @@
     </div>
 </div>
 
-<div class="modal fade" id="modalPridelit" tabindex="-1" aria-labelledby="modalPridelitLabel" aria-hidden="true" data-show-errors="{if $presenter['pridelitForm']->hasErrors()}1{else}0{/if}">
+<div n:if="count($otevrene) === 0" class="modal fade" id="modalPridelit" tabindex="-1" aria-labelledby="modalPridelitLabel" aria-hidden="true" data-show-errors="{if $presenter['pridelitForm']->hasErrors()}1{else}0{/if}">
     <div class="modal-dialog">
         <div class="modal-content">
             <form n:name="pridelitForm">
@@ -84,49 +84,42 @@
                     </div>
                 </div>
                 <div class="modal-footer">
-                    <button type="button" class="tlacitko" data-bs-dismiss="modal">Zrušit</button>
                     <button n:name="send" class="tlacitko is-aktivni">Přidělit</button>
+                    <button type="button" class="tlacitko tlacitko-zrusit" data-bs-dismiss="modal">Zrušit</button>
                 </div>
             </form>
         </div>
     </div>
 </div>
 
-<div class="modal fade" id="modalVratit" tabindex="-1" aria-labelledby="modalVratitLabel" aria-hidden="true" data-show-errors="{if $presenter['vratitForm']->hasErrors()}1{else}0{/if}">
+<div n:if="count($otevrene) > 0" class="modal fade" id="modalVratit" tabindex="-1" aria-labelledby="modalVratitLabel" aria-hidden="true" data-show-errors="{if $presenter['vratitForm']->hasErrors()}1{else}0{/if}">
     <div class="modal-dialog">
         <div class="modal-content">
             <div class="modal-header">
                 <h5 class="modal-title" id="modalVratitLabel">Vrátit obvod</h5>
                 <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Zavřít"></button>
             </div>
-            {if count($otevrene) === 0}
-                <div class="modal-body">Tento obvod nemá otevřené přidělení.</div>
-                <div class="modal-footer">
-                    <button type="button" class="tlacitko" data-bs-dismiss="modal">Zavřít</button>
+            <form n:name="vratitForm">
+                <div class="modal-body">
+                    <div class="alert alert-danger" n:if="$form->hasErrors()" n:foreach="$form->getErrors() as $error">{$error}</div>
+                    <div class="mb-2">
+                        <label n:name="zaznam" class="form-label">Záznam</label>
+                        <select n:name="zaznam" class="form-select">
+                            <option n:foreach="$otevrene as $otevreny" n:name="zaznam:$otevreny->ID">
+                                {$otevreny->JMENO} (přiděleno {date_format($otevreny->VYDANO, 'd.m.Y')})
+                            </option>
+                        </select>
+                    </div>
+                    <div>
+                        <label n:name="datum" class="form-label">Datum vrácení</label>
+                        <input n:name="datum" class="form-control">
+                    </div>
                 </div>
-            {else}
-                <form n:name="vratitForm">
-                    <div class="modal-body">
-                        <div class="alert alert-danger" n:if="$form->hasErrors()" n:foreach="$form->getErrors() as $error">{$error}</div>
-                        <div class="mb-2">
-                            <label n:name="zaznam" class="form-label">Záznam</label>
-                            <select n:name="zaznam" class="form-select">
-                                <option n:foreach="$otevrene as $otevreny" n:name="zaznam:$otevreny->ID">
-                                    {$otevreny->JMENO} (přiděleno {date_format($otevreny->VYDANO, 'd.m.Y')})
-                                </option>
-                            </select>
-                        </div>
-                        <div>
-                            <label n:name="datum" class="form-label">Datum vrácení</label>
-                            <input n:name="datum" class="form-control">
-                        </div>
-                    </div>
-                    <div class="modal-footer">
-                        <button type="button" class="tlacitko" data-bs-dismiss="modal">Zrušit</button>
-                        <button n:name="send" class="tlacitko is-aktivni">Vrátit</button>
-                    </div>
-                </form>
-            {/if}
+                <div class="modal-footer">
+                    <button n:name="send" class="tlacitko is-aktivni">Vrátit</button>
+                    <button type="button" class="tlacitko tlacitko-zrusit" data-bs-dismiss="modal">Zrušit</button>
+                </div>
+            </form>
         </div>
     </div>
 </div>
@@ -159,8 +152,8 @@
                     </div>
                 </div>
                 <div class="modal-footer">
-                    <button type="button" class="tlacitko" data-bs-dismiss="modal">Zrušit</button>
                     <button n:name="send" class="tlacitko is-aktivni">Uložit</button>
+                    <button type="button" class="tlacitko tlacitko-zrusit" data-bs-dismiss="modal">Zrušit</button>
                 </div>
             </form>
         </div>
@@ -168,7 +161,7 @@
 </div>
 
 <script type="application/json" id="zvestovatele-data">{$zvestovateleJson|noescape}</script>
-<script src="{$basePath}/js/obvod-nahled.js"></script>
+<script src="{$basePath}/js/obvod-nahled.js?v=2"></script>
 <script src="{$basePath}/js/naseptavac.js?v=3"></script>
 <script>
 document.addEventListener('DOMContentLoaded', function () {
diff --git a/app/Presentation/Zvestovatel/edit.latte b/app/Presentation/Zvestovatel/edit.latte
index 95dc9c4..e9a0c41 100644
--- a/app/Presentation/Zvestovatel/edit.latte
+++ b/app/Presentation/Zvestovatel/edit.latte
@@ -17,7 +17,7 @@
         </div>
         <div class="formular-akce">
             <button n:name="send" class="tlacitko is-aktivni">Uložit</button>
-            <a n:href="default" class="tlacitko">Zpět</a>
+            <a n:href="default" class="tlacitko tlacitko-zrusit">Zrušit</a>
         </div>
     </form>
 </div>
diff --git a/www/css/base.css b/www/css/base.css
index b20df08..387b1d4 100644
--- a/www/css/base.css
+++ b/www/css/base.css
@@ -154,18 +154,25 @@ body:has(#map[data-max]) {
 }
 
 .mapa-filtr button {
-    border: 0;
+    border: 2px solid #c9a24d;
     border-radius: 6px;
-    background: transparent;
-    color: #1a3a6b;
+    background: #f8efd0;
+    color: #6f5410;
     font-size: 13px;
     font-weight: 700;
     padding: 0.4rem 0.7rem;
     line-height: 1.2;
 }
 
+.mapa-filtr button:hover,
 .mapa-filtr button.is-active {
-    background: #2652a8;
+    background: #c9a227;
+    color: #fff;
+    border-color: #8f7010;
+}
+
+.mapa-filtr button.is-active:hover {
+    background: #a88416;
     color: #fff;
 }
 
@@ -664,6 +671,27 @@ body:has(#map[data-max]) {
     margin-bottom: 0.85rem;
 }
 
+.tlacitko.tlacitko-filtr {
+    background: #f8efd0;
+    color: #6f5410;
+    border-color: #c9a24d;
+    box-shadow: 0 4px 12px rgba(143, 112, 16, 0.16);
+}
+
+.tlacitko.tlacitko-filtr:hover,
+.tlacitko.tlacitko-filtr:focus-visible,
+.tlacitko.tlacitko-filtr.is-aktivni {
+    background: #c9a227;
+    color: #fff;
+    border-color: #8f7010;
+}
+
+.tlacitko.tlacitko-filtr.is-aktivni:hover,
+.tlacitko.tlacitko-filtr.is-aktivni:focus-visible {
+    background: #a88416;
+    color: #fff;
+}
+
 .akce {
     justify-content: flex-end;
 }
@@ -811,6 +839,26 @@ body:has(#map[data-max]) {
     border-color: #e3f2fd;
 }
 
+.modal-footer {
+    justify-content: flex-start;
+    gap: 0.5rem;
+}
+
+.tlacitko.tlacitko-zrusit {
+    margin-left: auto;
+    background: #eceff1;
+    color: #455a64;
+    border-color: #90a4ae;
+    box-shadow: none;
+}
+
+.tlacitko.tlacitko-zrusit:hover,
+.tlacitko.tlacitko-zrusit:focus-visible {
+    background: #cfd8dc;
+    color: #263238;
+    border-color: #78909c;
+}
+
 .modal-title {
     color: #1d4f91;
     font-weight: 800;
diff --git a/www/js/obvod-nahled.js b/www/js/obvod-nahled.js
index 9e9c40a..3b46afa 100644
--- a/www/js/obvod-nahled.js
+++ b/www/js/obvod-nahled.js
@@ -41,12 +41,11 @@
 
     function style() {
         return {
-            fillColor: '#FD8D3C',
+            fillColor: '#c5ddf6',
+            color: '#1d4f91',
             weight: 2,
             opacity: 1,
-            color: 'blue',
-            dashArray: '3',
-            fillOpacity: 0.05,
+            fillOpacity: 0.28,
         };
     }