diff --git a/ServiceHost/Areas/AdminNew/Pages/Company/Task/Index.cshtml b/ServiceHost/Areas/AdminNew/Pages/Company/Task/Index.cshtml
index 05090c4d..97b9b680 100644
--- a/ServiceHost/Areas/AdminNew/Pages/Company/Task/Index.cshtml
+++ b/ServiceHost/Areas/AdminNew/Pages/Company/Task/Index.cshtml
@@ -23,7 +23,7 @@
 	<!-- sweet alerts -->
 	@* <link href="~/AdminTheme/assets/sweet-alert/sweet-alert.min.css" rel="stylesheet"> *@
 	<link href="~/assetsadminnew/libs/sweetalert2/sweetalert2.min.css" rel="stylesheet" />
-	<link href="~/assetsadminnew/tasks/css/index.css" rel="stylesheet" />
+	<link href="~/assetsadminnew/tasks/css/index.css?ver=@adminVersion" rel="stylesheet" />
 }
 
 
diff --git a/ServiceHost/Areas/AdminNew/Pages/Company/Ticket/Index.cshtml b/ServiceHost/Areas/AdminNew/Pages/Company/Ticket/Index.cshtml
index f82a256d..6b2ca62d 100644
--- a/ServiceHost/Areas/AdminNew/Pages/Company/Ticket/Index.cshtml
+++ b/ServiceHost/Areas/AdminNew/Pages/Company/Ticket/Index.cshtml
@@ -24,7 +24,7 @@
     <link href="~/AssetsClient/css/filter-search.css?ver=@adminVersion" rel="stylesheet"/>
 
 	<!-- sweet alerts -->
-	<link href="~/AdminTheme/assets/sweet-alert/sweet-alert.min.css" rel="stylesheet">
+	<link href="~/assetsadminnew/libs/sweetalert2/sweetalert2.min.css" rel="stylesheet" />
 
     <style>
 
