diff --git a/apps/chat/src/components/Chat/ChangePathDialog.tsx b/apps/chat/src/components/Chat/ChangePathDialog.tsx
index 5a73e8d4cd..542b707a92 100644
--- a/apps/chat/src/components/Chat/ChangePathDialog.tsx
+++ b/apps/chat/src/components/Chat/ChangePathDialog.tsx
@@ -228,7 +228,6 @@ export const ChangePathDialog = ({
       isInitialRenameEnabled: true,
       openedFoldersIds,
       newAddedFolderId: newFolderId,
-      isSidePanelFolder: false,
       loadingFolderIds,
       additionalItemData: {
         isChangePathFolder: true,
diff --git a/apps/chat/src/components/Chat/Playback/PlaybackIcon.tsx b/apps/chat/src/components/Chat/Playback/PlaybackIcon.tsx
index 4b903cbfbe..454778283a 100644
--- a/apps/chat/src/components/Chat/Playback/PlaybackIcon.tsx
+++ b/apps/chat/src/components/Chat/Playback/PlaybackIcon.tsx
@@ -9,14 +9,15 @@ import { IconNonModelWithTooltip } from '../IconNonModelWithTooltip';
 interface Props {
   isCustomTooltip?: boolean;
   size?: number;
+  strokeWidth?: number;
 }
 
-export const PlaybackIcon = ({ isCustomTooltip, size }: Props) => {
+export const PlaybackIcon = ({ isCustomTooltip, ...props }: Props) => {
   const { t } = useTranslation(Translation.Chat);
 
   return (
     <IconNonModelWithTooltip
-      icon={<IconPlayerPlay size={size} />}
+      icon={<IconPlayerPlay {...props} />}
       tooltipContent={t('Playback')}
       isCustomTooltip={isCustomTooltip}
     />
diff --git a/apps/chat/src/components/Chat/Publish/ApproveRequiredSection.tsx b/apps/chat/src/components/Chat/Publish/ApproveRequiredSection.tsx
index 541830ccfe..543220fe93 100644
--- a/apps/chat/src/components/Chat/Publish/ApproveRequiredSection.tsx
+++ b/apps/chat/src/components/Chat/Publish/ApproveRequiredSection.tsx
@@ -81,7 +81,7 @@ const PublicationItem = ({ publication, featureTypes }: PublicationProps) => {
   );
 
   const additionalItemData = useMemo(
-    () => ({ publicationUrl: publication.url }),
+    () => ({ publicationUrl: publication.url, isSidePanelItem: true }),
     [publication.url],
   );
 
@@ -96,7 +96,7 @@ const PublicationItem = ({ publication, featureTypes }: PublicationProps) => {
       <div
         onClick={handlePublicationSelect}
         className={classNames(
-          'group relative flex h-[30px] items-center rounded border-l-2 hover:bg-accent-primary-alpha',
+          'group relative flex h-[34px] items-center rounded border-l-2 hover:bg-accent-primary-alpha',
           selectedPublicationUrl === publication.url &&
             !selectedConversationIds.length
             ? 'border-l-accent-primary bg-accent-primary-alpha'
@@ -107,7 +107,12 @@ const PublicationItem = ({ publication, featureTypes }: PublicationProps) => {
         <div className="group/button flex size-full cursor-pointer items-center gap-1 py-2 pr-3">
           <CaretIconComponent hidden={!showCaretIcon} isOpen={isOpen} />
           <div className="relative">
-            <IconClipboard className="text-secondary" width={18} height={18} />
+            <IconClipboard
+              className="text-secondary"
+              strokeWidth={1.5}
+              width={24}
+              height={24}
+            />
             {(!itemsToReview
               .filter((item) => !isFileId(item.reviewUrl))
               .every((item) => item.reviewed) ||
diff --git a/apps/chat/src/components/Chat/Publish/PublicationResources.tsx b/apps/chat/src/components/Chat/Publish/PublicationResources.tsx
index 3aeab72781..7d62c904fe 100644
--- a/apps/chat/src/components/Chat/Publish/PublicationResources.tsx
+++ b/apps/chat/src/components/Chat/Publish/PublicationResources.tsx
@@ -190,7 +190,6 @@ export const PromptPublicationResources = ({
           }
           folderClassName={classNames(readonly && 'h-[38px]')}
           showTooltip={showTooltip}
-          isSidePanelFolder={!readonly}
           additionalItemData={additionalItemData}
         />
       ))}
@@ -366,7 +365,6 @@ export const ConversationPublicationResources = ({
           folderClassName={classNames(readonly && 'h-[38px]')}
           additionalItemData={additionalItemData}
           showTooltip={showTooltip}
-          isSidePanelFolder={!readonly}
         />
       ))}
       {itemsToDisplay.map((conversation) =>
diff --git a/apps/chat/src/components/Chat/ReplayAsIsIcon.tsx b/apps/chat/src/components/Chat/ReplayAsIsIcon.tsx
index 0bd064ec3d..86bc40b84f 100644
--- a/apps/chat/src/components/Chat/ReplayAsIsIcon.tsx
+++ b/apps/chat/src/components/Chat/ReplayAsIsIcon.tsx
@@ -9,14 +9,15 @@ import { IconNonModelWithTooltip } from './IconNonModelWithTooltip';
 interface Props {
   isCustomTooltip?: boolean;
   size?: number;
+  strokeWidth?: number;
 }
 
-export const ReplayAsIsIcon = ({ isCustomTooltip, size }: Props) => {
+export const ReplayAsIsIcon = ({ isCustomTooltip, ...props }: Props) => {
   const { t } = useTranslation(Translation.Chat);
 
   return (
     <IconNonModelWithTooltip
-      icon={<IconRefreshDot size={size} />}
+      icon={<IconRefreshDot {...props} />}
       tooltipContent={t('Replay as is')}
       isCustomTooltip={isCustomTooltip}
     />
diff --git a/apps/chat/src/components/Chatbar/ChatFolders.tsx b/apps/chat/src/components/Chatbar/ChatFolders.tsx
index ceff95494b..5dc6fdd172 100644
--- a/apps/chat/src/components/Chatbar/ChatFolders.tsx
+++ b/apps/chat/src/components/Chatbar/ChatFolders.tsx
@@ -109,15 +109,22 @@ const ChatFolderTemplate = ({
   const selectedConversations = useAppSelector(
     ConversationsSelectors.selectSelectedItems,
   );
-
   const emptyFoldersIds = useAppSelector(
     ConversationsSelectors.selectEmptyFolderIds,
   );
-
   const isFolderEmpty = useAppSelector((state) =>
     ConversationsSelectors.selectIsFolderEmpty(state, folder.id),
   );
 
+  const additionalFolderData = useMemo(
+    () => ({
+      selectedFolderIds: fullyChosenFolderIds,
+      partialSelectedFolderIds: partialChosenFolderIds,
+      isSidePanelItem: true,
+    }),
+    [fullyChosenFolderIds, partialChosenFolderIds],
+  );
+
   const handleDrop = useCallback(
     (e: DragEvent, folder: FolderInterface) => {
       if (e.dataTransfer) {
@@ -289,10 +296,7 @@ const ChatFolderTemplate = ({
         loadingFolderIds={loadingFolderIds}
         onSelectFolder={handleFolderSelect}
         canSelectFolders={isSelectMode}
-        additionalItemData={{
-          selectedFolderIds: fullyChosenFolderIds,
-          partialSelectedFolderIds: partialChosenFolderIds,
-        }}
+        additionalItemData={additionalFolderData}
       />
       {isLast && (
         <BetweenFoldersLine
@@ -342,6 +346,13 @@ export const ChatSection = ({
 
   const { handleToggle, isExpanded } = useSectionToggle(name, FeatureType.Chat);
 
+  const additionalConvData = useMemo(
+    () => ({
+      isSidePanelItem: true,
+    }),
+    [],
+  );
+
   const sortedRootConversations = useMemo(
     () => sortByName(rootConversations),
     [rootConversations],
@@ -407,7 +418,11 @@ export const ChatSection = ({
       {displayRootFiles && (
         <div className="flex flex-col gap-1">
           {sortedRootConversations.map((item) => (
-            <ConversationComponent key={item.id} item={item} />
+            <ConversationComponent
+              additionalItemData={additionalConvData}
+              key={item.id}
+              item={item}
+            />
           ))}
         </div>
       )}
diff --git a/apps/chat/src/components/Chatbar/Chatbar.tsx b/apps/chat/src/components/Chatbar/Chatbar.tsx
index e422160aed..75cefba1a9 100644
--- a/apps/chat/src/components/Chatbar/Chatbar.tsx
+++ b/apps/chat/src/components/Chatbar/Chatbar.tsx
@@ -51,7 +51,7 @@ const ChatActionsBlock = () => {
   return (
     <div className="flex px-2 py-1">
       <button
-        className="flex shrink-0 grow cursor-pointer select-none items-center gap-3 rounded px-3 py-2 transition-colors duration-200 hover:bg-accent-primary-alpha disabled:cursor-not-allowed hover:disabled:bg-transparent"
+        className="flex shrink-0 grow cursor-pointer select-none items-center gap-3 rounded px-3 py-[5px] transition-colors duration-200 hover:bg-accent-primary-alpha disabled:cursor-not-allowed hover:disabled:bg-transparent"
         onClick={() => {
           dispatch(
             ConversationsActions.createNewConversations({
@@ -64,9 +64,9 @@ const ChatActionsBlock = () => {
         data-qa="new-entity"
       >
         {isActiveNewConversationRequest ? (
-          <Spinner size={18} className="text-secondary" />
+          <Spinner size={24} className="text-secondary" />
         ) : (
-          <PlusIcon className="text-secondary" width={18} height={18} />
+          <PlusIcon className="text-secondary" width={24} height={24} />
         )}
         {t('New conversation')}
       </button>
diff --git a/apps/chat/src/components/Chatbar/Conversation.tsx b/apps/chat/src/components/Chatbar/Conversation.tsx
index d607a3cf6f..e2269ba982 100644
--- a/apps/chat/src/components/Chatbar/Conversation.tsx
+++ b/apps/chat/src/components/Chatbar/Conversation.tsx
@@ -134,19 +134,26 @@ export function ConversationView({
     !additionalItemData?.publicationUrl ||
     selectedPublicationUrl === additionalItemData?.publicationUrl;
 
+  const iconSize = additionalItemData?.isSidePanelItem ? 24 : 18;
+  const strokeWidth = additionalItemData?.isSidePanelItem ? 1.5 : 2;
+
   return (
     <>
       <div
         className={classNames(
-          'relative size-[18px]',
-          isSelectMode &&
-            !isExternal &&
-            'shrink-0 group-hover/conversation-item:flex',
+          'relative',
+          additionalItemData?.isSidePanelItem
+            ? 'size-[24px] items-center justify-center'
+            : 'size-[18px]',
+          isSelectMode && !isExternal && 'shrink-0 group-hover:flex',
           isSelectMode && isChosen && !isExternal ? 'flex' : 'hidden',
         )}
       >
         <input
-          className="checkbox peer size-[18px] bg-layer-3"
+          className={classNames(
+            'checkbox peer size-[18px] bg-layer-3',
+            additionalItemData?.isSidePanelItem && 'mr-0',
+          )}
           type="checkbox"
           checked={isChosen}
           onChange={handleToggle}
@@ -163,14 +170,14 @@ export function ConversationView({
         featureType={FeatureType.Chat}
         isInvalid={isInvalid}
         containerClassName={classNames(
-          isSelectMode && !isExternal && 'group-hover/conversation-item:hidden',
+          isSelectMode && !isExternal && 'group-hover:hidden',
           isChosen && !isExternal && 'hidden',
         )}
       >
         {resourceToReview && !resourceToReview.reviewed && (
           <ReviewDot
             className={classNames(
-              'group-hover/conversation-item:bg-accent-secondary-alpha',
+              'group-hover:bg-accent-secondary-alpha',
               (selectedConversationIds.includes(conversation.id) ||
                 isContextMenu) &&
                 isPartOfSelectedPublication &&
@@ -180,19 +187,19 @@ export function ConversationView({
         )}
         {conversation.isReplay && (
           <span className="flex shrink-0">
-            <ReplayAsIsIcon size={18} />
+            <ReplayAsIsIcon size={iconSize} />
           </span>
         )}
 
         {conversation.isPlayback && (
           <span className="flex shrink-0">
-            <PlaybackIcon size={18} />
+            <PlaybackIcon strokeWidth={strokeWidth} size={iconSize} />
           </span>
         )}
 
         {!conversation.isReplay && !conversation.isPlayback && (
           <ModelIcon
-            size={18}
+            size={iconSize}
             entityId={conversation.model.id}
             entity={modelsMap[conversation.model.id]}
             isInvalid={isInvalid}
@@ -656,15 +663,19 @@ export const ConversationComponent = ({
     }
   }, [isSelectMode]);
 
+  const iconSize = additionalItemData?.isSidePanelItem ? 24 : 18;
+  const strokeWidth = additionalItemData?.isSidePanelItem ? 1.5 : 2;
+
   return (
     <div
       className={classNames(
-        'group/conversation-item relative flex h-[30px] items-center rounded border-l-2 pr-3 hover:bg-accent-primary-alpha',
+        'group relative flex items-center rounded border-l-2 pr-3 hover:bg-accent-primary-alpha',
         !isSelectMode && isHighlighted
           ? 'border-l-accent-primary'
           : 'border-l-transparent',
         (isHighlighted || isContextMenu) && 'bg-accent-primary-alpha',
         isNameOrPathInvalid && !isRenaming && 'text-secondary',
+        additionalItemData?.isSidePanelItem ? 'h-[34px]' : 'h-[30px]',
       )}
       style={{
         paddingLeft: (level && `${0.875 + level * 1.5}rem`) || '0.875rem',
@@ -684,19 +695,20 @@ export const ConversationComponent = ({
           >
             {conversation.isReplay && (
               <span className="flex shrink-0">
-                <ReplayAsIsIcon size={18} />
+                <ReplayAsIsIcon strokeWidth={strokeWidth} size={iconSize} />
+                strokeWidth={strokeWidth}
               </span>
             )}
 
             {conversation.isPlayback && (
               <span className="flex shrink-0">
-                <PlaybackIcon size={18} />
+                <PlaybackIcon strokeWidth={strokeWidth} size={iconSize} />
               </span>
             )}
 
             {!conversation.isReplay && !conversation.isPlayback && (
               <ModelIcon
-                size={18}
+                size={iconSize}
                 entityId={conversation.model.id}
                 entity={modelsMap[conversation.model.id]}
               />
@@ -720,10 +732,8 @@ export const ConversationComponent = ({
       ) : (
         <button
           className={classNames(
-            'group/conversation-item flex size-full cursor-pointer items-center gap-2 disabled:cursor-not-allowed',
-            isSelectMode
-              ? 'pr-0'
-              : '[&:not(:disabled)]:group-hover/conversation-item:pr-6',
+            'group flex size-full cursor-pointer items-center gap-2 disabled:cursor-not-allowed',
+            isSelectMode ? 'pr-0' : '[&:not(:disabled)]:group-hover:pr-6',
           )}
           onClick={() => {
             setIsDeleting(false);
@@ -775,7 +785,7 @@ export const ConversationComponent = ({
           ref={refs.setFloating}
           {...getFloatingProps()}
           className={classNames(
-            'absolute right-3 z-50 flex cursor-pointer justify-end group-hover/conversation-item:visible',
+            'absolute right-3 z-50 flex cursor-pointer justify-end group-hover:visible',
             (conversation.status === UploadStatus.LOADED || !isContextMenu) &&
               'invisible',
           )}
diff --git a/apps/chat/src/components/Chatbar/ConversationsRenderer.tsx b/apps/chat/src/components/Chatbar/ConversationsRenderer.tsx
index 5df5ed28d6..5993cf36f9 100644
--- a/apps/chat/src/components/Chatbar/ConversationsRenderer.tsx
+++ b/apps/chat/src/components/Chatbar/ConversationsRenderer.tsx
@@ -1,4 +1,4 @@
-import { useEffect, useState } from 'react';
+import { useEffect, useMemo, useState } from 'react';
 
 import { useSectionToggle } from '@/src/hooks/useSectionToggle';
 
@@ -31,6 +31,13 @@ export const ConversationsRenderer = ({
     FeatureType.Chat,
   );
 
+  const additionalConvData = useMemo(
+    () => ({
+      isSidePanelItem: true,
+    }),
+    [],
+  );
+
   useEffect(() => {
     setIsSectionHighlighted(
       conversations.some((conv) => selectedConversationsIds.includes(conv.id)),
@@ -52,6 +59,7 @@ export const ConversationsRenderer = ({
               <ConversationComponent
                 key={conversation.id}
                 item={conversation}
+                additionalItemData={additionalConvData}
               />
             ))}
           </div>
diff --git a/apps/chat/src/components/Common/FolderContextMenu.tsx b/apps/chat/src/components/Common/FolderContextMenu.tsx
index faf14e27d7..a22772039b 100644
--- a/apps/chat/src/components/Common/FolderContextMenu.tsx
+++ b/apps/chat/src/components/Common/FolderContextMenu.tsx
@@ -39,7 +39,6 @@ interface FolderContextMenuProps {
   featureType: FeatureType;
   isOpen?: boolean;
   isEmpty?: boolean;
-  isSidePanelFolder?: boolean;
   additionalItemData?: AdditionalItemData;
   onDelete?: MouseEventHandler<unknown>;
   onRename?: MouseEventHandler<unknown>;
@@ -69,7 +68,6 @@ export const FolderContextMenu = ({
   onUpload,
   isOpen,
   isEmpty,
-  isSidePanelFolder,
   additionalItemData,
   onSelect,
 }: FolderContextMenuProps) => {
@@ -163,7 +161,7 @@ export const FolderContextMenu = ({
           isPublishingEnabled &&
           isItemPublic(folder.id) &&
           !!onUnpublish &&
-          isSidePanelFolder,
+          !!additionalItemData?.isSidePanelItem,
         Icon: UnpublishIcon,
         onClick: onUnpublish,
         disabled: disableAll,
@@ -224,10 +222,10 @@ export const FolderContextMenu = ({
       onPublish,
       onPublishUpdate,
       onUnpublish,
-      isSidePanelFolder,
+      additionalItemData?.isSidePanelItem,
+      additionalItemData?.isChangePathFolder,
       onDelete,
       onAddFolder,
-      additionalItemData?.isChangePathFolder,
     ],
   );
 
diff --git a/apps/chat/src/components/Files/SelectFolderModal.tsx b/apps/chat/src/components/Files/SelectFolderModal.tsx
index a5ef63a65b..acac5bb775 100644
--- a/apps/chat/src/components/Files/SelectFolderModal.tsx
+++ b/apps/chat/src/components/Files/SelectFolderModal.tsx
@@ -124,7 +124,6 @@ export const SelectFolderModal = ({
             onAddFolder: handleAddFolder,
             newAddedFolderId: newFolderId,
             loadingFolderIds: loadingFolderIds,
-            isSidePanelFolder: false,
           }}
           handleFolderSelect={handleFolderSelect}
           isAllEntitiesOpened={isAllFilesOpened}
diff --git a/apps/chat/src/components/Folder/Folder.tsx b/apps/chat/src/components/Folder/Folder.tsx
index 868f08ec95..43b48b1928 100644
--- a/apps/chat/src/components/Folder/Folder.tsx
+++ b/apps/chat/src/components/Folder/Folder.tsx
@@ -75,7 +75,6 @@ import { UIActions } from '@/src/store/ui/ui.reducers';
 import SidebarActionButton from '@/src/components/Buttons/SidebarActionButton';
 import CaretIconComponent from '@/src/components/Common/CaretIconComponent';
 
-import CheckIcon from '../../../public/images/icons/check.svg';
 import { PublishModal } from '../Chat/Publish/PublishWizard';
 import { ReviewDot } from '../Chat/Publish/ReviewDot';
 import { ConfirmDialog } from '../Common/ConfirmDialog';
@@ -125,7 +124,6 @@ export interface FolderProps<T, P = unknown> {
   canSelectFolders?: boolean;
   isSelectAlwaysVisible?: boolean;
   showTooltip?: boolean;
-  isSidePanelFolder?: boolean;
 }
 
 const Folder = <T extends ConversationInfo | PromptInfo | DialFile>({
@@ -163,7 +161,6 @@ const Folder = <T extends ConversationInfo | PromptInfo | DialFile>({
   canSelectFolders = false,
   isSelectAlwaysVisible = false,
   showTooltip,
-  isSidePanelFolder = true,
 }: FolderProps<T>) => {
   const { t } = useTranslation(Translation.Chat);
 
@@ -833,6 +830,9 @@ const Folder = <T extends ConversationInfo | PromptInfo | DialFile>({
     readonly ||
     isRenaming;
 
+  const iconSize = additionalItemData?.isSidePanelItem ? 24 : 18;
+  const folderIconStrokeWidth = additionalItemData?.isSidePanelItem ? 1.5 : 2;
+
   return (
     <div
       id="folder"
@@ -849,7 +849,7 @@ const Folder = <T extends ConversationInfo | PromptInfo | DialFile>({
     >
       <div
         className={classNames(
-          'group/button group/folder-item group relative flex h-[30px] cursor-pointer items-center rounded border-l-2 hover:bg-accent-primary-alpha',
+          'group/button group/folder-item group relative flex cursor-pointer items-center rounded border-l-2 hover:bg-accent-primary-alpha',
           (canSelectFolders || !withBorderHighlight) && 'border-transparent',
           isHighlighted ? 'bg-accent-primary-alpha' : 'border-transparent',
           !canSelectFolders &&
@@ -857,6 +857,7 @@ const Folder = <T extends ConversationInfo | PromptInfo | DialFile>({
             withBorderHighlight &&
             'border-accent-primary',
           folderClassName,
+          additionalItemData?.isSidePanelItem ? 'h-[34px]' : 'h-[30px]',
         )}
         data-qa="folder"
         onClick={(e) => {
@@ -908,23 +909,24 @@ const Folder = <T extends ConversationInfo | PromptInfo | DialFile>({
                     isHighlighted
                     featureType={featureType}
                     containerClassName={classNames(
-                      (!isExternal || !isSidePanelFolder) &&
+                      (!isExternal || !additionalItemData?.isSidePanelItem) &&
                         canSelectFolders &&
-                        'group-hover/folder-item:hidden',
+                        'group-hover:hidden',
                     )}
                   >
                     {hasResourcesToReview &&
-                      isSidePanelFolder &&
+                      additionalItemData?.isSidePanelItem &&
                       additionalItemData?.publicationUrl && (
-                        <ReviewDot className="group-hover/folder-item:bg-accent-primary-alpha" />
+                        <ReviewDot className="group-hover:bg-accent-primary-alpha" />
                       )}
                     <IconFolder
-                      size={18}
+                      strokeWidth={folderIconStrokeWidth}
+                      size={iconSize}
                       className={classNames(
                         'mr-1 text-secondary',
-                        (!isExternal || !isSidePanelFolder) &&
+                        (!isExternal || !additionalItemData?.isSidePanelItem) &&
                           canSelectFolders &&
-                          'group-hover/folder-item:hidden',
+                          'group-hover:hidden',
                       )}
                     />
                   </ShareIcon>
@@ -932,16 +934,22 @@ const Folder = <T extends ConversationInfo | PromptInfo | DialFile>({
                 {canSelectFolders &&
                   ((!isExternal &&
                     !loadingFolderIds.includes(currentFolder.id)) ||
-                    !isSidePanelFolder) && (
+                    !additionalItemData?.isSidePanelItem) && (
                     <div
                       className={classNames(
-                        'relative mr-1 size-[18px] group-hover/folder-item:flex',
+                        'relative mr-1 group-hover/folder-item:flex',
+                        additionalItemData?.isSidePanelItem
+                          ? 'size-[24px] items-center justify-center'
+                          : 'size-[18px]',
                         isSelected ? 'flex' : 'hidden',
                       )}
                       data-item-checkbox
                     >
                       <input
-                        className="checkbox peer size-[18px] bg-layer-3"
+                        className={classNames(
+                          'checkbox peer size-[18px] bg-layer-3',
+                          additionalItemData?.isSidePanelItem && 'mr-0',
+                        )}
                         type="checkbox"
                         checked={isSelected}
                         onChange={handleToggleFolder}
@@ -994,11 +1002,14 @@ const Folder = <T extends ConversationInfo | PromptInfo | DialFile>({
                 {canSelectFolders &&
                   ((!isExternal &&
                     !loadingFolderIds.includes(currentFolder.id)) ||
-                    !isSidePanelFolder ||
+                    !additionalItemData?.isSidePanelItem ||
                     isSelectAlwaysVisible) && (
                     <div
                       className={classNames(
-                        'relative mr-1 size-[18px] group-hover/folder-item:flex',
+                        'relative mr-1 group-hover/folder-item:flex',
+                        additionalItemData?.isSidePanelItem
+                          ? 'size-[24px] items-center justify-center'
+                          : 'size-[18px]',
                         isSelected || isPartialSelected || isSelectAlwaysVisible
                           ? 'flex'
                           : 'hidden',
@@ -1006,7 +1017,10 @@ const Folder = <T extends ConversationInfo | PromptInfo | DialFile>({
                       data-item-checkbox
                     >
                       <input
-                        className="checkbox peer size-[18px] bg-layer-3"
+                        className={classNames(
+                          'checkbox peer size-[18px] bg-layer-3',
+                          additionalItemData?.isSidePanelItem && 'mr-0',
+                        )}
                         type="checkbox"
                         checked={isSelected}
                         onChange={handleToggleFolder}
@@ -1040,7 +1054,7 @@ const Folder = <T extends ConversationInfo | PromptInfo | DialFile>({
                     isHighlighted={isContextMenu}
                     featureType={featureType}
                     containerClassName={
-                      (!isExternal || !isSidePanelFolder) &&
+                      (!isExternal || !additionalItemData?.isSidePanelItem) &&
                       canSelectFolders &&
                       !isSelectAlwaysVisible
                         ? 'group-hover/folder-item:hidden'
@@ -1048,11 +1062,15 @@ const Folder = <T extends ConversationInfo | PromptInfo | DialFile>({
                     }
                   >
                     {hasResourcesToReview &&
-                      isSidePanelFolder &&
+                      additionalItemData?.isSidePanelItem &&
                       additionalItemData?.publicationUrl && (
                         <ReviewDot className="group-hover/folder-item:bg-accent-primary-alpha" />
                       )}
-                    <IconFolder size={18} className="mr-1 text-secondary" />
+                    <IconFolder
+                      strokeWidth={folderIconStrokeWidth}
+                      size={iconSize}
+                      className="mr-1 text-secondary"
+                    />
                   </ShareIcon>
                 )}
               </>
@@ -1137,7 +1155,6 @@ const Folder = <T extends ConversationInfo | PromptInfo | DialFile>({
                     onUpload={onFileUpload && onUpload}
                     isOpen={isContextMenu}
                     isEmpty={!hasChildItemOnAnyLevel}
-                    isSidePanelFolder={isSidePanelFolder}
                     onSelect={onSelectFolder && onSelect}
                     additionalItemData={additionalItemData}
                   />
@@ -1156,12 +1173,7 @@ const Folder = <T extends ConversationInfo | PromptInfo | DialFile>({
               }}
               dataQA="confirm-edit"
             >
-              <CheckIcon
-                width={18}
-                height={18}
-                size={18}
-                className="hover:text-accent-primary"
-              />
+              <IconCheck size={18} className="hover:text-accent-primary" />
             </SidebarActionButton>
             <SidebarActionButton
               handleClick={(e) => {
@@ -1171,13 +1183,7 @@ const Folder = <T extends ConversationInfo | PromptInfo | DialFile>({
               }}
               dataQA="cancel-edit"
             >
-              <IconX
-                width={18}
-                height={18}
-                size={18}
-                className="hover:text-accent-primary"
-                strokeWidth="2"
-              />
+              <IconX size={18} className="hover:text-accent-primary" />
             </SidebarActionButton>
           </div>
         )}
@@ -1222,7 +1228,6 @@ const Folder = <T extends ConversationInfo | PromptInfo | DialFile>({
                     canSelectFolders={canSelectFolders}
                     isSelectAlwaysVisible={isSelectAlwaysVisible}
                     showTooltip={showTooltip}
-                    isSidePanelFolder={isSidePanelFolder}
                     onSelectFolder={onSelectFolder}
                   />
                 </Fragment>
diff --git a/apps/chat/src/components/Promptbar/Promptbar.tsx b/apps/chat/src/components/Promptbar/Promptbar.tsx
index 270c1046ba..3877d0004c 100644
--- a/apps/chat/src/components/Promptbar/Promptbar.tsx
+++ b/apps/chat/src/components/Promptbar/Promptbar.tsx
@@ -67,7 +67,7 @@ const PromptActionsBlock = () => {
   return (
     <div className="flex px-2 py-1">
       <button
-        className="flex shrink-0 grow cursor-pointer select-none items-center gap-3 rounded px-3 py-2 transition-colors duration-200 hover:bg-accent-primary-alpha disabled:cursor-not-allowed hover:disabled:bg-transparent"
+        className="flex shrink-0 grow cursor-pointer select-none items-center gap-3 rounded px-3 py-[5px] transition-colors duration-200 hover:bg-accent-primary-alpha disabled:cursor-not-allowed hover:disabled:bg-transparent"
         onClick={() => {
           dispatch(PromptsActions.setIsNewPromptCreating(true));
           dispatch(PromptsActions.resetSearch());
@@ -77,7 +77,7 @@ const PromptActionsBlock = () => {
         disabled={isNewPromptCreating}
         data-qa="new-entity"
       >
-        <PlusIcon className="text-secondary" width={18} height={18} />
+        <PlusIcon className="text-secondary" width={24} height={24} />
         {t('New prompt')}
       </button>
       {showModal && !isModalPreviewMode && (
diff --git a/apps/chat/src/components/Promptbar/components/Prompt.tsx b/apps/chat/src/components/Promptbar/components/Prompt.tsx
index 0e10ceea65..c17eb365b7 100644
--- a/apps/chat/src/components/Promptbar/components/Prompt.tsx
+++ b/apps/chat/src/components/Promptbar/components/Prompt.tsx
@@ -364,16 +364,20 @@ export const PromptComponent = ({
     PromptsActions.setChosenPrompts({ ids: [prompt.id] });
   }, [prompt.id]);
 
+  const iconSize = additionalItemData?.isSidePanelItem ? 24 : 18;
+  const strokeWidth = additionalItemData?.isSidePanelItem ? 1.5 : 2;
+
   return (
     <>
       <button
         className={classNames(
-          'group/prompt-item relative flex size-full h-[30px] shrink-0 cursor-pointer items-center rounded border-l-2 pr-3 hover:bg-accent-primary-alpha disabled:cursor-not-allowed',
+          'group relative flex size-full shrink-0 cursor-pointer items-center rounded border-l-2 pr-3 hover:bg-accent-primary-alpha disabled:cursor-not-allowed',
           !isSelectMode && '[&:not(:disabled)]:hover:pr-9',
           !isSelectMode && isHighlited
             ? 'border-l-accent-primary '
             : 'border-l-transparent',
           isHighlited && 'bg-accent-primary-alpha',
+          additionalItemData?.isSidePanelItem ? 'h-[34px]' : 'h-[30px]',
         )}
         onClick={() => {
           if (isSelectMode && !isExternal) {
@@ -399,15 +403,19 @@ export const PromptComponent = ({
         >
           <div
             className={classNames(
-              'relative size-[18px]',
-              isSelectMode &&
-                !isExternal &&
-                'shrink-0 group-hover/prompt-item:flex',
+              'relative',
+              additionalItemData?.isSidePanelItem
+                ? 'size-[24px] items-center justify-center'
+                : 'size-[18px]',
+              isSelectMode && !isExternal && 'shrink-0 group-hover:flex',
               isSelectMode && isChosen && !isExternal ? 'flex' : 'hidden',
             )}
           >
             <input
-              className="checkbox peer size-[18px] bg-layer-3"
+              className={classNames(
+                'checkbox peer size-[18px] bg-layer-3',
+                additionalItemData?.isSidePanelItem && 'mr-0',
+              )}
               type="checkbox"
               checked={isChosen}
               onChange={handleToggle}
@@ -423,14 +431,14 @@ export const PromptComponent = ({
             isHighlighted={isHighlited}
             featureType={FeatureType.Prompt}
             containerClassName={classNames(
-              isSelectMode && !isExternal && 'group-hover/prompt-item:hidden',
+              isSelectMode && !isExternal && 'group-hover:hidden',
               isChosen && !isExternal && 'hidden',
             )}
           >
             {resourceToReview && !resourceToReview.reviewed && (
               <ReviewDot
                 className={classNames(
-                  'group-hover/prompt-item:bg-accent-tertiary-alpha',
+                  'group-hover:bg-accent-tertiary-alpha',
                   (selectedPromptId === prompt.id || isContextMenu) &&
                     resourceToReview.publicationUrl ===
                       selectedPublicationUrl &&
@@ -439,7 +447,11 @@ export const PromptComponent = ({
                 )}
               />
             )}
-            <IconBulb size={18} className="text-secondary" />
+            <IconBulb
+              size={iconSize}
+              strokeWidth={strokeWidth}
+              className="text-secondary"
+            />
           </ShareIcon>
 
           <div
@@ -469,7 +481,7 @@ export const PromptComponent = ({
             ref={refs.setFloating}
             {...getFloatingProps()}
             className={classNames(
-              'absolute right-3 z-50 flex justify-end group-hover/prompt-item:visible',
+              'absolute right-3 z-50 flex justify-end group-hover:visible',
               isSelected ? 'visible' : 'invisible',
             )}
             onClick={stopBubbling}
diff --git a/apps/chat/src/components/Promptbar/components/PromptFolders.tsx b/apps/chat/src/components/Promptbar/components/PromptFolders.tsx
index e96d984f23..8350dfbf16 100644
--- a/apps/chat/src/components/Promptbar/components/PromptFolders.tsx
+++ b/apps/chat/src/components/Promptbar/components/PromptFolders.tsx
@@ -95,13 +95,20 @@ const PromptFolderTemplate = ({
   const { fullyChosenFolderIds, partialChosenFolderIds } = useAppSelector(
     (state) => PromptsSelectors.selectChosenFolderIds(state, prompts),
   );
-
   const emptyFoldersIds = useAppSelector(PromptsSelectors.selectEmptyFolderIds);
-
   const isFolderEmpty = useAppSelector((state) =>
     PromptsSelectors.selectIsFolderEmpty(state, folder.id),
   );
 
+  const additionalFolderData = useMemo(
+    () => ({
+      selectedFolderIds: fullyChosenFolderIds,
+      partialSelectedFolderIds: partialChosenFolderIds,
+      isSidePanelItem: true,
+    }),
+    [fullyChosenFolderIds, partialChosenFolderIds],
+  );
+
   const handleDrop = useCallback(
     (e: DragEvent, folder: FolderInterface) => {
       if (e.dataTransfer) {
@@ -263,10 +270,7 @@ const PromptFolderTemplate = ({
         onClickFolder={handleFolderClick}
         featureType={FeatureType.Prompt}
         canSelectFolders={isSelectMode}
-        additionalItemData={{
-          selectedFolderIds: fullyChosenFolderIds,
-          partialSelectedFolderIds: partialChosenFolderIds,
-        }}
+        additionalItemData={additionalFolderData}
         onSelectFolder={handleFolderSelect}
       />
       {isLast && (
@@ -315,6 +319,13 @@ export const PromptSection = ({
     FeatureType.Prompt,
   );
 
+  const additionalPromptData = useMemo(
+    () => ({
+      isSidePanelItem: true,
+    }),
+    [],
+  );
+
   const rootPrompts = useMemo(() => sortByName(prompts), [prompts]);
 
   const folderTemplateFilters = useMemo(
@@ -375,7 +386,11 @@ export const PromptSection = ({
       {displayRootFiles && (
         <div className="flex flex-col gap-1">
           {prompts.map((item) => (
-            <PromptComponent key={item.id} item={item} />
+            <PromptComponent
+              additionalItemData={additionalPromptData}
+              key={item.id}
+              item={item}
+            />
           ))}
         </div>
       )}
diff --git a/apps/chat/src/components/Promptbar/components/Prompts.tsx b/apps/chat/src/components/Promptbar/components/Prompts.tsx
index 193611ec4e..d21954ed81 100644
--- a/apps/chat/src/components/Promptbar/components/Prompts.tsx
+++ b/apps/chat/src/components/Promptbar/components/Prompts.tsx
@@ -24,6 +24,13 @@ export const Prompts: FC<Props> = ({ prompts }) => {
     FeatureType.Prompt,
   );
 
+  const additionalPromptData = useMemo(
+    () => ({
+      isSidePanelItem: true,
+    }),
+    [],
+  );
+
   const promptsToDisplay = useMemo(() => {
     const promptRootId = getPromptRootId();
     return prompts
@@ -47,7 +54,11 @@ export const Prompts: FC<Props> = ({ prompts }) => {
         data-qa="prompts"
       >
         {promptsToDisplay.map((prompt) => (
-          <PromptComponent key={prompt.id} item={prompt} />
+          <PromptComponent
+            key={prompt.id}
+            item={prompt}
+            additionalItemData={additionalPromptData}
+          />
         ))}
       </div>
     </CollapsibleSection>
diff --git a/apps/chat/src/components/Search/Search.tsx b/apps/chat/src/components/Search/Search.tsx
index 2512ed419b..d2cd79313c 100644
--- a/apps/chat/src/components/Search/Search.tsx
+++ b/apps/chat/src/components/Search/Search.tsx
@@ -37,14 +37,11 @@ export default function Search({
 
   return (
     <div className="relative flex items-center py-1 pl-5 pr-2" data-qa="search">
-      <IconSearch
-        className="absolute left-5 text-secondary"
-        size={18}
-        width={18}
-        height={18}
-      />
+      <div className="absolute left-5 flex size-6 shrink-0 items-center justify-center">
+        <IconSearch className="text-secondary" size={18} />
+      </div>
       <input
-        className="w-full bg-transparent px-8 py-2 text-[14px] leading-3 outline-none placeholder:text-secondary"
+        className="w-full bg-transparent py-2 pl-9 pr-8 text-[14px] leading-3 outline-none placeholder:text-secondary"
         type="text"
         placeholder={t(placeholder) || ''}
         value={searchTerm}
diff --git a/apps/chat/src/types/common.ts b/apps/chat/src/types/common.ts
index 2dded896ff..bdaafd0584 100644
--- a/apps/chat/src/types/common.ts
+++ b/apps/chat/src/types/common.ts
@@ -118,6 +118,7 @@ export interface AdditionalItemData {
   selectedFilesIds?: string[];
   selectedFolderIds?: string[];
   partialSelectedFolderIds?: string[];
+  isSidePanelItem?: boolean;
   mappedActions?: MappedReplaceActions;
 }