diff --git a/packages/ui/src/ui-component/table/DocumentStoreTable.jsx b/packages/ui/src/ui-component/table/DocumentStoreTable.jsx
index a476ce5acb6..09ec419d614 100644
--- a/packages/ui/src/ui-component/table/DocumentStoreTable.jsx
+++ b/packages/ui/src/ui-component/table/DocumentStoreTable.jsx
@@ -40,7 +40,7 @@ const StyledTableRow = styled(TableRow)(() => ({
     }
 }))
 
-export const DocumentStoreTable = ({ data, isLoading, onRowClick, images, showActions, onActionMenuClick }) => {
+export const DocumentStoreTable = ({ data, isLoading, onRowClick, images, showActions, onActionMenuClick, actionButtonSx }) => {
     const theme = useTheme()
     const customization = useSelector((state) => state.customization)
 
@@ -159,12 +159,12 @@ export const DocumentStoreTable = ({ data, isLoading, onRowClick, images, showAc
                             </>
                         ) : (
                             <>
-                                {sortedData.map((row, index) => {
+                                {sortedData.map((row) => {
                                     return (
                                         <StyledTableRow
                                             onClick={() => onRowClick(row)}
                                             hover
-                                            key={index}
+                                            key={row.id}
                                             sx={{ cursor: 'pointer', '&:last-child td, &:last-child th': { border: 0 } }}
                                         >
                                             <StyledTableCell>
@@ -255,14 +255,7 @@ export const DocumentStoreTable = ({ data, isLoading, onRowClick, images, showAc
                                                     <IconButton
                                                         size='small'
                                                         aria-label='Document store options'
-                                                        sx={{
-                                                            p: 0.5,
-                                                            backgroundColor: theme.palette.background.paper,
-                                                            border: `1px solid ${theme.palette.grey[900]}25`,
-                                                            '&:hover': {
-                                                                backgroundColor: theme.palette.action.hover
-                                                            }
-                                                        }}
+                                                        sx={actionButtonSx}
                                                         onClick={(event) => {
                                                             event.stopPropagation()
                                                             onActionMenuClick(event, row)
@@ -290,7 +283,8 @@ DocumentStoreTable.propTypes = {
     images: PropTypes.object,
     onRowClick: PropTypes.func,
     showActions: PropTypes.bool,
-    onActionMenuClick: PropTypes.func
+    onActionMenuClick: PropTypes.func,
+    actionButtonSx: PropTypes.object
 }
 
 DocumentStoreTable.displayName = 'DocumentStoreTable'
diff --git a/packages/ui/src/views/docstore/index.jsx b/packages/ui/src/views/docstore/index.jsx
index 738f3338429..bf593d0587b 100644
--- a/packages/ui/src/views/docstore/index.jsx
+++ b/packages/ui/src/views/docstore/index.jsx
@@ -35,6 +35,16 @@ import { closeSnackbar as closeSnackbarAction, enqueueSnackbar as enqueueSnackba
 import useNotifier from '@/utils/useNotifier'
 
 // ==============================|| DOCUMENTS ||============================== //
+const getDocStoreActionButtonSx = (theme) => ({
+    p: 0.5,
+    color: theme.palette.text.primary,
+    backgroundColor: theme.palette.mode === 'dark' ? theme.palette.background.default : theme.palette.background.paper,
+    border: `1px solid ${theme.palette.divider}`,
+    '&:hover': {
+        backgroundColor: theme.palette.action.hover,
+        borderColor: theme.palette.text.secondary
+    }
+})
 
 const Documents = () => {
     const theme = useTheme()
@@ -88,14 +98,9 @@ const Documents = () => {
             return responseData
         }
 
-        if (responseData && typeof responseData === 'object') {
-            if (typeof responseData.message === 'string' && responseData.message.trim()) {
-                return responseData.message
-            }
-
-            if (typeof responseData.error === 'string' && responseData.error.trim()) {
-                return responseData.error
-            }
+        const responseMessage = responseData && typeof responseData === 'object' ? responseData.message || responseData.error : undefined
+        if (typeof responseMessage === 'string' && responseMessage.trim()) {
+            return responseMessage
         }
 
         if (typeof error?.message === 'string' && error.message.trim()) {
@@ -387,8 +392,8 @@ const Documents = () => {
                         <React.Fragment>
                             {!view || view === 'card' ? (
                                 <Box display='grid' gridTemplateColumns='repeat(3, 1fr)' gap={gridSpacing}>
-                                    {docStores?.filter(filterDocStores).map((data, index) => (
-                                        <Box key={index} sx={{ position: 'relative' }}>
+                                    {docStores?.filter(filterDocStores).map((data) => (
+                                        <Box key={data.id} sx={{ position: 'relative' }}>
                                             <DocumentStoreCard
                                                 images={images[data.id]}
                                                 data={data}
@@ -406,12 +411,7 @@ const Documents = () => {
                                                         zIndex: 2,
                                                         width: 30,
                                                         height: 30,
-                                                        p: 0.5,
-                                                        backgroundColor: theme.palette.background.paper,
-                                                        border: `1px solid ${theme.palette.grey[900]}25`,
-                                                        '&:hover': {
-                                                            backgroundColor: theme.palette.action.hover
-                                                        },
+                                                        ...getDocStoreActionButtonSx(theme),
                                                         [theme.breakpoints.down('sm')]: {
                                                             top: 8,
                                                             right: 8,
@@ -435,6 +435,7 @@ const Documents = () => {
                                     onRowClick={(row) => goToDocumentStore(row.id)}
                                     showActions={canManageDocumentStore}
                                     onActionMenuClick={handleActionMenuOpen}
+                                    actionButtonSx={getDocStoreActionButtonSx(theme)}
                                 />
                             )}
                             {/* Pagination and Page Size Controls */}