diff --git a/Web/Presenters/DocumentsPresenter.php b/Web/Presenters/DocumentsPresenter.php
index b003b932..78f17bfc 100644
--- a/Web/Presenters/DocumentsPresenter.php
+++ b/Web/Presenters/DocumentsPresenter.php
@@ -73,10 +73,10 @@ final class DocumentsPresenter extends OpenVKPresenter
         $this->template->count = $docs->size();
         $this->template->docs  = iterator_to_array($docs->page($page, OPENVK_DEFAULT_PER_PAGE));
         $this->template->locale_string = "you_have_x_documents";
-        if ($owner_id < 0) {
-            $this->template->locale_string = "group_has_x_documents";
-        } elseif ($current_tab != 0) {
+        if ($current_tab != 0) {
             $this->template->locale_string = "x_documents_in_tab";
+        } else if ($owner_id < 0) {
+            $this->template->locale_string = "group_has_x_documents";
         }
 
         $this->template->canUpload = $owner_id == $this->user->id || $this->template->group->canBeModifiedBy($this->user->identity);
diff --git a/Web/Presenters/templates/Documents/List.xml b/Web/Presenters/templates/Documents/List.xml
index ad9a9948..5007de25 100644
--- a/Web/Presenters/templates/Documents/List.xml
+++ b/Web/Presenters/templates/Documents/List.xml
@@ -20,28 +20,25 @@
 {block content}
     {var $is_gallery = $current_tab == 3 || $current_tab == 4}
     <div id="docs_page_wrapper">
-        <div class="docs_page_search">
-            <form action="/search" method="get">
-                <input type="hidden" name="section" value="docs">
-                <input type="search" name="q" class="input_with_search_icon" placeholder="{_search_by_documents}">
-            </form>
-            <input n:if="$canUpload" id="upload_entry_point" class="button" type="button" value="{_upload_button}" {if isset($group)}data-gid="{$group->getId()}"{/if}>
-        </div>
-        <div n:if="sizeof($tabs) > 1" class="docs_page_tabs">
-            <div class="mb_tabs">
-                <div class="mb_tab" n:attr="id => $current_tab == 0 ? active">
-                    <a href="?tab=0">{_document_type_0}</a>
-                </div>
-                <div n:foreach="$tabs as $tab" class="mb_tab" n:attr="id => $tab['type'] == $current_tab ? active">
-                    <a href="?tab={$tab['type']}">
-                        {$tab["name"]}
-                        <span n:if="$tab['count'] > 1" class="special_counter">{$tab["count"]}</span>
-                    </a>
+        <div class="docs_page_tabs">
+            <div class="mb_tabs display_flex_row display_flex_space_between">
+                <div>
+                    <div class="mb_tab" n:attr="id => $current_tab == 0 ? active">
+                        <a href="?tab=0">{_document_type_0}</a>
+                    </div>
+                    <div n:foreach="$tabs as $tab" class="mb_tab" n:attr="id => $tab['type'] == $current_tab ? active">
+                        <a href="?tab={$tab['type']}">
+                            {$tab["name"]}
+                            <span n:if="$tab['count'] > 1" class="special_counter">{$tab["count"]}</span>
+                        </a>
+                    </div>
                 </div>
+
+                <input n:if="$canUpload" id="upload_entry_point" class="button" type="button" value="{_upload_button}" {if isset($group)}data-gid="{$group->getId()}"{/if}>
             </div>
         </div>
         <div n:class="docs_page_content, $is_gallery ? docs_page_gallery">
-            <div class="summaryBar display_flex_row display_flex_space_between">
+            <div n:if="$count > 0" class="summaryBar display_flex_row display_flex_space_between">
                 <div class="summary">{tr($locale_string, $count)}.</div>
 
                 <select n:if="$count > 3" name="docs_sort">
diff --git a/Web/static/css/main.css b/Web/static/css/main.css
index 730df906..1d96fed3 100644
--- a/Web/static/css/main.css
+++ b/Web/static/css/main.css
@@ -4031,7 +4031,7 @@ hr {
 #docs_page_wrapper .container_white {
     display: flex;
     flex-direction: column;
-    padding: 5px 10px;
+    padding: 10px 10px;
 }
 
 #docs_page_wrapper .docs_page_content.docs_page_gallery .scroll_container {