diff --git a/backend/dataall/modules/shares_base/api/types.py b/backend/dataall/modules/shares_base/api/types.py
index 07c588329..5d1aa966c 100644
--- a/backend/dataall/modules/shares_base/api/types.py
+++ b/backend/dataall/modules/shares_base/api/types.py
@@ -207,6 +207,8 @@
         gql.Field(name='environmentUri', type=gql.NonNullableType(gql.String)),
         gql.Field(name='targetEnvironmentUri', type=gql.NonNullableType(gql.String)),
         gql.Field(name='principalId', type=gql.NonNullableType(gql.String)),
+        gql.Field(name='principalName', type=gql.String),
+        gql.Field(name='principalType', type=gql.String),
         gql.Field(name='environmentName', type=gql.NonNullableType(gql.String)),
         gql.Field(name='organizationUri', type=gql.NonNullableType(gql.String)),
         gql.Field(name='organizationName', type=gql.NonNullableType(gql.String)),
diff --git a/backend/dataall/modules/shares_base/db/share_object_repositories.py b/backend/dataall/modules/shares_base/db/share_object_repositories.py
index 3faa069ac..0ca9ba2b7 100644
--- a/backend/dataall/modules/shares_base/db/share_object_repositories.py
+++ b/backend/dataall/modules/shares_base/db/share_object_repositories.py
@@ -306,6 +306,7 @@ def paginate_shared_datasets(session, env_uri, data, share_item_shared_states):
                 Environment.name.label('environmentName'),
                 ShareObject.created.label('created'),
                 ShareObject.principalId.label('principalId'),
+                ShareObject.principalName.label('principalName'),
                 ShareObject.principalType.label('principalType'),
                 ShareObject.environmentUri.label('targetEnvironmentUri'),
                 ShareObjectItem.itemType.label('itemType'),
diff --git a/frontend/src/modules/Environments/components/EnvironmentSharedDatasets.js b/frontend/src/modules/Environments/components/EnvironmentSharedDatasets.js
index a99658f0a..18a3243dc 100644
--- a/frontend/src/modules/Environments/components/EnvironmentSharedDatasets.js
+++ b/frontend/src/modules/Environments/components/EnvironmentSharedDatasets.js
@@ -1,23 +1,25 @@
 import {
   Box,
+  Button,
   Card,
   CardHeader,
   Divider,
-  IconButton,
   InputAdornment,
   Table,
   TableBody,
   TableCell,
   TableHead,
   TableRow,
-  TextField
+  TextField,
+  Tooltip
 } from '@mui/material';
 import CircularProgress from '@mui/material/CircularProgress';
+import PeopleIcon from '@mui/icons-material/People';
+import VpnKeyIcon from '@mui/icons-material/VpnKey';
 import PropTypes from 'prop-types';
 import { useCallback, useEffect, useState } from 'react';
 import { useNavigate } from 'react-router';
 import {
-  ArrowRightIcon,
   Defaults,
   Pager,
   RefreshTableMenu,
@@ -124,7 +126,7 @@ export const EnvironmentSharedDatasets = ({ environment }) => {
                 <TableCell>Name</TableCell>
                 <TableCell>Dataset</TableCell>
                 <TableCell>Environment</TableCell>
-                <TableCell>Shared with Team</TableCell>
+                <TableCell>Shared With</TableCell>
                 <TableCell>Actions</TableCell>
               </TableRow>
             </TableHead>
@@ -139,15 +141,83 @@ export const EnvironmentSharedDatasets = ({ environment }) => {
                       <TableCell>{item.itemName}</TableCell>
                       <TableCell>{item.datasetName}</TableCell>
                       <TableCell>{item.environmentName}</TableCell>
-                      <TableCell>{item.principalId}</TableCell>
                       <TableCell>
-                        <IconButton
-                          onClick={() => {
-                            navigate(`/console/s3-datasets/${item.datasetUri}`);
+                        <Box
+                          sx={{
+                            display: 'flex',
+                            alignItems: 'center',
+                            gap: 0.5
                           }}
                         >
-                          <ArrowRightIcon fontSize="small" />
-                        </IconButton>
+                          <Tooltip
+                            title={
+                              item.principalType === 'Group'
+                                ? 'Team'
+                                : 'Consumption Role'
+                            }
+                          >
+                            {item.principalType === 'Group' ? (
+                              <PeopleIcon fontSize="small" color="primary" />
+                            ) : (
+                              <VpnKeyIcon fontSize="small" color="secondary" />
+                            )}
+                          </Tooltip>
+                          <Tooltip
+                            title={
+                              item.principalType !== 'Group' &&
+                              item.principalName &&
+                              item.principalId
+                                ? item.principalId
+                                : ''
+                            }
+                            componentsProps={{
+                              tooltip: {
+                                sx: {
+                                  maxWidth: 'none'
+                                }
+                              }
+                            }}
+                          >
+                            <span>
+                              {item.principalName || item.principalId}
+                            </span>
+                          </Tooltip>
+                        </Box>
+                      </TableCell>
+                      <TableCell>
+                        <Button
+                          color="primary"
+                          size="small"
+                          variant="outlined"
+                          component="a"
+                          href={`/console/shares/${item.shareUri}`}
+                          onClick={(e) => {
+                            if (!e.ctrlKey && !e.metaKey) {
+                              e.preventDefault();
+                              navigate(`/console/shares/${item.shareUri}`);
+                            }
+                          }}
+                          sx={{ mr: 1 }}
+                        >
+                          View Share
+                        </Button>
+                        <Button
+                          color="primary"
+                          size="small"
+                          variant="outlined"
+                          component="a"
+                          href={`/console/s3-datasets/${item.datasetUri}`}
+                          onClick={(e) => {
+                            if (!e.ctrlKey && !e.metaKey) {
+                              e.preventDefault();
+                              navigate(
+                                `/console/s3-datasets/${item.datasetUri}`
+                              );
+                            }
+                          }}
+                        >
+                          View Dataset
+                        </Button>
                       </TableCell>
                     </TableRow>
                   ))
diff --git a/frontend/src/modules/Environments/services/searchEnvironmentDataItems.js b/frontend/src/modules/Environments/services/searchEnvironmentDataItems.js
index 6134f50c3..86b1a1fea 100644
--- a/frontend/src/modules/Environments/services/searchEnvironmentDataItems.js
+++ b/frontend/src/modules/Environments/services/searchEnvironmentDataItems.js
@@ -31,6 +31,8 @@ export const searchEnvironmentDataItems = ({ filter, environmentUri }) => ({
           itemName
           created
           principalId
+          principalName
+          principalType
         }
       }
     }
diff --git a/tests/modules/s3_datasets_shares/test_share.py b/tests/modules/s3_datasets_shares/test_share.py
index 9b7aeff8e..279e27e1b 100644
--- a/tests/modules/s3_datasets_shares/test_share.py
+++ b/tests/modules/s3_datasets_shares/test_share.py
@@ -1127,6 +1127,8 @@ def list_datasets_published_in_environment(client, user, group, environmentUri):
                     itemName
                     created
                     principalId
+                    principalName
+                    principalType
                 }
             }
         }