@@ -394,7 +394,7 @@
 
 @section Script {
 	<script src="~/assetsclient/js/site.js?ver=@adminVersion"></script>
-    <script src="~/AdminTheme/assets/sweet-alert/sweet-alert.min.js"></script>
+	<script src="~/assetsadminnew/libs/sweetalert2/sweetalert2.all.min.js"></script>
 
 	<script>
 		var antiForgeryToken = $(`@Html.AntiForgeryToken()`).val();
diff --git a/ServiceHost/ServiceHost.csproj b/ServiceHost/ServiceHost.csproj
index 4a709299..9d54ed31 100644
--- a/ServiceHost/ServiceHost.csproj
+++ b/ServiceHost/ServiceHost.csproj
@@ -424,6 +424,7 @@
     <None Include="wwwroot\AssetsAdminNew\Tasks\js\OperationRequestModal.js" />
     <None Include="wwwroot\AssetsAdminNew\Tasks\js\OperationRequestModalOld.js" />
     <None Include="wwwroot\AssetsAdminNew\Ticket\js\detailTicketModal.js" />
+    <None Include="wwwroot\AssetsAdminNew\Ticket\js\Index.js" />
     <None Include="wwwroot\AssetsAdmin\fonts\BKoodakBold.afm" />
     <None Include="wwwroot\AssetsAdmin\fonts\BKoodakBold.svg" />
     <None Include="wwwroot\AssetsAdmin\fonts\Estedad\Estedad[wght,kshd].woff2" />
diff --git a/ServiceHost/wwwroot/AssetsAdminNew/Tasks/css/DetailModal.css b/ServiceHost/wwwroot/AssetsAdminNew/Tasks/css/DetailModal.css
index 8b55fc28..3df2a45b 100644
--- a/ServiceHost/wwwroot/AssetsAdminNew/Tasks/css/DetailModal.css
+++ b/ServiceHost/wwwroot/AssetsAdminNew/Tasks/css/DetailModal.css
@@ -733,6 +733,11 @@
     .mainChat {
         height: 220px;
     }
+
+    .mainChat.expanded {
+        height: 130px;
+    }
+
     .actionBtnsection .actionBtn {
         font-size: 10px;
         white-space: nowrap;
@@ -783,7 +788,10 @@
 
     .mainChat {
         height: 100%;
+    }
 
+    .mainChat.expanded {
+        height: 100%;
     }
 
     .assigns_section .btnAssignList {
diff --git a/ServiceHost/wwwroot/AssetsAdminNew/Tasks/css/Index.css b/ServiceHost/wwwroot/AssetsAdminNew/Tasks/css/Index.css
index 664b8c2a..c43e288f 100644
--- a/ServiceHost/wwwroot/AssetsAdminNew/Tasks/css/Index.css
+++ b/ServiceHost/wwwroot/AssetsAdminNew/Tasks/css/Index.css
@@ -1,6 +1,4 @@
-
-
-.errored {
+.errored {
     animation: shake 300ms;
     color: #eb3434 !important;
     background-color: #fef2f2 !important;
@@ -465,7 +463,7 @@
         }
 
         .ellipsed {
-            width: 70%;
+            width: 45%;
         }
 
         .Rtable .Rtable-row .Rtable-cell .Rtable-cell--content > span {
diff --git a/ServiceHost/wwwroot/AssetsAdminNew/Ticket/css/ticket-message.css b/ServiceHost/wwwroot/AssetsAdminNew/Ticket/css/ticket-message.css
index 0bbdd81d..0bab8d5d 100644
--- a/ServiceHost/wwwroot/AssetsAdminNew/Ticket/css/ticket-message.css
+++ b/ServiceHost/wwwroot/AssetsAdminNew/Ticket/css/ticket-message.css
@@ -117,12 +117,15 @@
     margin: 8px 0 0 0;
 }
 
-.ticket-message-sender .header-message{
+.ticket-message-sender .header-message {
     display: flex;
     justify-content: space-between;
     align-items: center;
     font-size: 11px;
+    padding: 0;
+    margin: 0 0 3px 0;
 }
+
 .ticket-message-sender .footer-message-attachment{
     display: flex;
     justify-content: end;
@@ -481,35 +484,35 @@
 /* Galley */
 
 .btn-ticket-action-edit {
-    width: 50px;
+    width: 50%;
     padding: 2px 5px;
     background: #60A5FA;
     color: #fff;
 }
 
 .btn-ticket-action-accept {
-    width: 50px;
+    width: 50%;
     padding: 2px 5px;
     background: #84CC16;
     color: #fff;
 }
 
 .btn-ticket-action-reject {
-    width: 50px;
+    width: 50%;
     padding: 2px 5px;
     background: #EF4444;
     color: #fff;
 }
 
 .btn-edit-dec-send {
-    width: 75px;
+    width: 50%;
     padding: 2px 5px;
     background: #84CC16;
     color: #fff;
 }
 
 .btn-edit-dec-cancel {
-    width: 75px;
+    width: 50%;
     padding: 2px 5px;
     background: #1E293B;
     color: #fff;
diff --git a/ServiceHost/wwwroot/AssetsAdminNew/Ticket/js/detailTicketModal.js b/ServiceHost/wwwroot/AssetsAdminNew/Ticket/js/detailTicketModal.js
index 73dee625..25dc67ac 100644
--- a/ServiceHost/wwwroot/AssetsAdminNew/Ticket/js/detailTicketModal.js
+++ b/ServiceHost/wwwroot/AssetsAdminNew/Ticket/js/detailTicketModal.js
@@ -271,7 +271,6 @@ function loadTicketsMore(status) {
 	}
 }
 
-
 var submition = false;
 function submitionAjax() {
     $.ajax({
@@ -575,13 +574,13 @@ function loadMessages()   {
 					});
 
 					html += `</div>
-					<div class="d-flex align-items-center justify-content-between p-0">
+					<div class="d-block p-0">
 								<div class="createdDate">${itemResponse.creationDateStr}</div>`;
 
          
                         if (submition) {
                             if (itemResponse.isActive === "false") {
-                                html += `<div class="buttomActionTickets">
+								html += `<div class="buttomActionTickets d-flex align-items-center justify-content-end gap-1">
 							    <button class="btn-ticket-action-edit" onclick="showEditPendingAdminResponse(${itemResponse.adminResponseId})">ویرایش</button>
 							    <button class="btn-ticket-action-accept" onclick="acceptPendingAdminResponse(${itemResponse.adminResponseId})">تایید</button>
 							    <button class="btn-ticket-action-reject" onclick="rejectPendingAdminResponse(${itemResponse.adminResponseId})">رد</button>