diff --git a/application/frontend/skin/developer/actions/ActionSearch/index.tpl b/application/frontend/skin/developer/actions/ActionSearch/index.tpl
index 04737046..8a1efc09 100644
--- a/application/frontend/skin/developer/actions/ActionSearch/index.tpl
+++ b/application/frontend/skin/developer/actions/ActionSearch/index.tpl
@@ -19,14 +19,14 @@
 {/block}
 
 {block 'layout_options' append}
-    {$layoutNav = [
+    {$layoutNav = [[
         name       => 'search',
         activeItem => $searchType,
         items => [
             [ 'name' => 'topics', 'url' => "{router page='search/topics'}?q={$_aRequest.q}", 'text' => $aLang.search.result.topics, 'count' => $typeCounts.topics ],
             [ 'name' => 'comments', 'url' => "{router page='search/comments'}?q={$_aRequest.q}", 'text' => $aLang.search.result.comments, 'count' => $typeCounts.comments ]
         ]
-    ]}
+    ]]}
 {/block}
 
 {block 'layout_content'}
diff --git a/application/frontend/skin/synio/actions/ActionSearch/index.tpl b/application/frontend/skin/synio/actions/ActionSearch/index.tpl
index 76d113a4..64676fb1 100644
--- a/application/frontend/skin/synio/actions/ActionSearch/index.tpl
+++ b/application/frontend/skin/synio/actions/ActionSearch/index.tpl
@@ -19,14 +19,14 @@
 {/block}
 
 {block 'layout_options' append}
-    {$layoutNav = [
+    {$layoutNav = [[
         name       => 'search',
         activeItem => $searchType,
         items => [
             [ 'name' => 'topics', 'url' => "{router page='search/topics'}?q={$_aRequest.q}", 'text' => $aLang.search.result.topics, 'count' => $typeCounts.topics ],
             [ 'name' => 'comments', 'url' => "{router page='search/comments'}?q={$_aRequest.q}", 'text' => $aLang.search.result.comments, 'count' => $typeCounts.comments ]
         ]
-    ]}
+    ]]}
 {/block}
 
 {block 'layout_content'}
diff --git a/application/frontend/skin/synio/components/activity/blocks/recent-comments.tpl b/application/frontend/skin/synio/components/activity/blocks/recent-comments.tpl
index dd1ea462..1cdef46f 100644
--- a/application/frontend/skin/synio/components/activity/blocks/recent-comments.tpl
+++ b/application/frontend/skin/synio/components/activity/blocks/recent-comments.tpl
@@ -5,7 +5,7 @@
 
 {component_define_params params=[ 'comments' ]}
 
-{capture 'items'}
+<div class="ls-activity-block-recent-items">
     {foreach $comments as $comment}
         {$topic = $comment->getTarget()}
 
@@ -16,6 +16,4 @@
     {foreachelse}
         {component 'blankslate' text={lang 'common.empty'} mods='no-background'}
     {/foreach}
-{/capture}
-
-{component 'item' template='group' items=$smarty.capture.items}
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/application/frontend/skin/synio/components/activity/blocks/recent-item.tpl b/application/frontend/skin/synio/components/activity/blocks/recent-item.tpl
index 1a173406..fe08c549 100644
--- a/application/frontend/skin/synio/components/activity/blocks/recent-item.tpl
+++ b/application/frontend/skin/synio/components/activity/blocks/recent-item.tpl
@@ -1,26 +1,18 @@
 {component_define_params params=[ 'user', 'topic', 'date' ]}
 
-{capture 'item_content'}
-    <a href="{$user->getUserWebPath()}" class="ls-activity-block-recent-user">{$user->getDisplayName()}</a> &rarr;
-    <a href="{$topic->getUrl()}">{$topic->getTitle()|escape}</a>
+<div class="ls-activity-block-recent-item">
+    <a href="{$user->getUserWebPath()}" class="ls-activity-block-recent-user">{$user->getDisplayName()}</a>
 
