diff --git a/rollup.config.js b/rollup.config.js
index 4a34f91c..9b7cde26 100644
--- a/rollup.config.js
+++ b/rollup.config.js
@@ -103,20 +103,20 @@ export default {
     onwarn
   },
 
-  serviceworker: {
-    input: config.serviceworker.input(),
-    output: config.serviceworker.output(),
-    plugins: [
-      resolve(),
-      replace({
-        "process.browser": true,
-        "process.env.NODE_ENV": JSON.stringify(mode)
-      }),
-      commonjs(),
-      !dev && terser()
-    ],
+  // serviceworker: {
+  //   input: config.serviceworker.input(),
+  //   output: config.serviceworker.output(),
+  //   plugins: [
+  //     resolve(),
+  //     replace({
+  //       "process.browser": true,
+  //       "process.env.NODE_ENV": JSON.stringify(mode)
+  //     }),
+  //     commonjs(),
+  //     !dev && terser()
+  //   ],
 
-    preserveEntrySignatures: false,
-    onwarn
-  }
+  //   preserveEntrySignatures: false,
+  //   onwarn
+  // }
 };
diff --git a/src/service-worker.js b/src/_service-worker.js
similarity index 97%
rename from src/service-worker.js
rename to src/_service-worker.js
index 02ab1d2d..f89df038 100644
--- a/src/service-worker.js
+++ b/src/_service-worker.js
@@ -33,7 +33,7 @@ self.addEventListener('activate', event => {
 
 
 /**
- * Fetch the asset from the network and store it in the cache. 
+ * Fetch the asset from the network and store it in the cache.
  * Fall back to the cache if the user is offline.
  */
 async function fetchAndCache(request) {
diff --git a/src/components/HashTags.svelte b/src/components/HashTags.svelte
new file mode 100644
index 00000000..f733c298
--- /dev/null
+++ b/src/components/HashTags.svelte
@@ -0,0 +1,9 @@
+<script>
+  export let tags = [];
+</script>
+
+<div class="break-all">
+  {#each tags as tag}
+    <a class="text-blue-700 mr-5 text-sm" href="?filter={tag}">#{tag.toLowerCase()}</a>
+  {/each}
+</div>
diff --git a/src/components/Nav.svelte b/src/components/Nav.svelte
index a63e9d7b..3555636a 100644
--- a/src/components/Nav.svelte
+++ b/src/components/Nav.svelte
@@ -46,17 +46,31 @@
 	a {
 		text-decoration: none;
 		padding: 1em 0.5em;
-		display: block;
 	}
 </style>
 
 <nav>
+  <ul>
+    <li><a class="block" aria-current="{(segment === undefined || segment === 'discussion') ? 'page' : undefined}" href=".">UniDiscuss</a></li>
+  </ul>
+  <Space/>
 	<ul>
-		<li><a aria-current="{(segment === undefined || segment === 'discussion') ? 'page' : undefined}" href=".">UniDiscuss</a></li>
-	</ul>
-	<Space/>
-	<ul>
-		<!-- <li><a aria-current="{segment === 'ask' ? 'page' : undefined}" href="ask">Ask</a></li> -->
-		<li><a aria-current="{segment === 'profile' ? 'page' : undefined}" href="profile">Профиль</a></li>
-	</ul>
+    <li>
+      <a class="flex items-center" href="https://t.me/unidiscuss" target="_blank">
+        <img
+          alt="File:Telegram logo.svg"
+          class="mr-1"
+          src="https://upload.wikimedia.org/wikipedia/commons/thumb/d/dd/Telegram_alternative_logo.svg/50px-Telegram_alternative_logo.svg.png"
+          decoding="async"
+          width="25"
+          height="25"
+          srcset="https://upload.wikimedia.org/wikipedia/commons/thumb/d/dd/Telegram_alternative_logo.svg/50px-Telegram_alternative_logo.svg.png 1.5x, https://upload.wikimedia.org/wikipedia/commons/thumb/8/82/Telegram_logo.svg/1024px-Telegram_logo.svg.png 2x"
+          data-file-width="25"
+          data-file-height="25"
+        >
+        <span>Канал</span>
+      </a>
+    </li>
+    <li><a class="block" aria-current="{segment === 'profile' ? 'page' : undefined}" href="profile">Войти</a></li>
+  </ul>
 </nav>
diff --git a/src/components/NewQuestion.svelte b/src/components/NewQuestion.svelte
index 79561c60..51904d02 100644
--- a/src/components/NewQuestion.svelte
+++ b/src/components/NewQuestion.svelte
@@ -9,7 +9,7 @@
   }
 </style>
 
-<button class="root bg-blue-600 hover:bg-blue-900 text-white font-bold py-2 px-4 rounded inline-flex items-center float-right">
+<button class="root bg-blue-700 hover:bg-blue-900 text-white font-bold py-2 px-4 rounded inline-flex items-center float-right">
   <AddComment20  class="fill-current w-4 h-4 mr-2" />
   <a href="/ask">Спросить</a>
 </button>
\ No newline at end of file
diff --git a/src/components/SideBar.svelte b/src/components/SideBar.svelte
index 9481b62d..eba3568c 100644
--- a/src/components/SideBar.svelte
+++ b/src/components/SideBar.svelte
@@ -22,6 +22,7 @@
 <style>
   .sidebar-root {
     width: 250px;
+    min-width: 250px;
     height: fit-content;
   }
 
@@ -39,7 +40,7 @@
         height="20"
         alt="@jamesmosier"
       >
-      <span class="hover:text-blue-600 hover:underline">{contributor.name}</span>
+      <span class="hover:text-blue-700 hover:underline">{contributor.name}</span>
     </a>
 	{/each}
 </div>
diff --git a/src/components/Vote.svelte b/src/components/Vote.svelte
index 580c265e..35b211b5 100644
--- a/src/components/Vote.svelte
+++ b/src/components/Vote.svelte
@@ -16,8 +16,8 @@
 		display: flex;
 		flex-direction: column;
 		align-items: center;
-		min-width: 56px;
-		width: 56px;
+		min-width: 25px;
+		width: 25px;
 		justify-content: center;
 		margin-right: 10px;
 	}
diff --git a/src/routes/discussion/[id].svelte b/src/routes/discussion/[id].svelte
index 0dfc2e97..3c51bb50 100644
--- a/src/routes/discussion/[id].svelte
+++ b/src/routes/discussion/[id].svelte
@@ -1,6 +1,7 @@
 <script context="module">
     import marked from 'marked'
     import Vote from "../../components/Vote.svelte";
+	import HashTags from "../../components/HashTags.svelte";
 
 	export async function preload({ params }) {
 		// the `id` parameter is available because
@@ -48,6 +49,9 @@
         <section class="p-2">
             {@html marked(discussion.question)}
         </section>
+        <section class="p-2">
+            <HashTags tags={discussion.tags}/>
+        </section>
     </div>
 
     <div class="my-8">
diff --git a/src/routes/discussion/_discussions.js b/src/routes/discussion/_discussions.js
index 9adb7b88..542c4835 100644
--- a/src/routes/discussion/_discussions.js
+++ b/src/routes/discussion/_discussions.js
@@ -16,6 +16,9 @@ export default [
       name: "babdraa",
       avatar: "https://avatars3.githubusercontent.com/u/24832873?s=60&v=4"
     },
+    tags: [
+      'ИЭКСУ', 'ИМБТ', 'ИМИ', 'ИПТДМ', 'ИИИР', 'ГФ', 'ХТФ', 'ИДЗО', 'УИИ', 'УНИ'
+    ],
     question,
       createdAt: Date.now(),
     comments: [
@@ -52,6 +55,9 @@ export default [
       name: "babdraa",
       avatar: "https://avatars3.githubusercontent.com/u/24832873?s=60&v=4"
     },
+    tags: [
+      'ИЭКСУ', 'ИМБТ', 'ИМИ', 'ИПТДМ', 'ИИИР', 'ГФ', 'ХТФ', 'ИДЗО', 'УИИ', 'УНИ'
+    ],
       question:
         question,
       createdAt: Date.now(),
@@ -81,6 +87,9 @@ export default [
       name: "babdraa",
       avatar: "https://avatars3.githubusercontent.com/u/24832873?s=60&v=4"
     },
+    tags: [
+      'ИЭКСУ', 'ИМБТ', 'ИМИ', 'ИПТДМ', 'ИИИР', 'ГФ', 'ХТФ', 'ИДЗО', 'УИИ', 'УНИ'
+    ],
     question:
         question,
       createdAt: Date.now(),
@@ -117,6 +126,9 @@ export default [
       name: "babdraa",
       avatar: "https://avatars3.githubusercontent.com/u/24832873?s=60&v=4"
     },
+    tags: [
+      'ИЭКСУ', 'ИМБТ', 'ИМИ', 'ИПТДМ', 'ИИИР', 'ГФ', 'ХТФ', 'ИДЗО', 'УИИ', 'УНИ'
+    ],
     question: question,
       createdAt: Date.now(),
     comments: [
@@ -147,6 +159,9 @@ export default [
     title: "How can I get involved?",
     id: 5,
     votes: 7,
+    tags: [
+      'ИЭКСУ', 'ИМБТ', 'ИМИ', 'ИПТДМ', 'ИИИР', 'ГФ', 'ХТФ', 'ИДЗО', 'УИИ', 'УНИ'
+    ],
     author: {
       name: "living",
       avatar: "https://avatars3.githubusercontent.com/u/24832873?s=60&v=4"
diff --git a/src/routes/index.svelte b/src/routes/index.svelte
index 0174d37e..97f18c76 100644
--- a/src/routes/index.svelte
+++ b/src/routes/index.svelte
@@ -3,6 +3,7 @@
 	import Vote from "../components/Vote.svelte";
 	import Space from "../components/Space.svelte";
 	import NewQuestion from "../components/NewQuestion.svelte";
+	import HashTags from "../components/HashTags.svelte";
 
 	const discussions = [
 		{
@@ -125,6 +126,7 @@
 			<div class="discussion-topic-author">
 				<h4><a rel="prefetch" href="discussion/{discussion.id}">{discussion.title}</a></h4>
 				<span>{discussion.author.name} asked 1 day ago</span>
+				<HashTags tags={discussion.tags}/>
       </div>
       <Space />
       <div class="flex items-center">
diff --git a/src/template.html b/src/template.html
index 7c0f817e..e74793b4 100644
--- a/src/template.html
+++ b/src/template.html
@@ -9,7 +9,8 @@
 
 	<link rel="stylesheet" href="global.css">
 	<link rel="manifest" href="manifest.json" crossorigin="use-credentials">
-	<link rel="icon" type="image/png" href="favicon.png">
+	<link rel="icon" type="image/png" href="favicon.ico">
+    <link rel="icon" type="image/png" sizes="32x32" href="/logo-32.png">
 
 	<!-- Sapper creates a <script> tag containing `src/client.js`
 	     and anything else it needs to hydrate the app and
diff --git a/static/apple-touch-icon.png b/static/apple-touch-icon.png
new file mode 100644
index 00000000..4bd83574
Binary files /dev/null and b/static/apple-touch-icon.png differ
diff --git a/static/favicon.ico b/static/favicon.ico
new file mode 100644
index 00000000..d2bd1bd5
Binary files /dev/null and b/static/favicon.ico differ
diff --git a/static/favicon.png b/static/favicon.png
deleted file mode 100644
index 7e6f5eb5..00000000
Binary files a/static/favicon.png and /dev/null differ
diff --git a/static/logo-192.png b/static/logo-192.png
index 96fac032..ffccea1d 100644
Binary files a/static/logo-192.png and b/static/logo-192.png differ
diff --git a/static/logo-32.png b/static/logo-32.png
new file mode 100644
index 00000000..8bf490dd
Binary files /dev/null and b/static/logo-32.png differ
diff --git a/static/logo-512.png b/static/logo-512.png
index 9f0e764b..b5a19a8c 100644
Binary files a/static/logo-512.png and b/static/logo-512.png differ