diff --git a/packages/ui-next/src/components/TextInput.svelte b/packages/ui-next/src/components/TextInput.svelte
index ea47b7a58b..a3f4fe0584 100644
--- a/packages/ui-next/src/components/TextInput.svelte
+++ b/packages/ui-next/src/components/TextInput.svelte
@@ -228,13 +228,13 @@
   .text-input {
     display: flex;
     padding: 0.75rem;
+    padding-top: 0.5rem;
     flex-direction: column;
     align-items: flex-start;
-    gap: 0.375rem;
+    gap: 0.25rem;
     align-self: stretch;
     border-radius: 0.75rem;
-    border: 1px solid var(--next-message-input-color-stroke);
-    background: var(--next-message-input-color-background);
+    border: 1px solid var(--theme-refinput-divider);
     overflow: hidden;
   }
 
diff --git a/packages/ui-next/src/components/message/MessageBody.svelte b/packages/ui-next/src/components/message/MessageBody.svelte
index 91aa50037b..498ace6fbf 100644
--- a/packages/ui-next/src/components/message/MessageBody.svelte
+++ b/packages/ui-next/src/components/message/MessageBody.svelte
@@ -44,11 +44,13 @@
 
 {#if compact}
   <div class="message__body">
+    <div class="time-container">
     <div class="message__time message--time_hoverable">
       <div class="message__date">
         {formatDate(message.created)}
       </div>
     </div>
+    </div>
 
     <div class="message__content">
       {#if !isEditing && message.content !== ''}
@@ -125,7 +127,8 @@
     gap: 1rem;
     align-self: stretch;
     min-width: 0;
-    overflow: hidden;
+    position: relative;
+    //overflow: hidden;
   }
 
   .message__avatar {
@@ -185,13 +188,19 @@
     flex: 1;
   }
 
-  .message__time {
-    display: flex;
+  .time-container {
+    position: relative;
     width: 2.5rem;
+  }
+
+  .message__time {
+    position: absolute;
+    display: flex;
     flex-direction: column;
     align-items: center;
     justify-content: center;
     height: 1.313rem;
+    right: 0;
     visibility: hidden;
   }
 </style>
diff --git a/packages/ui-next/src/components/message/MessageInput.svelte b/packages/ui-next/src/components/message/MessageInput.svelte
index 4236bbfb5d..9a2f3f3d1b 100644
--- a/packages/ui-next/src/components/message/MessageInput.svelte
+++ b/packages/ui-next/src/components/message/MessageInput.svelte
@@ -294,7 +294,7 @@
   >
     <div slot="header" class="header">
       {#if files.length > 0}
-        <div class="flex-row-center files-list scroll-divider-color flex-gap-2">
+        <div class="flex-row-center files-list scroll-divider-color flex-gap-2 mt-2">
           {#each files as file (file.blobId)}
             <div class="item flex">
               <AttachmentPresenter
@@ -337,7 +337,6 @@
   }
 
   .files-list {
-    padding: 0.5rem;
     overflow-x: auto;
     overflow-y: hidden;
 
diff --git a/plugins/card-resources/src/components/navigator-next/NavigatorCardsSection.svelte b/plugins/card-resources/src/components/navigator-next/NavigatorCardsSection.svelte
index ec424a0fc5..e60ee3e5e8 100644
--- a/plugins/card-resources/src/components/navigator-next/NavigatorCardsSection.svelte
+++ b/plugins/card-resources/src/components/navigator-next/NavigatorCardsSection.svelte
@@ -23,12 +23,11 @@
     getClient
   } from '@hcengineering/presentation'
   import { Label, NotificationContext, NotificationType } from '@hcengineering/communication-types'
-  import ui, { Button, ModernButton } from '@hcengineering/ui'
+  import ui, { ModernButton } from '@hcengineering/ui'
 
   import type { CardsNavigatorConfig } from '../../types'
   import cardPlugin from '../../plugin'
   import NavigatorType from './NavigatorType.svelte'
-  import { getEmbeddedLabel } from '@hcengineering/platform'
   import NavigatorCard from './NavigatorCard.svelte'
 
   export let type: MasterTag