-    <p class="ls-activity-block-recent-info">
-        <time datetime="{date_format date=$date format='c'}" class="ls-activity-block-recent-time">
-            {date_format date=$date hours_back="12" minutes_back="60" now="60" day="day H:i" format="j F Y"}
-        </time>
+    <time datetime="{date_format date=$date format='c'}" class="ls-activity-block-recent-date">
+        {date_format date=$date hours_back="12" minutes_back="60" now="60" day="day H:i" format="j F Y"}
+    </time>
+
+    <div>
+        <a href="{$topic->getUrl()}" class="ls-activity-block-recent-title">{$topic->getTitle()|escape}</a>
 
         <a href="{$topic->getUrl()}#comments" class="ls-activity-block-recent-comments">
-            {component 'icon' icon='comments'}
-            {lang 'comments.comments_declension' count=$topic->getCountComment() plural=true}
+            <i class="ls-activity-block-recent-comments-icon"></i>
+            {$topic->getCountComment()}
         </a>
-    </p>
-{/capture}
-
-{component 'item'
-    element = 'li'
-    mods = 'image-rounded'
-    desc = $smarty.capture.item_content
-    image=[
-        'path' => $user->getProfileAvatarPath(48),
-        'url' => $user->getUserWebPath()
-    ]}
\ No newline at end of file
+    </div>
+</div>
\ No newline at end of file
diff --git a/application/frontend/skin/synio/components/activity/blocks/recent-topics.tpl b/application/frontend/skin/synio/components/activity/blocks/recent-topics.tpl
index 765c7c28..52b4ac53 100644
--- a/application/frontend/skin/synio/components/activity/blocks/recent-topics.tpl
+++ b/application/frontend/skin/synio/components/activity/blocks/recent-topics.tpl
@@ -5,7 +5,7 @@
 
 {component_define_params params=[ 'topics' ]}
 
