diff --git a/static/Abaev_logo.png b/static/Abaev_logo.png
deleted file mode 100644
index 7f0243d..0000000
Binary files a/static/Abaev_logo.png and /dev/null differ
diff --git a/static/abaev-html.css b/static/abaev-html.css
index fd60e8b..46794f8 100644
--- a/static/abaev-html.css
+++ b/static/abaev-html.css
@@ -32,69 +32,18 @@ h6 {}
 body > header {
     position: sticky;
     top: 0;
-    background-color: #FCF9F5;
-    margin-left: 0;
-    margin-right: 0;
-    width: 100vw !important;
-    max-width: 100vw;
-/*    border-bottom-width: thin;
-    border-bottom-style: solid;*/
+    background: white;
+    border-bottom-width: thin;
+    border-bottom-style: solid;
     padding-bottom: 0px !important;
-    margin-bottom: 0px !important;
     padding-top: 0px !important;
-/*    padding-right: 1em !important;
-    padding-left: 1em !important;*/
+    padding-right: 1em !important;
+    padding-left: 1em !important;
 /*     color: #f1f1f1; */
 }
 
-@media (min-width:576px) {
-  body>footer>nav,
-  body>header>nav {
-    max-width:510px;
-    padding-right:0;
-    padding-left:0
-  }
-}
-@media (min-width:768px) {
-  body>footer>nav,
-  body>header>nav {
-    max-width:700px
-  }
-}
-@media (min-width:1024px) {
-  body>footer>nav,
-  body>header>nav {
-    max-width:950px
-  }
-}
-@media (min-width:1280px) {
-  body>footer>nav,
-  body>header>nav {
-    max-width:1200px
-  }
-}
-@media (min-width:1536px) {
-  body>footer>nav,
-  body>header>nav {
-    max-width:1450px
-  }
-}
-
-body>header>nav,
-body>footer>nav {
-    margin: auto;
-    --pico-primary: #8D0B02 !important;
-    --pico-primary-hover: #cd5c5c !important;
-}
-body>footer>nav {
-    border-top-width: thin;
-    border-top-style: solid;
-}
+nav {}
 nav ul, nav ol {}
-nav ul.abv-brand {
-    border-bottom-width: thin;
-    border-bottom-style: solid;
-}
 nav li {}
 nav a {}
 nav a:visited {}
@@ -136,21 +85,16 @@ aside#leftbar {
 
 search {}
 
