diff --git a/src/System Application/App/Edit in Excel/permissions/EditInExcelRead.PermissionSet.al b/src/System Application/App/Edit in Excel/permissions/EditInExcelRead.PermissionSet.al
index 6cb748ac36..9b2a06eb99 100644
--- a/src/System Application/App/Edit in Excel/permissions/EditInExcelRead.PermissionSet.al	
+++ b/src/System Application/App/Edit in Excel/permissions/EditInExcelRead.PermissionSet.al	
@@ -14,5 +14,5 @@ permissionset 1481 "Edit in Excel - Read"
 
     IncludedPermissionSets = "Edit in Excel - Objects";
 
-    Permissions = tabledata "Media Resources" = r;
+    Permissions = tabledata "Tenant Media Set" = r;
 }
diff --git a/src/System Application/App/Edit in Excel/src/ExcelCentralizedDeplWizard.Page.al b/src/System Application/App/Edit in Excel/src/ExcelCentralizedDeplWizard.Page.al
index b847499057..5da82b8ec4 100644
--- a/src/System Application/App/Edit in Excel/src/ExcelCentralizedDeplWizard.Page.al	
+++ b/src/System Application/App/Edit in Excel/src/ExcelCentralizedDeplWizard.Page.al	
@@ -21,7 +21,7 @@ page 1480 "Excel Centralized Depl. Wizard"
     SourceTable = "Edit in Excel Settings";
     Extensible = false;
     AccessByPermission = tabledata "Edit in Excel Settings" = M;
-    Permissions = tabledata "Media Resources" = r;
+    Permissions = tabledata "Tenant Media Set" = r;
     HelpLink = 'https://go.microsoft.com/fwlink/?linkid=2221526';
 
     layout
diff --git a/src/System Application/App/Email/permissions/EmailRead.PermissionSet.al b/src/System Application/App/Email/permissions/EmailRead.PermissionSet.al
index 146967e63c..882d618b3c 100644
--- a/src/System Application/App/Email/permissions/EmailRead.PermissionSet.al	
+++ b/src/System Application/App/Email/permissions/EmailRead.PermissionSet.al	
@@ -33,7 +33,7 @@ permissionset 8900 "Email - Read"
                   tabledata "Email View Policy" = r,
                   tabledata Field = r,
                   tabledata Media = r, // Email Account Wizard requires this
-                  tabledata "Media Resources" = r,
+                  tabledata "Tenant Media Set" = r,
                   tabledata "Sent Email" = r,
                   tabledata "Tenant Media" = r,
                   tabledata User = R;
diff --git a/src/System Application/App/Email/src/Account/EmailAccountWizard.Page.al b/src/System Application/App/Email/src/Account/EmailAccountWizard.Page.al
index f75ab27668..7703735f23 100644
--- a/src/System Application/App/Email/src/Account/EmailAccountWizard.Page.al	
+++ b/src/System Application/App/Email/src/Account/EmailAccountWizard.Page.al	
@@ -27,8 +27,7 @@ page 8886 "Email Account Wizard"
     Editable = true;
     ShowFilter = false;
     LinksAllowed = false;
-    Permissions = tabledata Media = r,
-                  tabledata "Media Resources" = r,
+    Permissions = tabledata "Tenant Media Set" = r,
                   tabledata "Email Rate Limit" = imd;
 
     layout
diff --git a/src/System Application/App/Guided Experience/permissions/GuidedExperienceEdit.PermissionSet.al b/src/System Application/App/Guided Experience/permissions/GuidedExperienceEdit.PermissionSet.al
index 313b69dabd..01895d3a48 100644
--- a/src/System Application/App/Guided Experience/permissions/GuidedExperienceEdit.PermissionSet.al	
+++ b/src/System Application/App/Guided Experience/permissions/GuidedExperienceEdit.PermissionSet.al	
@@ -7,6 +7,7 @@ namespace System.Environment.Configuration;
 
 using System.Globalization;
 using System.Apps;
+using System.Environment;
 
 permissionset 1993 "Guided Experience - Edit"
 {
@@ -21,5 +22,7 @@ permissionset 1993 "Guided Experience - Edit"
                   tabledata "Checklist Item User" = IMD,
                   tabledata "Checklist Setup" = IMd,
                   tabledata "Published Application" = imd,
-                  tabledata "Spotlight Tour Text" = imd;
+                  tabledata "Spotlight Tour Text" = imd,
+                  tabledata "Tenant Media" = imd,
+                  tabledata "Tenant Media Set" = imd;
 }