-{capture 'items'}
+<div class="ls-activity-block-recent-items">
     {foreach $topics as $topic}
         {component 'activity' template='recent-item'
             user     = $topic->getUser()
@@ -14,6 +14,4 @@
     {foreachelse}
         {component 'blankslate' text={lang 'common.empty'} mods='no-background'}
     {/foreach}
-{/capture}
-
-{component 'item' template='group' items=$smarty.capture.items}
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/application/frontend/skin/synio/components/activity/css/blocks.css b/application/frontend/skin/synio/components/activity/css/blocks.css
index 7ea7b39a..b26672af 100644
--- a/application/frontend/skin/synio/components/activity/css/blocks.css
+++ b/application/frontend/skin/synio/components/activity/css/blocks.css
@@ -6,21 +6,36 @@
  * @author    Denis Shakhov <denis.shakhov@gmail.com>
  */
 
-.ls-activity-block-recent-user {
-    font-weight: bold;
-    color: #333;
+.ls-activity-block-recent-item {
+    font-size: 11px;
+    margin-bottom: 15px;
+}
+.ls-activity-block-recent-item:last-child {
+    margin-bottom: 0;
 }
 
-.ls-activity-block-recent-info {
-    margin-top: 5px;
-    color: #999;
+.ls-activity-block-recent-user {
+    color: #4c4c4c;
+    text-decoration: underline;
+}
+.ls-activity-block-recent-date {
+    color: #818189;
+}
+.ls-activity-block-recent-title {
     font-size: 12px;
+    text-decoration: underline;
 }
 
 .ls-activity-block-recent-comments {
-    margin-left: 10px;
-    color: #666;
+    margin-left: 5px;
+    font-size: 11px;
+    text-decoration: none;
+    color: #818189;
+    white-space: nowrap;
 }
-.ls-activity-block-recent-comments:hover {
-    color: #444;
+.ls-activity-block-recent-comments-icon {
+    display: inline-block;
+    width: 9px;
+    height: 7px;
+    background: url(../images/comment.png) no-repeat;
 }
\ No newline at end of file
diff --git a/application/frontend/skin/synio/components/activity/images/comment.png b/application/frontend/skin/synio/components/activity/images/comment.png
new file mode 100644
index 00000000..a6a1e08c
Binary files /dev/null and b/application/frontend/skin/synio/components/activity/images/comment.png differ
diff --git a/application/frontend/skin/synio/components/avatar/css/avatar.css b/application/frontend/skin/synio/components/avatar/css/avatar.css
index 16cc1cb3..d91a3f99 100644
--- a/application/frontend/skin/synio/components/avatar/css/avatar.css
+++ b/application/frontend/skin/synio/components/avatar/css/avatar.css
@@ -33,21 +33,41 @@
     color: #f00;
 }
 
+.ls-avatar--size-default {
+    width: 100px;
+}
+.ls-avatar--size-default .ls-avatar-image {
+    width: 100px;
+    height: 100px;
+}
+
+.ls-avatar--size-small {
+    width: 64px;
+}
 .ls-avatar--size-small .ls-avatar-image {
     width: 64px;
     height: 64px;
 }
 
+.ls-avatar--size-xsmall {
+    width: 48px;
+}
 .ls-avatar--size-xsmall .ls-avatar-image {
     width: 48px;
     height: 48px;
 }
 
+.ls-avatar--size-xxsmall {
+    width: 48px;
+}
 .ls-avatar--size-xxsmall .ls-avatar-image {
     width: 24px;
     height: 24px;
 }
 
+.ls-avatar--size-text {
+    width: 18px;
+}
 .ls-avatar--size-text .ls-avatar-image {
     width: 18px;
     height: 18px;
@@ -57,7 +77,6 @@
  * @modifier has-name
  */
 .ls-avatar--has-name {
-    max-width: 64px;
     text-align: center;
 }
 
@@ -75,7 +94,7 @@
  * @modifier inline
  */
 .ls-avatar--has-name.ls-avatar--inline {
-    max-width: none;
+    width: auto;
 }
 .ls-avatar--has-name.ls-avatar--inline .ls-avatar-name-link {
     text-decoration: underline;
diff --git a/application/frontend/skin/synio/components/block/block.tpl b/application/frontend/skin/synio/components/block/block.tpl
index 47a17568..c06ea08a 100644
--- a/application/frontend/skin/synio/components/block/block.tpl
+++ b/application/frontend/skin/synio/components/block/block.tpl
@@ -18,6 +18,10 @@
 
 {$show = $show|default:true}
 
+{if $tabs}
+    {$mods = "$mods has-tabs"}
+{/if}
+
 {if $show}
     <div class="{$component} {cmods name=$component mods=$mods} {$classes}" {cattr list=$attributes}>
         {* Шапка *}
diff --git a/application/frontend/skin/synio/components/block/css/block.css b/application/frontend/skin/synio/components/block/css/block.css
index 21a0e1ea..5a1a44a4 100644
--- a/application/frontend/skin/synio/components/block/css/block.css
+++ b/application/frontend/skin/synio/components/block/css/block.css
@@ -8,11 +8,9 @@
 
 .ls-block {
     overflow: hidden;
-    border-bottom: 1px dotted #dce1e6;
-    padding-bottom: 25px;
 }
 .ls-block + .ls-block {
-    margin-top: 25px;
+    margin-top: 40px;
 }
 .ls-block:last-child {
     margin-bottom: 0;
@@ -38,7 +36,7 @@
 
 /* Шапка */
 .ls-block-header {
-    padding: 0 0 15px;
+    padding: 0 0 30px;
     position: relative;
 }
 .ls-block-header .ls-block-title {
@@ -49,12 +47,70 @@
     color: #333;
 }
 
-/* Навигация */
-.ls-block .ls-tab-list {
-    padding: 15px 0;
-    margin-bottom: 0;
-    border-bottom: 1px solid #eee;
+/* Separator */
+.ls-block .ls-tab-list:before,
+.ls-block-header:before {
+    content: "";
+    position: absolute;
+    left: 0;
+    bottom: -18px;
+    width: 242px;
+    height: 9px;
+    background: url(../images/block-sep.png) no-repeat;
 }
+.ls-block-header:before {
+    bottom: 13px;
+}
+
+.ls-block--has-tabs .ls-block-header {
+    padding-bottom: 15px;
+}
+.ls-block--has-tabs .ls-block-header:before {
+    display: none;
+}
+.ls-block--has-tabs .ls-block .ls-tab-list:before {
+    display: block;
+}
+
+/* Навигация */
+.ls-block .ls-tabs:not(:last-child) {
+    margin-bottom: 10px;
+}
+.ls-block .ls-tab-list {
+    margin-bottom: 20px;
+    border: none;
+    font-size: 11px;
+    position: relative;
+}
+.ls-block .ls-tab-list .ls-tab {
+    margin-right: 10px;
+}
+.ls-block .ls-tab-list .ls-tab .ls-tab-inner {
+    border: 1px solid transparent;
+    line-height: 13px;
+    border-radius: 5px;
+    padding: 3px 6px 4px;
+    display: block;
+    color: #727a90;
+    text-decoration: none;
+}
+
+/* Hover */
+.ls-block .ls-tab-list .ls-tab .ls-tab-inner:hover,
+.ls-block .ls-tab-list .ls-tab:hover .ls-tab-inner {
+    color: #333;
+}
+
+/* Active */
+.ls-block .ls-tab-list .ls-tab.active .ls-tab-inner {
+    color: #628fa5;
+    border-color: #ebf0f4;
+    text-decoration: none;
+}
+.ls-block .ls-tab-list .ls-tab.active .ls-tab-inner:hover {
+    color: #333;
+}
+
 
 /* Контент */
 .ls-block-content {
@@ -62,8 +118,6 @@
 
 /* Подвал */
 .ls-block-footer {
-    border-top: 1px solid #eee;
-    padding: 15px 0;
     font-size: 11px;
     color: #b9c2c2;
 }
diff --git a/application/frontend/skin/synio/components/block/images/block-sep.png b/application/frontend/skin/synio/components/block/images/block-sep.png
new file mode 100644
index 00000000..97199476
Binary files /dev/null and b/application/frontend/skin/synio/components/block/images/block-sep.png differ
diff --git a/application/frontend/skin/synio/components/blog/css/blog-blocks.css b/application/frontend/skin/synio/components/blog/css/blog-blocks.css
index 94785674..189884e0 100644
--- a/application/frontend/skin/synio/components/blog/css/blog-blocks.css
+++ b/application/frontend/skin/synio/components/blog/css/blog-blocks.css
@@ -10,8 +10,9 @@
  * Список блогов
  */
 .ls-block.blog-block-blogs .ls-item {
-    padding: 10px 0;
+    padding: 5px 0;
     font-size: 11px;
+    border: none;
 }
 .ls-block.blog-block-blogs .ls-item-title {
     font-size: 14px;
diff --git a/application/frontend/skin/synio/components/nav/README.md b/application/frontend/skin/synio/components/nav/README.md
deleted file mode 100644
index 2f30666c..00000000
--- a/application/frontend/skin/synio/components/nav/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Компонент nav
-
-Навигация
\ No newline at end of file
diff --git a/application/frontend/skin/synio/components/nav/css/layout-nav.css b/application/frontend/skin/synio/components/nav/css/layout-nav.css
index 3be92198..b1888133 100644
--- a/application/frontend/skin/synio/components/nav/css/layout-nav.css
+++ b/application/frontend/skin/synio/components/nav/css/layout-nav.css
@@ -81,4 +81,11 @@
     -webkit-box-shadow: none;
     box-shadow: none;
     border: none;
+}
+
+.layout-nav-top .ls-badge {
+    background: none;
+    padding: 0;
+    font-weight: normal;
+    color: #b1c4ce;
 }
\ No newline at end of file
diff --git a/application/frontend/skin/synio/components/nav/css/nav.css b/application/frontend/skin/synio/components/nav/css/nav.css
index e79d1870..f28617ad 100644
--- a/application/frontend/skin/synio/components/nav/css/nav.css
+++ b/application/frontend/skin/synio/components/nav/css/nav.css
@@ -38,9 +38,9 @@
  * Поддержка счетчиков
  */
 .ls-nav-item .ls-nav-item-badge {
-    line-height: 20px;
-    float: right;
-    margin-left: 7px;
+    display: inline;
+    margin-left: 0;
+    line-height: inherit;
 }
 
 
diff --git a/application/frontend/skin/synio/components/nav/nav-item.tpl b/application/frontend/skin/synio/components/nav/nav-item.tpl
index c3999571..099fb13d 100644
--- a/application/frontend/skin/synio/components/nav/nav-item.tpl
+++ b/application/frontend/skin/synio/components/nav/nav-item.tpl
@@ -45,11 +45,6 @@
 
         {* Ссылка *}
         <a href="{$url}" class="{$component}-link" {$target}>
-            {* Счетчик *}
-            {if isset($count) && ( $showZeroCounter || ( ! $showZeroCounter && $count > 0 ) )}
-                {component 'badge' value=$count classes="{$component}-badge"}
-            {/if}
-
             {* Иконка *}
             {if is_array($icon)}
                 {component 'icon' attributes=[ 'aria-hidden' => 'true' ] params=$icon}
@@ -62,6 +57,11 @@
                 {$text}
             </span>
 
+            {* Счетчик *}
+            {if isset($count) && ( $showZeroCounter || ( ! $showZeroCounter && $count > 0 ) )}
+                {component 'badge' value=$count classes="{$component}-badge"}
+            {/if}
+
             {* Стрелка *}
             {if $menu}
                 <div class="ls-caret {if ! $isRoot}ls-caret--right{/if} {$component}-caret"></div>
diff --git a/application/frontend/skin/synio/components/syn-icon/icon.css b/application/frontend/skin/synio/components/syn-icon/icon.css
index 0df73980..3f5b0f6d 100644
--- a/application/frontend/skin/synio/components/syn-icon/icon.css
+++ b/application/frontend/skin/synio/components/syn-icon/icon.css
@@ -57,6 +57,11 @@
     height: 21px;
     background-image: url(icons/lock.png);
 }
+.syn-icon-draft {
+    width: 21px;
+    height: 21px;
+    background-image: url(icons/draft.png);
+}
 .syn-icon-user {
     width: 12px;
     height: 12px;
diff --git a/application/frontend/skin/synio/components/syn-icon/icons/draft.png b/application/frontend/skin/synio/components/syn-icon/icons/draft.png
new file mode 100644
index 00000000..46dac410
Binary files /dev/null and b/application/frontend/skin/synio/components/syn-icon/icons/draft.png differ
diff --git a/application/frontend/skin/synio/components/topic/blocks/block.topics-tags.tpl b/application/frontend/skin/synio/components/topic/blocks/block.topics-tags.tpl
new file mode 100644
index 00000000..a6b0e667
--- /dev/null
+++ b/application/frontend/skin/synio/components/topic/blocks/block.topics-tags.tpl
@@ -0,0 +1,22 @@
+{**
+ * Теги
+ *}
+
+{component_define_params params=[ 'tags', 'tagsUser' ]}
+
+{component 'block'
+    title   = {lang 'tags.block_tags.title'}
+    classes = 'js-block-default'
+    tabs    = [
+        'tabs' => [
+            [
+                'text' => {lang 'tags.block_tags.nav.all'},
+                'content' => {component 'tags' template='cloud' tags=$tags}
+            ],
+            [
+                'text' => {lang 'tags.block_tags.nav.favourite'},
+                'content' => {component 'tags' template='cloud' tags=$tagsUser},
+                'is_enabled' => !! $oUserCurrent
+            ]
+        ]
+    ]}
\ No newline at end of file
diff --git a/application/frontend/skin/synio/components/topic/css/topic.css b/application/frontend/skin/synio/components/topic/css/topic.css
index ddebe33c..b5849f20 100644
--- a/application/frontend/skin/synio/components/topic/css/topic.css
+++ b/application/frontend/skin/synio/components/topic/css/topic.css
@@ -43,10 +43,9 @@
 .ls-topic-title a:hover {
     color: #f00;
 }
-.ls-topic-title i {
+.ls-topic-title .syn-icon {
     position: relative;
-    top: 8px;
-    cursor: help;
+    top: 4px;
 }
 
 .ls-topic-blogs {
diff --git a/application/frontend/skin/synio/components/topic/topic.tpl b/application/frontend/skin/synio/components/topic/topic.tpl
index 6c295637..d37ef9d1 100644
--- a/application/frontend/skin/synio/components/topic/topic.tpl
+++ b/application/frontend/skin/synio/components/topic/topic.tpl
@@ -30,7 +30,7 @@
         <h1 class="{$component}-title ls-word-wrap">
             {block 'topic_title'}
                 {if $topic->getPublish() == 0}
-                    {component 'icon' icon='file' attributes=[ title => {lang 'topic.is_draft'} ]}
+                    {component 'syn-icon' icon='draft' attributes=[ title => {lang 'topic.is_draft'} ]}
                 {/if}
 
                 {if $isList}