-body>footer {
+body > footer {
     position: sticky;
-    width: 100vw !important;
-    max-width: 100vw;
     bottom: 0;
-    background-color: #FCF9F5;
-    /*border-top-width: thin;
-    border-top-style: solid;*/
+    background: white;
+    border-top-width: thin;
+    border-top-style: solid;
     padding-top: 0px !important;
     padding-bottom: 0px !important;
 /*     color: #f1f1f1; */
 }
-body>footer>nav {
-    margin:auto;
-}
 
 address {}
 
@@ -196,14 +140,6 @@ a:visited {}
 a:hover {}
 a:active {}
 
-a.abv-map img {
-    height: 2ex;
-}
-
-a.abv-map:hover {
-    cursor: pointer;
-}
-
 strong {}
 b {}
 
@@ -255,10 +191,6 @@ Embedded content
 * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 img {}
-img.abv-logo {
-    height: 7ex;
-}
-
 svg {}
 video {}
 canvas {}
diff --git a/static/map.png b/static/map.png
deleted file mode 100644
index d611f7f..0000000
Binary files a/static/map.png and /dev/null differ
diff --git a/xq/restx_dict_cached.xq b/xq/restx_dict_cached.xq
index 2ebf203..986d750 100644
--- a/xq/restx_dict_cached.xq
+++ b/xq/restx_dict_cached.xq
@@ -40,9 +40,8 @@ declare function page:head($title as xs:string, $script as node()* := ()) {
 declare function page:header($lang as xs:string, $href-other as xs:string) {
       <header>
         <nav>
-          <ul class="abv-brand">
-            <li><img class="abv-logo" src="/static/Abaev_logo.png" alt="Abaevdict logo"></img>
-            <strong>{
+          <ul>
+            <li><strong>{
               switch($lang)
               case 'ru' return 'ИЭСОЯ В.&#160;И.&#160;Абаева'
               default return 'Abaevdict'
@@ -344,15 +343,8 @@ declare %rest:path("{$lang}/dict")
       <main>
         {for $doc at $i in $page:sorted
          where $i > ($p - 1) * $page:items and $i <= $p * $page:items
-         let $html := doc(`abaevdict_{$lang}/html/{$doc/@xml:id}.html`) 
-         return if (doc('abaevdict_index/mentioned_en.xml')/
-                   lang-index/lang/word/entry[@id=string($doc/@xml:id)]) then
-                $html transform with {insert nodes (<br/>,
-                     <a class="abv-map" data-abv-entry="{$doc/@xml:id}">
-                     <img src="/static/map.png"></img></a>) as last 
-                     into ./article[1]/h6[1]}
-                else $html
-        }
+         let $html := doc(`abaevdict_{$lang}/html/{$doc/@xml:id}.html`)
+         return $html}
       </main>
       
       <!--  Footer for page navigation --> 
@@ -364,7 +356,7 @@ declare %rest:path("{$lang}/dict")
           </li>
         </ul>
         <!--   <ul><li>Page {$p} of {$page:total}</li></ul> -->
-        <ul class="abv-nextpage">
+        <ul>
           <li>
             {if ($p < $page:total) then 
             <a class="pagination__next" href="?page={$p + 1}">Next page</a> else ()}
diff --git a/xsl/abaev2html.xsl b/xsl/abaev2html.xsl
index ef54814..737191d 100644
--- a/xsl/abaev2html.xsl
+++ b/xsl/abaev2html.xsl
@@ -39,6 +39,16 @@
                 <xsl:when test="current-grouping-key()">
                   <h6 class="abv-headword">
                       <xsl:apply-templates select="current-group()"/>
+                      <br/>
+                      <a class="abv-map" href="#modal_map">
+                        <xsl:attribute name="data-abv-entry" select="$entry-id"/>
+                        <!-- map icon by Free Icons (https://free-icons.github.io/free-icons/) -->
+                        <svg xmlns="http://www.w3.org/2000/svg" height="1em" fill="currentColor" viewBox="0 0 512 512">
+                          <path
+                            d="M 160.88888888888889 57.77777777777778 Q 163.55555555555554 56.888888888888886 165.33333333333334 56.888888888888886 L 348.44444444444446 113.77777777777777 L 348.44444444444446 113.77777777777777 L 473.77777777777777 67.55555555555556 L 473.77777777777777 67.55555555555556 Q 488 63.111111111111114 499.55555555555554 71.11111111111111 Q 511.1111111111111 79.11111111111111 512 94.22222222222223 L 512 376 L 512 376 Q 511.1111111111111 395.55555555555554 493.3333333333333 402.6666666666667 L 351.1111111111111 455.1111111111111 L 351.1111111111111 455.1111111111111 Q 348.44444444444446 455.1111111111111 346.6666666666667 455.1111111111111 L 163.55555555555554 398.22222222222223 L 163.55555555555554 398.22222222222223 L 38.22222222222222 444.44444444444446 L 38.22222222222222 444.44444444444446 Q 24 448.8888888888889 12.444444444444445 440.8888888888889 Q 0.8888888888888888 432.8888888888889 0 417.77777777777777 L 0 136 L 0 136 Q 0.8888888888888888 116.44444444444444 18.666666666666668 109.33333333333333 L 160.88888888888889 57.77777777777778 L 160.88888888888889 57.77777777777778 Z M 24 122.66666666666667 Q 15.11111111111111 126.22222222222223 14.222222222222221 136 L 14.222222222222221 417.77777777777777 L 14.222222222222221 417.77777777777777 Q 14.222222222222221 424.8888888888889 20.444444444444443 429.3333333333333 Q 25.77777777777778 432.8888888888889 33.77777777777778 431.1111111111111 L 156.44444444444446 385.77777777777777 L 156.44444444444446 385.77777777777777 L 156.44444444444446 73.77777777777777 L 156.44444444444446 73.77777777777777 L 24 122.66666666666667 L 24 122.66666666666667 Z M 341.3333333333333 438.22222222222223 L 341.3333333333333 126.22222222222223 L 341.3333333333333 438.22222222222223 L 341.3333333333333 126.22222222222223 L 170.66666666666666 73.77777777777777 L 170.66666666666666 73.77777777777777 L 170.66666666666666 385.77777777777777 L 170.66666666666666 385.77777777777777 L 341.3333333333333 438.22222222222223 L 341.3333333333333 438.22222222222223 Z M 355.55555555555554 438.22222222222223 L 488.8888888888889 389.3333333333333 L 355.55555555555554 438.22222222222223 L 488.8888888888889 389.3333333333333 Q 496.8888888888889 385.77777777777777 497.77777777777777 376 L 497.77777777777777 94.22222222222223 L 497.77777777777777 94.22222222222223 Q 497.77777777777777 87.11111111111111 491.55555555555554 82.66666666666667 Q 486.22222222222223 79.11111111111111 479.1111111111111 80.88888888888889 L 355.55555555555554 126.22222222222223 L 355.55555555555554 126.22222222222223 L 355.55555555555554 438.22222222222223 L 355.55555555555554 438.22222222222223 Z"
+                          />
+                      </svg>
+                    </a>
                   </h6>
                 </xsl:when>
                 <xsl:otherwise>