diff --git a/src/System Application/App/Guided Experience/permissions/GuidedExperienceRead.PermissionSet.al b/src/System Application/App/Guided Experience/permissions/GuidedExperienceRead.PermissionSet.al
index 321c9dad5a..e38282f681 100644
--- a/src/System Application/App/Guided Experience/permissions/GuidedExperienceRead.PermissionSet.al	
+++ b/src/System Application/App/Guided Experience/permissions/GuidedExperienceRead.PermissionSet.al	
@@ -35,5 +35,7 @@ permissionset 1991 "Guided Experience - Read"
                   tabledata "Spotlight Tour Text" = r,
                   tabledata User = r,
                   tabledata "User Checklist Status" = R,
-                  tabledata "User Personalization" = r;
+                  tabledata "User Personalization" = r,
+                  tabledata "Tenant Media" = r,
+                  tabledata "Tenant Media Set" = r;
 }
diff --git a/src/System Application/App/Guided Experience/permissions/GuidedExperienceView.PermissionSet.al b/src/System Application/App/Guided Experience/permissions/GuidedExperienceView.PermissionSet.al
index f78058a28d..05438a641d 100644
--- a/src/System Application/App/Guided Experience/permissions/GuidedExperienceView.PermissionSet.al	
+++ b/src/System Application/App/Guided Experience/permissions/GuidedExperienceView.PermissionSet.al	
@@ -5,6 +5,7 @@
 
 namespace System.Environment.Configuration;
 
+using System.Environment;
 using System.Globalization;
 using System.Reflection;
 
@@ -24,5 +25,7 @@ permissionset 1992 "Guided Experience - View"
                   tabledata "Guided Experience Item" = imd,
                   tabledata "Primary Guided Experience Item" = imd,
                   tabledata "Spotlight Tour Text" = imd,
-                  tabledata "User Checklist Status" = im;
+                  tabledata "User Checklist Status" = im,
+                  tabledata "Tenant Media" = im,
+                  tabledata "Tenant Media Set" = im;
 }
diff --git a/src/System Application/App/Page Summary Provider/permissions/PageSummaryProviderRead.PermissionSet.al b/src/System Application/App/Page Summary Provider/permissions/PageSummaryProviderRead.PermissionSet.al
index f1eee9662a..da3484dd34 100644
--- a/src/System Application/App/Page Summary Provider/permissions/PageSummaryProviderRead.PermissionSet.al	
+++ b/src/System Application/App/Page Summary Provider/permissions/PageSummaryProviderRead.PermissionSet.al	
@@ -17,10 +17,8 @@ permissionset 2715 "Page Summary Provider - Read"
     IncludedPermissionSets = "Page Summary Provider - Obj.";
 
     Permissions = tabledata Company = r,
-                  tabledata Media = r,
-                  tabledata "Media Resources" = r,
                   tabledata "Page Data Personalization" = R,
                   tabledata "Page Metadata" = r,
-                  tabledata "Tenant Media Set" = r,
-                  tabledata "Tenant Media Thumbnails" = r; // Page Summary Provider Settings Wizard requires this
+                  tabledata "Tenant Media" = r,
+                  tabledata "Tenant Media Set" = r; // Page Summary Provider Settings Wizard requires this
 }
diff --git a/src/System Application/App/Page Summary Provider/src/PageSummarySettings.Page.al b/src/System Application/App/Page Summary Provider/src/PageSummarySettings.Page.al
index f97973c7b4..17eee77bb9 100644
--- a/src/System Application/App/Page Summary Provider/src/PageSummarySettings.Page.al	
+++ b/src/System Application/App/Page Summary Provider/src/PageSummarySettings.Page.al	
@@ -19,8 +19,8 @@ page 2718 "Page Summary Settings"
     PageType = NavigatePage;
     Extensible = false;
     AccessByPermission = tabledata "Page Summary Settings" = M;
-    Permissions = tabledata Media = r,
-                  tabledata "Media Resources" = r;
+    Permissions = tabledata "Tenant Media" = r,
+                  tabledata "Tenant Media Set" = r;
     UsageCategory = Administration;
 
     layout