diff --git a/src/Files.App/DataModels/NavigationControlItems/DriveItem.cs b/src/Files.App/DataModels/NavigationControlItems/DriveItem.cs
index 38959e869faf..419af421f7fc 100644
--- a/src/Files.App/DataModels/NavigationControlItems/DriveItem.cs
+++ b/src/Files.App/DataModels/NavigationControlItems/DriveItem.cs
@@ -215,7 +215,7 @@ public async Task UpdatePropertiesAsync()
 				}
 				else
 				{
-					SpaceText = "DriveCapacityUnknown".GetLocalizedResource();
+					SpaceText = "Unknown".GetLocalizedResource();
 					MaxSpace = SpaceUsed = FreeSpace = ByteSize.FromBytes(0);
 				}
 
@@ -223,7 +223,7 @@ public async Task UpdatePropertiesAsync()
 			}
 			catch (Exception)
 			{
-				SpaceText = "DriveCapacityUnknown".GetLocalizedResource();
+				SpaceText = "Unknown".GetLocalizedResource();
 				MaxSpace = SpaceUsed = FreeSpace = ByteSize.FromBytes(0);
 
 				OnPropertyChanged(nameof(ShowDriveDetails));
diff --git a/src/Files.App/Dialogs/CredentialDialog.xaml b/src/Files.App/Dialogs/CredentialDialog.xaml
index 5e840bdf3c1f..dc944ab7443c 100644
--- a/src/Files.App/Dialogs/CredentialDialog.xaml
+++ b/src/Files.App/Dialogs/CredentialDialog.xaml
@@ -10,7 +10,7 @@
 	CornerRadius="{StaticResource OverlayCornerRadius}"
 	PrimaryButtonClick="ContentDialog_PrimaryButtonClick"
 	PrimaryButtonStyle="{StaticResource AccentButtonStyle}"
-	PrimaryButtonText="{helpers:ResourceString Name=AskCredentialDialog/PrimaryButtonText}"
+	PrimaryButtonText="{helpers:ResourceString Name=OK}"
 	RequestedTheme="{x:Bind helpers:ThemeHelper.RootTheme}"
 	SecondaryButtonText="{helpers:ResourceString Name=Cancel}"
 	Style="{StaticResource DefaultContentDialogStyle}"
@@ -42,7 +42,7 @@
 				x:Name="Password"
 				Margin="4"
 				IsEnabled="{x:Bind ViewModel.IsAnonymous, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}"
-				PlaceholderText="{helpers:ResourceString Name=CredentialDialogPassword/PlaceholderText}" />
+				PlaceholderText="{helpers:ResourceString Name=Password}" />
 			<CheckBox
 				x:Name="Anonymous"
 				Margin="4"
diff --git a/src/Files.App/Dialogs/DecompressArchiveDialog.xaml b/src/Files.App/Dialogs/DecompressArchiveDialog.xaml
index d86cf7c0ff83..7032396c2f55 100644
--- a/src/Files.App/Dialogs/DecompressArchiveDialog.xaml
+++ b/src/Files.App/Dialogs/DecompressArchiveDialog.xaml
@@ -68,7 +68,7 @@
 					x:Name="Password"
 					HorizontalAlignment="Stretch"
 					VerticalAlignment="Stretch"
-					PlaceholderText="{helpers:ResourceString Name=CredentialDialogPassword/PlaceholderText}" />
+					PlaceholderText="{helpers:ResourceString Name=Password}" />
 			</StackPanel>
 
 			<!--  Open when complete  -->
diff --git a/src/Files.App/Dialogs/FilesystemOperationDialog.xaml b/src/Files.App/Dialogs/FilesystemOperationDialog.xaml
index f67d3b0bc41b..95c3c5a3a4c4 100644
--- a/src/Files.App/Dialogs/FilesystemOperationDialog.xaml
+++ b/src/Files.App/Dialogs/FilesystemOperationDialog.xaml
@@ -116,7 +116,7 @@
 					SelectedIndex="{x:Bind ConflictResolveOption, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, Converter={StaticResource ConflictResolveOptionToIndexConverter}}">
 					<ComboBox.Items>
 						<ComboBoxItem Content="{helpers:ResourceString Name=GenerateNewName}" />
-						<ComboBoxItem Content="{helpers:ResourceString Name=ConflictingItemsDialogItemOptionReplaceExisting/Text}" />
+						<ComboBoxItem Content="{helpers:ResourceString Name=ReplaceExisting}" />
 						<ComboBoxItem Content="{helpers:ResourceString Name=Skip}" />
 					</ComboBox.Items>
 				</ComboBox>
@@ -180,7 +180,7 @@
 					<ComboBox.Items>
 						<ComboBoxItem Content="{helpers:ResourceString Name=Custom}" />
 						<ComboBoxItem Content="{helpers:ResourceString Name=GenerateNewName}" />
-						<ComboBoxItem Content="{helpers:ResourceString Name=ConflictingItemsDialogOptionReplaceExisting/Text}" />
+						<ComboBoxItem Content="{helpers:ResourceString Name=ReplaceExisting}" />
 						<ComboBoxItem Content="{helpers:ResourceString Name=Skip}" />
 					</ComboBox.Items>
 				</ComboBox>
diff --git a/src/Files.App/Filesystem/FilesystemOperations/Helpers/FilesystemHelpers.cs b/src/Files.App/Filesystem/FilesystemOperations/Helpers/FilesystemHelpers.cs
index 6d07eb1fb8b3..d5f439b1733d 100644
--- a/src/Files.App/Filesystem/FilesystemOperations/Helpers/FilesystemHelpers.cs
+++ b/src/Files.App/Filesystem/FilesystemOperations/Helpers/FilesystemHelpers.cs
@@ -563,7 +563,7 @@ await DialogDisplayHelper.ShowDialogAsync(
 					if (showExtensionDialog &&
 						Path.GetExtension(source.Path) != Path.GetExtension(newName)) // Only prompt user when extension has changed, not when file name has changed
 					{
-						var yesSelected = await DialogDisplayHelper.ShowDialogAsync("RenameFileDialogTitle".GetLocalizedResource(), "RenameFileDialog/Text".GetLocalizedResource(), "Yes".GetLocalizedResource(), "No".GetLocalizedResource());
+						var yesSelected = await DialogDisplayHelper.ShowDialogAsync("Rename".GetLocalizedResource(), "RenameFileDialog/Text".GetLocalizedResource(), "Yes".GetLocalizedResource(), "No".GetLocalizedResource());
 						if (yesSelected)
 						{
 							history = await filesystemOperations.RenameAsync(source, newName, collision, progress, cancellationToken);
diff --git a/src/Files.App/Filesystem/LibraryManager.cs b/src/Files.App/Filesystem/LibraryManager.cs
index b77c37f46990..d69f2644aced 100644
--- a/src/Files.App/Filesystem/LibraryManager.cs
+++ b/src/Files.App/Filesystem/LibraryManager.cs
@@ -302,7 +302,7 @@ public static async void ShowRestoreDefaultLibrariesDialog()
 			{
 				TitleText = "DialogRestoreLibrariesTitleText".GetLocalizedResource(),
 				SubtitleText = "DialogRestoreLibrariesSubtitleText".GetLocalizedResource(),
-				PrimaryButtonText = "DialogRestoreLibrariesButtonText".GetLocalizedResource(),
+				PrimaryButtonText = "Restore".GetLocalizedResource(),
 				CloseButtonText = "Cancel".GetLocalizedResource(),
 				PrimaryButtonAction = async (vm, e) =>
 				{
@@ -353,7 +353,7 @@ public static async void ShowCreateNewLibraryDialog()
 				},
 				TitleText = "FolderWidgetCreateNewLibraryDialogTitleText".GetLocalizedResource(),
 				SubtitleText = "SideBarCreateNewLibrary/Text".GetLocalizedResource(),
-				PrimaryButtonText = "DialogCreateLibraryButtonText".GetLocalizedResource(),
+				PrimaryButtonText = "Create".GetLocalizedResource(),
 				CloseButtonText = "Cancel".GetLocalizedResource(),
 				PrimaryButtonAction = async (vm, e) =>
 				{
diff --git a/src/Files.App/Filesystem/ListedItem.cs b/src/Files.App/Filesystem/ListedItem.cs
index 5b5428f09b38..0babb0590351 100644
--- a/src/Files.App/Filesystem/ListedItem.cs
+++ b/src/Files.App/Filesystem/ListedItem.cs
@@ -53,7 +53,7 @@ public string ItemTooltipText
 				tooltipBuilder.AppendLine($"{"ToolTipDescriptionType".GetLocalizedResource()} {itemType}");
 				tooltipBuilder.Append($"{"ToolTipDescriptionDate".GetLocalizedResource()} {ItemDateModified}");
 				if(!string.IsNullOrWhiteSpace(FileSize))
-					tooltipBuilder.Append($"{Environment.NewLine}{"ToolTipDescriptionSize".GetLocalizedResource()} {FileSize}");
+					tooltipBuilder.Append($"{Environment.NewLine}{"SizeLabel".GetLocalizedResource()} {FileSize}");
 				if(SyncStatusUI.LoadSyncStatus)
 					tooltipBuilder.Append($"{Environment.NewLine}{"syncStatusColumn/Header".GetLocalizedResource()}: {syncStatusUI.SyncStatusString}");
 
@@ -400,7 +400,7 @@ public override string ToString()
 			}
 			else if (IsLibrary)
 			{
-				suffix = "LibraryItemAutomation".GetLocalizedResource();
+				suffix = "Library".GetLocalizedResource();
 			}
 			else
 			{
@@ -493,7 +493,7 @@ public FtpItem(FtpListItem item, string folder) : base(null)
 			PrimaryItemAttribute = isFile ? StorageItemTypes.File : StorageItemTypes.Folder;
 			ItemPropertiesInitialized = false;
 
-			var itemType = isFile ? "ItemTypeFile".GetLocalizedResource() : "Folder".GetLocalizedResource();
+			var itemType = isFile ? "File".GetLocalizedResource() : "Folder".GetLocalizedResource();
 			if (isFile && Name.Contains('.', StringComparison.Ordinal))
 			{
 				itemType = FileExtension.Trim('.') + " " + itemType;
@@ -571,7 +571,7 @@ public LibraryItem(LibraryLocationItem library) : base(null)
 			ItemPath = library.Path;
 			ItemNameRaw = library.Text;
 			PrimaryItemAttribute = StorageItemTypes.Folder;
-			ItemType = "ItemTypeLibrary".GetLocalizedResource();
+			ItemType = "Library".GetLocalizedResource();
 			LoadCustomIcon = true;
 			CustomIcon = library.Icon;
 			//CustomIconSource = library.IconSource;
diff --git a/src/Files.App/Filesystem/StorageEnumerators/Win32StorageEnumerator.cs b/src/Files.App/Filesystem/StorageEnumerators/Win32StorageEnumerator.cs
index 0524e5376627..ae89c7bd3449 100644
--- a/src/Files.App/Filesystem/StorageEnumerators/Win32StorageEnumerator.cs
+++ b/src/Files.App/Filesystem/StorageEnumerators/Win32StorageEnumerator.cs
@@ -139,7 +139,7 @@ private static IEnumerable<ListedItem> EnumAdsForPath(string itemPath, ListedIte
 
 		public static ListedItem GetAlternateStream((string Name, long Size) ads, ListedItem main)
 		{
-			string itemType = "ItemTypeFile".GetLocalizedResource();
+			string itemType = "File".GetLocalizedResource();
 			string itemFileExtension = null;
 			if (ads.Name.Contains('.'))
 			{
@@ -253,7 +253,7 @@ CancellationToken cancellationToken
 
 			long itemSizeBytes = findData.GetSize();
 			var itemSize = itemSizeBytes.ToSizeString();
-			string itemType = "ItemTypeFile".GetLocalizedResource();
+			string itemType = "File".GetLocalizedResource();
 			string itemFileExtension = null;
 
 			if (findData.cFileName.Contains('.'))
@@ -293,7 +293,7 @@ CancellationToken cancellationToken
 					ItemDateModifiedReal = itemModifiedDate,
 					ItemDateAccessedReal = itemLastAccessDate,
 					ItemDateCreatedReal = itemCreatedDate,
-					ItemType = "ShortcutFileType".GetLocalizedResource(),
+					ItemType = "Shortcut".GetLocalizedResource(),
 					ItemPath = itemPath,
 					FileSize = itemSize,
 					FileSizeBytes = itemSizeBytes,
@@ -322,7 +322,7 @@ CancellationToken cancellationToken
 					ItemDateModifiedReal = itemModifiedDate,
 					ItemDateAccessedReal = itemLastAccessDate,
 					ItemDateCreatedReal = itemCreatedDate,
-					ItemType = isUrl ? "ShortcutWebLinkFileType".GetLocalizedResource() : "ShortcutFileType".GetLocalizedResource(),
+					ItemType = isUrl ? "ShortcutWebLinkFileType".GetLocalizedResource() : "Shortcut".GetLocalizedResource(),
 					ItemPath = itemPath,
 					FileSize = itemSize,
 					FileSizeBytes = itemSizeBytes,
diff --git a/src/Files.App/Filesystem/StorageItems/FtpStorageFile.cs b/src/Files.App/Filesystem/StorageItems/FtpStorageFile.cs
index 1252a5930671..db9d89fdaf34 100644
--- a/src/Files.App/Filesystem/StorageItems/FtpStorageFile.cs
+++ b/src/Files.App/Filesystem/StorageItems/FtpStorageFile.cs
@@ -28,7 +28,7 @@ public override string DisplayType
 		{
 			get
 			{
-				var itemType = "ItemTypeFile".GetLocalizedResource();
+				var itemType = "File".GetLocalizedResource();
 				if (Name.Contains('.', StringComparison.Ordinal))
 				{
 					itemType = IO.Path.GetExtension(Name).Trim('.') + " " + itemType;
diff --git a/src/Files.App/Filesystem/StorageItems/NativeStorageFile.cs b/src/Files.App/Filesystem/StorageItems/NativeStorageFile.cs
index 62d1ba2681c1..9a03140b8cc4 100644
--- a/src/Files.App/Filesystem/StorageItems/NativeStorageFile.cs
+++ b/src/Files.App/Filesystem/StorageItems/NativeStorageFile.cs
@@ -35,7 +35,7 @@ public override string DisplayType
 		{
 			get
 			{
-				var itemType = "ItemTypeFile".GetLocalizedResource();
+				var itemType = "File".GetLocalizedResource();
 
 				if (Name.Contains('.', StringComparison.Ordinal))
 					itemType = IO.Path.GetExtension(Name).Trim('.') + " " + itemType;
diff --git a/src/Files.App/Filesystem/StorageItems/ZipStorageFile.cs b/src/Files.App/Filesystem/StorageItems/ZipStorageFile.cs
index 3b5ff3323ae3..6af6720255a9 100644
--- a/src/Files.App/Filesystem/StorageItems/ZipStorageFile.cs
+++ b/src/Files.App/Filesystem/StorageItems/ZipStorageFile.cs
@@ -32,7 +32,7 @@ public override string DisplayType
 		{
 			get
 			{
-				var itemType = "ItemTypeFile".GetLocalizedResource();
+				var itemType = "File".GetLocalizedResource();
 				if (Name.Contains('.', StringComparison.Ordinal))
 				{
 					itemType = FileType.Trim('.') + " " + itemType;
diff --git a/src/Files.App/Helpers/ContextFlyoutItemHelper.cs b/src/Files.App/Helpers/ContextFlyoutItemHelper.cs
index ca2ab844a6f8..34e1196bd038 100644
--- a/src/Files.App/Helpers/ContextFlyoutItemHelper.cs
+++ b/src/Files.App/Helpers/ContextFlyoutItemHelper.cs
@@ -100,7 +100,7 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseItemMenuItems(
 			{
 				new ContextMenuFlyoutItemViewModel()
 				{
-					Text = "BaseLayoutContextFlyoutLayoutMode/Text".GetLocalizedResource(),
+					Text = "LayoutMode".GetLocalizedResource(),
 					Glyph = "\uE152",
 					ShowInRecycleBin = true,
 					ShowInSearchPage = true,
@@ -139,7 +139,7 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseItemMenuItems(
 						// Grid view small
 						new ContextMenuFlyoutItemViewModel()
 						{
-							Text = "BaseLayoutContextFlyoutSmallIcons/Text".GetLocalizedResource(),
+							Text = "SmallIcons".GetLocalizedResource(),
 							Glyph = "\uE80A",
 							ShowInRecycleBin = true,
 							ShowInSearchPage = true,
@@ -153,7 +153,7 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseItemMenuItems(
 						// Grid view medium
 						new ContextMenuFlyoutItemViewModel()
 						{
-							Text = "BaseLayoutContextFlyoutMediumIcons/Text".GetLocalizedResource(),
+							Text = "MediumIcons".GetLocalizedResource(),
 							Glyph = "\uF0E2",
 							ShowInRecycleBin = true,
 							ShowInSearchPage = true,
@@ -167,7 +167,7 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseItemMenuItems(
 						// Grid view large
 						new ContextMenuFlyoutItemViewModel()
 						{
-							Text = "BaseLayoutContextFlyoutLargeIcons/Text".GetLocalizedResource(),
+							Text = "LargeIcons".GetLocalizedResource(),
 							Glyph = "\uE739",
 							ShowInRecycleBin = true,
 							ShowInSearchPage = true,
@@ -211,7 +211,7 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseItemMenuItems(
 				},
 				new ContextMenuFlyoutItemViewModel()
 				{
-					Text = "BaseLayoutContextFlyoutSortBy/Text".GetLocalizedResource(),
+					Text = "SortBy".GetLocalizedResource(),
 					ColoredIcon = new ColoredIconModel()
 					{
 						BaseLayerGlyph = "\uF029",
@@ -258,7 +258,7 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseItemMenuItems(
 						},
 						new ContextMenuFlyoutItemViewModel()
 						{
-							Text = "BaseLayoutContextFlyoutSortByType/Text".GetLocalizedResource(),
+							Text = "Type".GetLocalizedResource(),
 							IsChecked = itemViewModel?.IsSortedByType ?? false,
 							Command = itemViewModel is not null ? new RelayCommand(() => itemViewModel.IsSortedByType = true) : null!,
 							ShowInRecycleBin = true,
@@ -297,7 +297,7 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseItemMenuItems(
 						},
 						new ContextMenuFlyoutItemViewModel()
 						{
-							Text = "BaseLayoutContextFlyoutSortByOriginalPath/Text".GetLocalizedResource(),
+							Text = "OriginalPath".GetLocalizedResource(),
 							IsChecked = itemViewModel?.IsSortedByOriginalPath ?? false,
 							ShowInRecycleBin = true,
 							Command = itemViewModel is not null ? new RelayCommand(() => itemViewModel.IsSortedByOriginalPath = true) : null!,
@@ -406,7 +406,7 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseItemMenuItems(
 						},
 						new ContextMenuFlyoutItemViewModel()
 						{
-							Text = "BaseLayoutContextFlyoutSortByType/Text".GetLocalizedResource(),
+							Text = "Type".GetLocalizedResource(),
 							IsChecked = currentInstanceViewModel.FolderSettings.DirectoryGroupOption == GroupOption.FileType,
 							ShowInRecycleBin = true,
 							ShowInSearchPage = true,
@@ -578,7 +578,7 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseItemMenuItems(
 				},
 				new ContextMenuFlyoutItemViewModel()
 				{
-					Text = "BaseLayoutItemContextFlyoutRestore/Text".GetLocalizedResource(),
+					Text = "Restore".GetLocalizedResource(),
 					Glyph = "\xE777",
 					Command = commandsViewModel.RestoreItemCommand,
 					ShowInRecycleBin = true,
@@ -635,7 +635,7 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseItemMenuItems(
 				},
 				new ContextMenuFlyoutItemViewModel()
 				{
-					Text = "BaseLayoutItemContextFlyoutOpenFileLocation/Text".GetLocalizedResource(),
+					Text = "OpenFileLocation".GetLocalizedResource(),
 					Glyph = "\uE8DA",
 					Command = commandsViewModel.OpenFileLocationCommand,
 					ShowItem = itemsSelected && selectedItems.All(i => i.IsShortcut),
@@ -643,7 +643,7 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseItemMenuItems(
 				},
 				new ContextMenuFlyoutItemViewModel()
 				{
-					Text = "BaseLayoutItemContextFlyoutOpenInNewTab/Text".GetLocalizedResource(),
+					Text = "OpenInNewTab".GetLocalizedResource(),
 					Glyph = "\uF113",
 					GlyphFontFamilyName = "CustomGlyph",
 					Command = commandsViewModel.OpenDirectoryInNewTabCommand,
@@ -654,7 +654,7 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseItemMenuItems(
 				},
 				new ContextMenuFlyoutItemViewModel()
 				{
-					Text = "BaseLayoutItemContextFlyoutOpenInNewWindow/Text".GetLocalizedResource(),
+					Text = "OpenInNewWindow".GetLocalizedResource(),
 					Glyph = "\uE737",
 					Command = commandsViewModel.OpenInNewWindowItemCommand,
 					ShowItem = itemsSelected && selectedItems.Count < 5 && areAllItemsFolders && userSettingsService.PreferencesSettingsService.ShowOpenInNewWindow,
@@ -687,7 +687,7 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseItemMenuItems(
 					{
 						new ContextMenuFlyoutItemViewModel()
 						{
-							Text = "BaseLayoutItemContextFlyoutSetAsDesktopBackground/Text".GetLocalizedResource(),
+							Text = "SetAsBackground".GetLocalizedResource(),
 							Glyph = "\uE91B",
 							Command = commandsViewModel.SetAsDesktopBackgroundItemCommand,
 							ShowInSearchPage = true,
@@ -739,7 +739,7 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseItemMenuItems(
 				},
 				new ContextMenuFlyoutItemViewModel()
 				{
-					Text = "BaseLayoutContextFlyoutRunAsAdmin/Text".GetLocalizedResource(),
+					Text = "RunAsAdministrator".GetLocalizedResource(),
 					Glyph = "\uE7EF",
 					Command = commandsViewModel.RunAsAdminCommand,
 					ShowInSearchPage = true,
@@ -823,7 +823,7 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseItemMenuItems(
 				},
 				new ContextMenuFlyoutItemViewModel()
 				{
-					Text = "BaseLayoutContextFlyoutPaste/Text".GetLocalizedResource(),
+					Text = "Paste".GetLocalizedResource(),
 					//Glyph = "\uF16D",
 					IsPrimary = true,
 					ColoredIcon = new ColoredIconModel()
@@ -872,7 +872,7 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseItemMenuItems(
 				},
 				new ContextMenuFlyoutItemViewModel()
 				{
-					Text = "BaseLayoutItemContextFlyoutRename/Text".GetLocalizedResource(),
+					Text = "Rename".GetLocalizedResource(),
 					IsPrimary = true,
 					ColoredIcon = new ColoredIconModel()
 					{
@@ -928,7 +928,7 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseItemMenuItems(
 				},
 				new ContextMenuFlyoutItemViewModel()
 				{
-					Text = "BaseLayoutItemContextFlyoutProperties/Text".GetLocalizedResource(),
+					Text = "Properties".GetLocalizedResource(),
 					IsPrimary = true,
 					ColoredIcon = new ColoredIconModel()
 					{
@@ -961,7 +961,7 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseItemMenuItems(
 				},
 				new ContextMenuFlyoutItemViewModel()
 				{
-					Text = "BaseLayoutContextFlyoutUnpinFromFavorites/Text".GetLocalizedResource(),
+					Text = "UnpinFromFavorites".GetLocalizedResource(),
 					Glyph = "\uE77A",
 					Command = commandsViewModel.SidebarUnpinItemCommand,
 					ShowItem = userSettingsService.PreferencesSettingsService.ShowFavoritesSection && selectedItems.All(x => x.PrimaryItemAttribute == StorageItemTypes.Folder && !x.IsArchive && x.IsPinned),
@@ -998,7 +998,7 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseItemMenuItems(
 					{
 						new ContextMenuFlyoutItemViewModel
 						{
-							Text = "BaseLayoutItemContextFlyoutExtractFilesOption".GetLocalizedResource(),
+							Text = "ExtractFiles".GetLocalizedResource(),
 							Glyph = "\xF11A",
 							GlyphFontFamilyName = "CustomGlyph",
 							Command = commandsViewModel.DecompressArchiveCommand,
@@ -1007,7 +1007,7 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseItemMenuItems(
 						},
 						new ContextMenuFlyoutItemViewModel
 						{
-							Text = "BaseLayoutItemContextFlyoutExtractHereOption".GetLocalizedResource(),
+							Text = "ExtractHere".GetLocalizedResource(),
 							Glyph = "\xF11A",
 							GlyphFontFamilyName = "CustomGlyph",
 							Command = commandsViewModel.DecompressArchiveHereCommand,
@@ -1115,7 +1115,7 @@ public static List<ContextMenuFlyoutItemViewModel> GetNewItemItems(BaseLayoutCom
 				},
 				new ContextMenuFlyoutItemViewModel()
 				{
-					Text = "BaseLayoutContextFlyoutNewFile/Text".GetLocalizedResource(),
+					Text = "File".GetLocalizedResource(),
 					Glyph = "\uE7C3",
 					Command = commandsViewModel.CreateNewFileCommand,
 					CommandParameter = null,
diff --git a/src/Files.App/Helpers/DynamicDialogFactory.cs b/src/Files.App/Helpers/DynamicDialogFactory.cs
index b9a5d3d8aee7..3cd8497e060a 100644
--- a/src/Files.App/Helpers/DynamicDialogFactory.cs
+++ b/src/Files.App/Helpers/DynamicDialogFactory.cs
@@ -60,7 +60,7 @@ public static DynamicDialog GetFor_RenameDialog()
 			DynamicDialog? dialog = null;
 			TextBox inputText = new()
 			{
-				PlaceholderText = "RenameDialogInputText/PlaceholderText".GetLocalizedResource()
+				PlaceholderText = "EnterAnItemName".GetLocalizedResource()
 			};
 
 			TextBlock tipText = new()
@@ -90,7 +90,7 @@ public static DynamicDialog GetFor_RenameDialog()
 
 			dialog = new DynamicDialog(new DynamicDialogViewModel()
 			{
-				TitleText = "RenameDialog/Title".GetLocalizedResource(),
+				TitleText = "EnterAnItemName".GetLocalizedResource(),
 				SubtitleText = null,
 				DisplayControl = new Grid()
 				{
@@ -146,7 +146,7 @@ public static DynamicDialog GetFor_CredentialEntryDialog(string path)
 
 			PasswordBox inputPassword = new()
 			{
-				PlaceholderText = "CredentialDialogPassword/PlaceholderText".GetLocalizedResource()
+				PlaceholderText = "Password".GetLocalizedResource()
 			};
 
 			CheckBox saveCreds = new()
@@ -181,7 +181,7 @@ public static DynamicDialog GetFor_CredentialEntryDialog(string path)
 			dialog = new DynamicDialog(new DynamicDialogViewModel()
 			{
 				TitleText = "NetworkAuthenticationDialogTitle".GetLocalizedResource(),
-				PrimaryButtonText = "AskCredentialDialog/PrimaryButtonText".GetLocalizedResource(),
+				PrimaryButtonText = "OK".GetLocalizedResource(),
 				CloseButtonText = "Cancel".GetLocalizedResource(),
 				SubtitleText = string.Format("NetworkAuthenticationDialogMessage".GetLocalizedResource(), path.Substring(2)),
 				DisplayControl = new Grid()
diff --git a/src/Files.App/Helpers/FilePropertiesHelpers.cs b/src/Files.App/Helpers/FilePropertiesHelpers.cs
index 31cd58979e5b..64b6787abf38 100644
--- a/src/Files.App/Helpers/FilePropertiesHelpers.cs
+++ b/src/Files.App/Helpers/FilePropertiesHelpers.cs
@@ -77,7 +77,7 @@ public static async Task OpenPropertiesWindowAsync(object item, IShellPage assoc
 				};
 
 				var appWindow = propertiesWindow.AppWindow;
-				appWindow.Title = "PropertiesTitle".GetLocalizedResource();
+				appWindow.Title = "Properties".GetLocalizedResource();
 				appWindow.TitleBar.ExtendsContentIntoTitleBar = true;
 				appWindow.TitleBar.ButtonBackgroundColor = Colors.Transparent;
 				appWindow.TitleBar.ButtonInactiveBackgroundColor = Colors.Transparent;
diff --git a/src/Files.App/ServicesImplementation/Settings/FileTagsSettingsService.cs b/src/Files.App/ServicesImplementation/Settings/FileTagsSettingsService.cs
index bb6e3e98e555..58a9cb80fe1e 100644
--- a/src/Files.App/ServicesImplementation/Settings/FileTagsSettingsService.cs
+++ b/src/Files.App/ServicesImplementation/Settings/FileTagsSettingsService.cs
@@ -58,7 +58,7 @@ public TagViewModel GetTagById(string uid)
 
 			if (!string.IsNullOrEmpty(uid) && tag is null)
 			{
-				tag = new TagViewModel("FileTagUnknown".GetLocalizedResource(), "#9ea3a1", uid);
+				tag = new TagViewModel("Unknown".GetLocalizedResource(), "#9ea3a1", uid);
 				FileTagList = FileTagList.Append(tag).ToList();
 			}
 
diff --git a/src/Files.App/Strings/en-US/Resources.resw b/src/Files.App/Strings/en-US/Resources.resw
index cefb5b452823..bbe64968f01b 100644
--- a/src/Files.App/Strings/en-US/Resources.resw
+++ b/src/Files.App/Strings/en-US/Resources.resw
@@ -117,40 +117,25 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="SideBarOpenInNewTab.Text" xml:space="preserve">
-    <value>Open in new tab</value>
-  </data>
-  <data name="SideBarOpenInNewWindow.Text" xml:space="preserve">
-    <value>Open in new window</value>
-  </data>
   <data name="NavigationToolbarNewWindow.Label" xml:space="preserve">
     <value>New window</value>
   </data>
   <data name="CopyLocation" xml:space="preserve">
     <value>Copy location</value>
   </data>
-  <data name="NavigationToolbarPaste.Label" xml:space="preserve">
-    <value>Paste</value>
-  </data>
   <data name="Browse" xml:space="preserve">
     <value>Browse</value>
   </data>
-  <data name="nameColumn.Header" xml:space="preserve">
-    <value>Name</value>
-  </data>
   <data name="Size" xml:space="preserve">
     <value>Size</value>
   </data>
   <data name="PropertiesCreated.Text" xml:space="preserve">
     <value>Created:</value>
   </data>
-  <data name="PropertiesItemFileName.PlaceholderText" xml:space="preserve">
-    <value>Item Name</value>
-  </data>
   <data name="Path" xml:space="preserve">
     <value>Path:</value>
   </data>
-  <data name="PropertiesItemSize.Text" xml:space="preserve">
+  <data name="SizeLabel" xml:space="preserve">
     <value>Size:</value>
   </data>
   <data name="UncompressedSize" xml:space="preserve">
@@ -189,15 +174,12 @@
   <data name="NavigationToolbarVisiblePath.PlaceholderText" xml:space="preserve">
     <value>Enter a path</value>
   </data>
-  <data name="NavigationToolbarSearchRegion.PlaceholderText" xml:space="preserve">
+  <data name="Search" xml:space="preserve">
     <value>Search</value>
   </data>
   <data name="RecentItemDescription.Text" xml:space="preserve">
     <value>Files you've previously accessed will show up here</value>
   </data>
-  <data name="RecentItemOpenFileLocation.Text" xml:space="preserve">
-    <value>Open file location</value>
-  </data>
   <data name="RecentItemRemove.Text" xml:space="preserve">
     <value>Remove this item</value>
   </data>
@@ -255,48 +237,33 @@
   <data name="Downloads" xml:space="preserve">
     <value>Downloads</value>
   </data>
-  <data name="SideBarUnpinFromFavorites.Text" xml:space="preserve">
-    <value>Unpin from Favorites</value>
-  </data>
-  <data name="BaseLayoutContextFlyoutSortBy.Text" xml:space="preserve">
-    <value>Sort by</value>
-  </data>
   <data name="Name" xml:space="preserve">
     <value>Name</value>
   </data>
-  <data name="BaseLayoutContextFlyoutSortByType.Text" xml:space="preserve">
-    <value>Type</value>
-  </data>
   <data name="Ascending" xml:space="preserve">
     <value>Ascending</value>
   </data>
   <data name="BaseLayoutContextFlyoutRefresh.Text" xml:space="preserve">
     <value>Refresh</value>
   </data>
-  <data name="BaseLayoutContextFlyoutPaste.Text" xml:space="preserve">
+  <data name="Paste" xml:space="preserve">
     <value>Paste</value>
   </data>
   <data name="BaseLayoutContextFlyoutNew.Label" xml:space="preserve">
     <value>New</value>
   </data>
-  <data name="BaseLayoutContextFlyoutNewFile.Text" xml:space="preserve">
-    <value>File</value>
-  </data>
-  <data name="BaseLayoutContextFlyoutPropertiesFolder.Text" xml:space="preserve">
+  <data name="Properties" xml:space="preserve">
     <value>Properties</value>
   </data>
   <data name="Open" xml:space="preserve">
     <value>Open</value>
   </data>
-  <data name="BaseLayoutItemContextFlyoutOpenInNewTab.Text" xml:space="preserve">
+  <data name="OpenInNewTab" xml:space="preserve">
     <value>Open in new tab</value>
   </data>
-  <data name="BaseLayoutItemContextFlyoutOpenInNewWindow.Text" xml:space="preserve">
+  <data name="OpenInNewWindow" xml:space="preserve">
     <value>Open in new window</value>
   </data>
-  <data name="BaseLayoutItemContextFlyoutSetAsDesktopBackground.Text" xml:space="preserve">
-    <value>Set as desktop background</value>
-  </data>
   <data name="BaseLayoutItemContextFlyoutShare.Text" xml:space="preserve">
     <value>Share</value>
   </data>
@@ -306,15 +273,9 @@
   <data name="Delete" xml:space="preserve">
     <value>Delete</value>
   </data>
-  <data name="BaseLayoutItemContextFlyoutRename.Text" xml:space="preserve">
-    <value>Rename</value>
-  </data>
   <data name="BaseLayoutItemContextFlyoutPinToFavorites.Text" xml:space="preserve">
     <value>Pin to Favorites</value>
   </data>
-  <data name="BaseLayoutItemContextFlyoutProperties.Text" xml:space="preserve">
-    <value>Properties</value>
-  </data>
   <data name="WelcomeDialog.Title" xml:space="preserve">
     <value>Welcome to Files!</value>
   </data>
@@ -324,16 +285,10 @@
   <data name="WelcomeDialogTextBlock.Text" xml:space="preserve">
     <value>To get started, you'll need to grant us permission to display your files. This will open a Settings page where you can grant us this permission. You'll need to reopen the app once you've completed this step. </value>
   </data>
-  <data name="ItemTypeFile" xml:space="preserve">
-    <value>File</value>
-  </data>
   <data name="Display" xml:space="preserve">
     <value>Display</value>
   </data>
-  <data name="RenameDialog.Title" xml:space="preserve">
-    <value>Enter an item name</value>
-  </data>
-  <data name="RenameDialogInputText.PlaceholderText" xml:space="preserve">
+  <data name="EnterAnItemName" xml:space="preserve">
     <value>Enter an item name</value>
   </data>
   <data name="RenameDialog.PrimaryButtonText" xml:space="preserve">
@@ -375,9 +330,6 @@
   <data name="NavSearchButton.ToolTipService.ToolTip" xml:space="preserve">
     <value>Search (Ctrl+F)</value>
   </data>
-  <data name="PropertiesTitle" xml:space="preserve">
-    <value>Properties</value>
-  </data>
   <data name="ItemAlreadyExistsDialogContent" xml:space="preserve">
     <value>An item with this name already exists in this directory.</value>
   </data>
@@ -390,18 +342,6 @@
   <data name="BaseLayoutItemContextFlyoutSetAsLockscreenBackground.Text" xml:space="preserve">
     <value>Set as lockscreen background</value>
   </data>
-  <data name="BaseLayoutContextFlyoutLargeIcons.Text" xml:space="preserve">
-    <value>Large Icons</value>
-  </data>
-  <data name="BaseLayoutContextFlyoutMediumIcons.Text" xml:space="preserve">
-    <value>Medium Icons</value>
-  </data>
-  <data name="BaseLayoutContextFlyoutSmallIcons.Text" xml:space="preserve">
-    <value>Small Icons</value>
-  </data>
-  <data name="PropertiesDialogOKButton.Content" xml:space="preserve">
-    <value>OK</value>
-  </data>
   <data name="AccessDeniedDeleteDialog.Text" xml:space="preserve">
     <value>We weren't able to delete this item</value>
   </data>
@@ -432,21 +372,12 @@
   <data name="FileInUseDialog.Title" xml:space="preserve">
     <value>File is in use</value>
   </data>
-  <data name="NavToolbarLayout.Text" xml:space="preserve">
+  <data name="Layout" xml:space="preserve">
     <value>Layout</value>
   </data>
-  <data name="NavToolbarSelectionOptions.ToolTipService.ToolTip" xml:space="preserve">
-    <value>Selection options</value>
-  </data>
   <data name="PropertiesDialogReadOnly.Text" xml:space="preserve">
     <value>Read-only</value>
   </data>
-  <data name="PropertiesDialogHidden.Text" xml:space="preserve">
-    <value>Hidden</value>
-  </data>
-  <data name="BaseLayoutItemContextFlyoutRestore.Text" xml:space="preserve">
-    <value>Restore</value>
-  </data>
   <data name="DaysAgo" xml:space="preserve">
     <value>{0} days ago</value>
   </data>
@@ -489,9 +420,6 @@
   <data name="FileNameTeachingTip.Subtitle" xml:space="preserve">
     <value>The item name must not contain the following characters: \ / : * ? " &lt; &gt; |</value>
   </data>
-  <data name="FileNameTeachingTip.CloseButtonContent" xml:space="preserve">
-    <value>OK</value>
-  </data>
   <data name="InvalidFilename.Text" xml:space="preserve">
     <value>The item name specified is invalid</value>
   </data>
@@ -543,9 +471,6 @@
   <data name="ByteSymbol" xml:space="preserve">
     <value>B</value>
   </data>
-  <data name="BaseLayoutContextFlyoutRunAsAdmin.Text" xml:space="preserve">
-    <value>Run as administrator</value>
-  </data>
   <data name="PropertiesFilesAndFoldersCountString" xml:space="preserve">
     <value>{0:#,##0} files, {1:#,##0} folders</value>
   </data>
@@ -618,9 +543,6 @@
   <data name="PropertiesShortcutItemType.Text" xml:space="preserve">
     <value>Shortcut type:</value>
   </data>
-  <data name="PropertiesShortcutTypeFile" xml:space="preserve">
-    <value>File</value>
-  </data>
   <data name="PropertiesShortcutTypeLink" xml:space="preserve">
     <value>Web link</value>
   </data>
@@ -630,21 +552,12 @@
   <data name="Shortcut" xml:space="preserve">
     <value>Shortcut</value>
   </data>
-  <data name="ShortcutFileType" xml:space="preserve">
-    <value>Shortcut</value>
-  </data>
   <data name="ShortcutWebLinkFileType" xml:space="preserve">
     <value>Internet shortcut</value>
   </data>
   <data name="ShortcutCreateNewSuffix" xml:space="preserve">
     <value>{0} - shortcut</value>
   </data>
-  <data name="BaseLayoutItemContextFlyoutOpenFileLocation.Text" xml:space="preserve">
-    <value>Open file location</value>
-  </data>
-  <data name="DriveCapacityUnknown" xml:space="preserve">
-    <value>Unknown</value>
-  </data>
   <data name="ExceptionNotificationBody" xml:space="preserve">
     <value>Files ran into a problem that the developers didn't prepare for yet.</value>
   </data>
@@ -744,9 +657,6 @@
   <data name="AddDialogListFolderSubHeader" xml:space="preserve">
     <value>Creates an empty folder</value>
   </data>
-  <data name="BaseLayoutContextFlyoutLayoutMode.Text" xml:space="preserve">
-    <value>Layout mode</value>
-  </data>
   <data name="LayoutMode" xml:space="preserve">
     <value>Layout mode</value>
   </data>
@@ -762,7 +672,7 @@
   <data name="NavUpButton.AutomationProperties.Name" xml:space="preserve">
     <value>Go up one directory</value>
   </data>
-  <data name="SettingsPreferencesAppLanguage.Title" xml:space="preserve">
+  <data name="Language" xml:space="preserve">
     <value>Language</value>
   </data>
   <data name="SettingsContextMenuOverflow" xml:space="preserve">
@@ -1044,7 +954,7 @@
   <data name="Address" xml:space="preserve">
     <value>Address</value>
   </data>
-  <data name="NavToolbarSelectionOptions.AutomationProperties.Name" xml:space="preserve">
+  <data name="SelectionOptions" xml:space="preserve">
     <value>Selection options</value>
   </data>
   <data name="NavToolbarSelectionOptions.Label" xml:space="preserve">
@@ -1086,18 +996,12 @@
   <data name="HorizontalMultitaskingControlNewTab.Text" xml:space="preserve">
     <value>New tab</value>
   </data>
-  <data name="HorizontalMultitaskingControlAddButton.ToolTipService.ToolTip" xml:space="preserve">
-    <value>New tab (Ctrl+T)</value>
-  </data>
-  <data name="HorizontalMultitaskingControlAddButton.AutomationProperties.Name" xml:space="preserve">
+  <data name="NewTabCtrlT" xml:space="preserve">
     <value>New tab (Ctrl+T)</value>
   </data>
   <data name="ClearPropertiesFlyoutText.Text" xml:space="preserve">
     <value>Some properties may contain personal information.</value>
   </data>
-  <data name="ClearPropertiesFlyoutConfirmation.Content" xml:space="preserve">
-    <value>Clear</value>
-  </data>
   <data name="ClearPropertiesButton.Content" xml:space="preserve">
     <value>Clear All Properties</value>
   </data>
@@ -1107,9 +1011,6 @@
   <data name="OngoingTasksTeachingTip.Title" xml:space="preserve">
     <value>Status Center</value>
   </data>
-  <data name="NavSearchButton.AutomationProperties.Name" xml:space="preserve">
-    <value>Search</value>
-  </data>
   <data name="SearchPagePathBoxOverrideText" xml:space="preserve">
     <value>Search results in {1} for {0}</value>
   </data>
@@ -1134,10 +1035,7 @@
   <data name="SettingsContextMenu.Text" xml:space="preserve">
     <value>Customize the right click context menu</value>
   </data>
-  <data name="originalPathColumn.Header" xml:space="preserve">
-    <value>Original path</value>
-  </data>
-  <data name="BaseLayoutContextFlyoutSortByOriginalPath.Text" xml:space="preserve">
+  <data name="OriginalPath" xml:space="preserve">
     <value>Original path</value>
   </data>
   <data name="Add" xml:space="preserve">
@@ -1167,33 +1065,15 @@
   <data name="NavToolbarDetails.ToolTipService.ToolTip" xml:space="preserve">
     <value>Details (Ctrl+Shift+1)</value>
   </data>
-  <data name="NavToolbarLayoutOptionsButton.AutomationProperties.Name" xml:space="preserve">
-    <value>Layout</value>
-  </data>
-  <data name="NavToolbarLayoutOptionsButton.ToolTipService.ToolTip" xml:space="preserve">
-    <value>Layout</value>
-  </data>
-  <data name="NavToolbarLayoutOptionsButton.Label" xml:space="preserve">
-    <value>Layout</value>
-  </data>
   <data name="PreviewPaneToggle.Label" xml:space="preserve">
     <value>Preview</value>
   </data>
-  <data name="NavToolbarLargeIcons.AutomationProperties.Name" xml:space="preserve">
-    <value>Large Icons</value>
-  </data>
   <data name="NavToolbarLargeIcons.ToolTipService.ToolTip" xml:space="preserve">
     <value>Large Icons (Ctrl+Shift+5)</value>
   </data>
-  <data name="NavToolbarMediumIcons.AutomationProperties.Name" xml:space="preserve">
-    <value>Medium Icons</value>
-  </data>
   <data name="NavToolbarMediumIcons.ToolTipService.ToolTip" xml:space="preserve">
     <value>Medium Icons (Ctrl+Shift+4)</value>
   </data>
-  <data name="NavToolbarSmallIcons.AutomationProperties.Name" xml:space="preserve">
-    <value>Small Icons</value>
-  </data>
   <data name="NavToolbarSmallIcons.ToolTipService.ToolTip" xml:space="preserve">
     <value>Small Icons (Ctrl+Shift+3)</value>
   </data>
@@ -1206,9 +1086,6 @@
   <data name="SidebarCloudDrives" xml:space="preserve">
     <value>Cloud Drives</value>
   </data>
-  <data name="BundlesWidgetMoreOptionsButton.ToolTipService.ToolTip" xml:space="preserve">
-    <value>More options...</value>
-  </data>
   <data name="BundlesWidgetOptionsFlyoutExportBundlesMenuItem.Text" xml:space="preserve">
     <value>Export Bundles</value>
   </data>
@@ -1218,12 +1095,6 @@
   <data name="BundlesWidgetAddBundleErrorAlreadyExists" xml:space="preserve">
     <value>Bundle with the same name already exists!</value>
   </data>
-  <data name="BundlesWidgetAddBundleErrorInputEmpty" xml:space="preserve">
-    <value>Input field cannot be empty!</value>
-  </data>
-  <data name="BundleItemFlyouOpenInNewTabMenuItem.Text" xml:space="preserve">
-    <value>Open in new tab</value>
-  </data>
   <data name="BundleItemFlyouOpenItemLocationMenuItem.Text" xml:space="preserve">
     <value>Open item location</value>
   </data>
@@ -1272,7 +1143,7 @@
   <data name="PropertyItemName" xml:space="preserve">
     <value>Item Name</value>
   </data>
-  <data name="BaseLayoutContextFlyoutUnpinFromFavorites.Text" xml:space="preserve">
+  <data name="UnpinFromFavorites" xml:space="preserve">
     <value>Unpin from Favorites</value>
   </data>
   <data name="SidebarNetworkDrives" xml:space="preserve">
@@ -1422,12 +1293,6 @@
   <data name="UnpinItemFromStart.Text" xml:space="preserve">
     <value>Unpin from the Start Menu</value>
   </data>
-  <data name="ItemTypeLibrary" xml:space="preserve">
-    <value>Library</value>
-  </data>
-  <data name="LibraryItemAutomation" xml:space="preserve">
-    <value>Library</value>
-  </data>
   <data name="Library" xml:space="preserve">
     <value>Library</value>
   </data>
@@ -1437,9 +1302,6 @@
   <data name="SetAsDefaultSavePath" xml:space="preserve">
     <value>Set as default save path</value>
   </data>
-  <data name="LibraryLocationsButtonRemove.Label" xml:space="preserve">
-    <value>Remove</value>
-  </data>
   <data name="LibraryNoLocations.Text" xml:space="preserve">
     <value>No locations</value>
   </data>
@@ -1455,13 +1317,7 @@
   <data name="CreateLibraryErrorAlreadyExists" xml:space="preserve">
     <value>Library with the same name already exists!</value>
   </data>
-  <data name="DialogCreateLibraryButtonText" xml:space="preserve">
-    <value>Create</value>
-  </data>
-  <data name="DrivesWidgetOpenStorageSenseButton.ToolTipService.ToolTip" xml:space="preserve">
-    <value>Open Storage Sense</value>
-  </data>
-  <data name="DrivesWidgetOpenStorageSenseButton.AutomationProperties.Name" xml:space="preserve">
+  <data name="OpenStorageSense" xml:space="preserve">
     <value>Open Storage Sense</value>
   </data>
   <data name="Copy" xml:space="preserve">
@@ -1515,19 +1371,13 @@
   <data name="PropertyISO" xml:space="preserve">
     <value>ISO speed</value>
   </data>
-  <data name="SettingsPreferencesOpenFoldersNewTab.Title" xml:space="preserve">
-    <value>Open folders in new tab</value>
-  </data>
   <data name="SearchUnindexedItemsLabel.Text" xml:space="preserve">
     <value>Didn't find what you're looking for?</value>
   </data>
   <data name="SearchUnindexedItemsButton.Content" xml:space="preserve">
     <value>Search unindexed items</value>
   </data>
-  <data name="ConflictingItemsDialogItemOptionReplaceExisting.Text" xml:space="preserve">
-    <value>Replace existing</value>
-  </data>
-  <data name="ConflictingItemsDialogOptionReplaceExisting.Text" xml:space="preserve">
+  <data name="ReplaceExisting" xml:space="preserve">
     <value>Replace existing</value>
   </data>
   <data name="GenerateNewName" xml:space="preserve">
@@ -1569,30 +1419,18 @@
   <data name="DetailsViewHeaderFlyout_ShowDateDeleted.Text" xml:space="preserve">
     <value>Date deleted column</value>
   </data>
-  <data name="NavToolbarSortOptionsButton.ToolTipService.ToolTip" xml:space="preserve">
-    <value>Sort</value>
-  </data>
-  <data name="NavToolbarSortOptionsButton.AutomationProperties.Name" xml:space="preserve">
-    <value>Sort</value>
-  </data>
-  <data name="NavToolbarSortOptionsButton.Label" xml:space="preserve">
+  <data name="Sort" xml:space="preserve">
     <value>Sort</value>
   </data>
   <data name="NavToolbarGroupByRadioButtons.Text" xml:space="preserve">
     <value>Group By</value>
   </data>
-  <data name="NavToolbarArrangementOptionName.Text" xml:space="preserve">
-    <value>Name</value>
-  </data>
   <data name="DateModifiedLowerCase" xml:space="preserve">
     <value>Date modified</value>
   </data>
   <data name="NavToolbarArrangementOptionOriginalFolder.Text" xml:space="preserve">
     <value>Original folder</value>
   </data>
-  <data name="NavToolbarArrangementOptionType.Text" xml:space="preserve">
-    <value>Type</value>
-  </data>
   <data name="NavToolbarSortByRadioButtons.Text" xml:space="preserve">
     <value>Sort By</value>
   </data>
@@ -1650,7 +1488,7 @@
   <data name="HorizontalMultitaskingControlReopenClosedTab.Text" xml:space="preserve">
     <value>Reopen closed tab</value>
   </data>
-  <data name="RenameFileDialogTitle" xml:space="preserve">
+  <data name="Rename" xml:space="preserve">
     <value>Rename</value>
   </data>
   <data name="Privacy" xml:space="preserve">
@@ -1818,12 +1656,6 @@
   <data name="DecompressArchiveDialogOpenDestinationWhenComplete.Content" xml:space="preserve">
     <value>Open destination folder when complete</value>
   </data>
-  <data name="BaseLayoutItemContextFlyoutExtractFilesOption" xml:space="preserve">
-    <value>Extract files</value>
-  </data>
-  <data name="BaseLayoutItemContextFlyoutExtractHereOption" xml:space="preserve">
-    <value>Extract here</value>
-  </data>
   <data name="BaseLayoutItemContextFlyoutExtractToChildFolder" xml:space="preserve">
     <value>Extract to {0}\</value>
   </data>
@@ -1833,9 +1665,6 @@
   <data name="SideBarRestoreLibraries.Text" xml:space="preserve">
     <value>Restore default libraries</value>
   </data>
-  <data name="DialogRestoreLibrariesButtonText" xml:space="preserve">
-    <value>Restore</value>
-  </data>
   <data name="DialogRestoreLibrariesSubtitleText" xml:space="preserve">
     <value>Are you sure you want to restore the default libraries? All your files will remain on your storage.</value>
   </data>
@@ -1875,9 +1704,6 @@
   <data name="SecurityAdvancedPermissionsLabel.Text" xml:space="preserve">
     <value>Permissions</value>
   </data>
-  <data name="SecurityAdvancedTypeLabel.Text" xml:space="preserve">
-    <value>Type</value>
-  </data>
   <data name="SecurityAdvancedCannotReadProperties.Text" xml:space="preserve">
     <value>You do not have permissions to view the security properties of this object. You can try to take ownership of this object.</value>
   </data>
@@ -2004,9 +1830,6 @@
   <data name="SideBarHideSectionFromSideBar.Text" xml:space="preserve">
     <value>Hide {0} section</value>
   </data>
-  <data name="NavSettingsButton" xml:space="preserve">
-    <value>Settings</value>
-  </data>
   <data name="AddFile" xml:space="preserve">
     <value>Add file</value>
   </data>
@@ -2085,12 +1908,9 @@
   <data name="BaseLayoutItemContextFlyoutOpenParentFolder.Text" xml:space="preserve">
     <value>Open parent folder</value>
   </data>
-  <data name="FileTagUnknown" xml:space="preserve">
+  <data name="Unknown" xml:space="preserve">
     <value>Unknown</value>
   </data>
-  <data name="DetailsViewHeaderFlyout_ShowFileTag.Text" xml:space="preserve">
-    <value>Tag</value>
-  </data>
   <data name="SettingsEditFileTagsExpander.Title" xml:space="preserve">
     <value>Edit tags</value>
   </data>
@@ -2106,7 +1926,7 @@
   <data name="InsertDiscDialog.Title" xml:space="preserve">
     <value>Insert a disc</value>
   </data>
-  <data name="AskCredentialDialog.PrimaryButtonText" xml:space="preserve">
+  <data name="OK" xml:space="preserve">
     <value>OK</value>
   </data>
   <data name="AskCredentialDialog.Title" xml:space="preserve">
@@ -2118,9 +1938,6 @@
   <data name="CredentialDialogDescription.Text" xml:space="preserve">
     <value>Provide your credential:</value>
   </data>
-  <data name="CredentialDialogPassword.PlaceholderText" xml:space="preserve">
-    <value>Password</value>
-  </data>
   <data name="CredentialDialogUserName.PlaceholderText" xml:space="preserve">
     <value>UserName</value>
   </data>
@@ -2160,12 +1977,9 @@
   <data name="Tiles" xml:space="preserve">
     <value>Tiles</value>
   </data>
-  <data name="SettingsOpenFoldersNewTabToggleSwitch.AutomationProperties.Name" xml:space="preserve">
+  <data name="OpenFoldersInNewTab" xml:space="preserve">
     <value>Open folders in new tab</value>
   </data>
-  <data name="SettingsPreferencesAppLanguageComboBox.AutomationProperties.Name" xml:space="preserve">
-    <value>Language</value>
-  </data>
   <data name="OngoingTasks" xml:space="preserve">
     <value>Ongoing Tasks</value>
   </data>
@@ -2547,7 +2361,7 @@
   <data name="RestoreAllItems" xml:space="preserve">
     <value>Restore All Items</value>
   </data>
-  <data name="RestoreSelection" xml:space="preserve">
+  <data name="Restore" xml:space="preserve">
     <value>Restore</value>
   </data>
   <data name="ShortcutCannotBeOpened" xml:space="preserve">
@@ -2694,9 +2508,6 @@
   <data name="ViewMore" xml:space="preserve">
     <value>View more</value>
   </data>
-  <data name="ToolTipDescriptionSize" xml:space="preserve">
-    <value>Size:</value>
-  </data>
   <data name="BundlesBeingRemovedMessage" xml:space="preserve">
     <value>But don't worry, we built a fantastic replacement that's more reliable and has more features. You can enable the File Tags widget from Settings &gt; Preferences &gt; Widgets. Enabling the tags widget will automatically turn off the bundles widget.</value>
   </data>
diff --git a/src/Files.App/UserControls/AddressToolbar.xaml b/src/Files.App/UserControls/AddressToolbar.xaml
index 225d8d087b2f..a209a798bec4 100644
--- a/src/Files.App/UserControls/AddressToolbar.xaml
+++ b/src/Files.App/UserControls/AddressToolbar.xaml
@@ -199,7 +199,7 @@
 				<Button
 					x:Name="SearchButton"
 					AccessKey="I"
-					AutomationProperties.Name="{helpers:ResourceString Name=NavSearchButton/AutomationProperties/Name}"
+					AutomationProperties.Name="{helpers:ResourceString Name=Search}"
 					Click="SearchButton_Click"
 					Style="{StaticResource AddressToolbarButtonStyle}"
 					ToolTipService.ToolTip="{helpers:ResourceString Name=NavSearchButton/ToolTipService/ToolTip}"
@@ -306,10 +306,10 @@
 					x:Name="SettingsButton"
 					AccessKey="I"
 					AutomationProperties.AutomationId="SettingsButton"
-					AutomationProperties.Name="{helpers:ResourceString Name=NavSettingsButton}"
+					AutomationProperties.Name="{helpers:ResourceString Name=Settings}"
 					Command="{x:Bind SettingsButtonCommand, Mode=OneWay}"
 					Style="{StaticResource AddressToolbarButtonStyle}"
-					ToolTipService.ToolTip="{helpers:ResourceString Name=NavSettingsButton}"
+					ToolTipService.ToolTip="{helpers:ResourceString Name=Settings}"
 					Visibility="{x:Bind ShowSettingsButton, Mode=OneWay}">
 					<AnimatedIcon x:Name="SettingAnimatedIcon" Height="16">
 						<AnimatedIcon.Source>
diff --git a/src/Files.App/UserControls/InnerNavigationToolbar.xaml b/src/Files.App/UserControls/InnerNavigationToolbar.xaml
index 57156f9fdc38..249acf06e21d 100644
--- a/src/Files.App/UserControls/InnerNavigationToolbar.xaml
+++ b/src/Files.App/UserControls/InnerNavigationToolbar.xaml
@@ -79,7 +79,7 @@
 								Command="{x:Bind ViewModel.CreateNewFileCommand, Mode=OneWay}"
 								CommandParameter="{x:Null}"
 								IsEnabled="{x:Bind ViewModel.InstanceViewModel.CanCreateFileInPage, Mode=OneWay}"
-								Text="{helpers:ResourceString Name=BaseLayoutContextFlyoutNewFile/Text}">
+								Text="{helpers:ResourceString Name=File}">
 								<MenuFlyoutItem.Icon>
 									<FontIcon Glyph="&#xE7C3;" />
 								</MenuFlyoutItem.Icon>
@@ -135,9 +135,9 @@
 					AutomationProperties.AutomationId="InnerNavigationToolbarPasteButton"
 					Command="{x:Bind ViewModel.PasteItemsFromClipboardCommand, Mode=OneWay}"
 					IsEnabled="{x:Bind converters:MultiBooleanConverter.AndConvert(ViewModel.InstanceViewModel.CanPasteInPage, local1:App.AppModel.IsPasteEnabled), Mode=OneWay, FallbackValue=False}"
-					Label="{helpers:ResourceString Name=NavigationToolbarPaste/Label}"
+					Label="{helpers:ResourceString Name=Paste}"
 					LabelPosition="Collapsed"
-					ToolTipService.ToolTip="{helpers:ResourceString Name=BaseLayoutContextFlyoutPaste/Text}">
+					ToolTipService.ToolTip="{helpers:ResourceString Name=Paste}">
 					<AppBarButton.KeyboardAccelerators>
 						<KeyboardAccelerator
 							Key="V"
@@ -155,9 +155,9 @@
 					AutomationProperties.AutomationId="InnerNavigationToolbarRenameButton"
 					Command="{x:Bind ViewModel.Rename, Mode=OneWay}"
 					IsEnabled="{x:Bind converters:MultiBooleanConverter.AndConvert(ViewModel.CanRename, ViewModel.InstanceViewModel.IsPageTypeNotHome), Mode=OneWay, FallbackValue=False}"
-					Label="{helpers:ResourceString Name=BaseLayoutItemContextFlyoutRename/Text}"
+					Label="{helpers:ResourceString Name=Rename}"
 					LabelPosition="Collapsed"
-					ToolTipService.ToolTip="{helpers:ResourceString Name=BaseLayoutItemContextFlyoutRename/Text}">
+					ToolTipService.ToolTip="{helpers:ResourceString Name=Rename}">
 
 					<local:OpacityIcon Style="{StaticResource ColorIconRename}" />
 				</AppBarButton>
@@ -192,12 +192,12 @@
 					Width="Auto"
 					MinWidth="40"
 					AccessKey="O"
-					AutomationProperties.Name="{helpers:ResourceString Name=PropertiesTitle}"
+					AutomationProperties.Name="{helpers:ResourceString Name=Properties}"
 					Command="{x:Bind ViewModel.PropertiesCommand, Mode=OneWay}"
 					IsEnabled="{x:Bind converters:MultiBooleanConverter.AndConvert(ViewModel.CanViewProperties, ViewModel.InstanceViewModel.IsPageTypeNotHome), Mode=OneWay, FallbackValue=False}"
-					Label="{helpers:ResourceString Name=PropertiesTitle}"
+					Label="{helpers:ResourceString Name=Properties}"
 					LabelPosition="Collapsed"
-					ToolTipService.ToolTip="{helpers:ResourceString Name=PropertiesTitle}">
+					ToolTipService.ToolTip="{helpers:ResourceString Name=Properties}">
 
 					<local:OpacityIcon Style="{StaticResource ColorIconProperties}" />
 				</AppBarButton>
@@ -230,8 +230,8 @@
 					AccessKey="R"
 					Command="{x:Bind ViewModel.RestoreSelectionRecycleBinCommand, Mode=OneWay}"
 					IsEnabled="{x:Bind ViewModel.CanRestoreSelectionRecycleBin, Mode=OneWay}"
-					Label="{helpers:ResourceString Name=RestoreSelection}"
-					ToolTipService.ToolTip="{helpers:ResourceString Name=RestoreSelection}"
+					Label="{helpers:ResourceString Name=Restore}"
+					ToolTipService.ToolTip="{helpers:ResourceString Name=Restore}"
 					Visibility="{x:Bind ViewModel.CanRestoreSelectionRecycleBin, Mode=OneWay}">
 					<AppBarButton.Icon>
 						<FontIcon Glyph="&#xE777;" />
@@ -417,11 +417,11 @@
 				MinWidth="40"
 				x:Load="{x:Bind ViewModel.InstanceViewModel.IsPageTypeNotHome, Mode=OneWay}"
 				AccessKey="S"
-				AutomationProperties.Name="{helpers:ResourceString Name=NavToolbarSelectionOptions/AutomationProperties/Name}"
+				AutomationProperties.Name="{helpers:ResourceString Name=SelectionOptions}"
 				Label="{helpers:ResourceString Name=NavToolbarSelectionOptions/Label}"
 				LabelPosition="Collapsed"
 				Style="{StaticResource ToolBarAppBarButtonFlyoutStyle}"
-				ToolTipService.ToolTip="{helpers:ResourceString Name=NavToolbarSelectionOptions/ToolTipService/ToolTip}">
+				ToolTipService.ToolTip="{helpers:ResourceString Name=SelectionOptions}">
 				<AppBarButton.Flyout>
 					<MenuFlyout Placement="Bottom">
 						<MenuFlyoutItem
@@ -465,21 +465,21 @@
 				MinWidth="40"
 				x:Load="{x:Bind ViewModel.InstanceViewModel.IsPageTypeNotHome, Mode=OneWay}"
 				AccessKey="A"
-				AutomationProperties.Name="{helpers:ResourceString Name=NavToolbarSortOptionsButton/AutomationProperties/Name}"
-				Label="{helpers:ResourceString Name=NavToolbarSortOptionsButton/Label}"
+				AutomationProperties.Name="{helpers:ResourceString Name=Sort}"
+				Label="{helpers:ResourceString Name=Sort}"
 				LabelPosition="Collapsed"
 				Style="{StaticResource ToolBarAppBarButtonFlyoutStyle}"
-				ToolTipService.ToolTip="{helpers:ResourceString Name=NavToolbarSortOptionsButton/ToolTipService/ToolTip}">
+				ToolTipService.ToolTip="{helpers:ResourceString Name=Sort}">
 
 				<local:OpacityIcon Style="{StaticResource ColorIconSort}" />
 				<AppBarButton.Flyout>
 					<MenuFlyout contract8Present:ShouldConstrainToRootBounds="False" Placement="Bottom">
 						<MenuFlyoutSubItem Text="{helpers:ResourceString Name=NavToolbarSortByRadioButtons/Text}">
-							<ToggleMenuFlyoutItem IsChecked="{x:Bind ViewModel.IsSortedByName, Mode=TwoWay}" Text="{helpers:ResourceString Name=NavToolbarArrangementOptionName/Text}" />
+							<ToggleMenuFlyoutItem IsChecked="{x:Bind ViewModel.IsSortedByName, Mode=TwoWay}" Text="{helpers:ResourceString Name=Name}" />
 							<ToggleMenuFlyoutItem IsChecked="{x:Bind ViewModel.IsSortedByDateModified, Mode=TwoWay}" Text="{helpers:ResourceString Name=DateModifiedLowerCase}" />
 							<ToggleMenuFlyoutItem IsChecked="{x:Bind ViewModel.IsSortedByDateCreated, Mode=TwoWay}" Text="{helpers:ResourceString Name=DateCreated}" />
 							<ToggleMenuFlyoutItem IsChecked="{x:Bind ViewModel.IsSortedBySize, Mode=TwoWay}" Text="{helpers:ResourceString Name=Size}" />
-							<ToggleMenuFlyoutItem IsChecked="{x:Bind ViewModel.IsSortedByType, Mode=TwoWay}" Text="{helpers:ResourceString Name=NavToolbarArrangementOptionType/Text}" />
+							<ToggleMenuFlyoutItem IsChecked="{x:Bind ViewModel.IsSortedByType, Mode=TwoWay}" Text="{helpers:ResourceString Name=Type}" />
 							<ToggleMenuFlyoutItem
 								IsChecked="{x:Bind ViewModel.IsSortedBySyncStatus, Mode=TwoWay}"
 								IsEnabled="{x:Bind ViewModel.InstanceViewModel.IsPageTypeCloudDrive, Mode=OneWay}"
@@ -499,11 +499,11 @@
 						</MenuFlyoutSubItem>
 						<MenuFlyoutSubItem Text="{helpers:ResourceString Name=NavToolbarGroupByRadioButtons/Text}">
 							<ToggleMenuFlyoutItem IsChecked="{x:Bind ViewModel.IsGroupedByNone, Mode=TwoWay}" Text="{helpers:ResourceString Name=None}" />
-							<ToggleMenuFlyoutItem IsChecked="{x:Bind ViewModel.IsGroupedByName, Mode=TwoWay}" Text="{helpers:ResourceString Name=NavToolbarArrangementOptionName/Text}" />
+							<ToggleMenuFlyoutItem IsChecked="{x:Bind ViewModel.IsGroupedByName, Mode=TwoWay}" Text="{helpers:ResourceString Name=Name}" />
 							<ToggleMenuFlyoutItem IsChecked="{x:Bind ViewModel.IsGroupedByDateModified, Mode=TwoWay}" Text="{helpers:ResourceString Name=DateModifiedLowerCase}" />
 							<ToggleMenuFlyoutItem IsChecked="{x:Bind ViewModel.IsGroupedByDateCreated, Mode=TwoWay}" Text="{helpers:ResourceString Name=DateCreated}" />
 							<ToggleMenuFlyoutItem IsChecked="{x:Bind ViewModel.IsGroupedBySize, Mode=TwoWay}" Text="{helpers:ResourceString Name=Size}" />
-							<ToggleMenuFlyoutItem IsChecked="{x:Bind ViewModel.IsGroupedByType, Mode=TwoWay}" Text="{helpers:ResourceString Name=NavToolbarArrangementOptionType/Text}" />
+							<ToggleMenuFlyoutItem IsChecked="{x:Bind ViewModel.IsGroupedByType, Mode=TwoWay}" Text="{helpers:ResourceString Name=Type}" />
 							<ToggleMenuFlyoutItem
 								IsChecked="{x:Bind ViewModel.IsGroupedBySyncStatus, Mode=TwoWay}"
 								IsEnabled="{x:Bind ViewModel.InstanceViewModel.IsPageTypeCloudDrive, Mode=OneWay}"
@@ -542,18 +542,18 @@
 				MinWidth="40"
 				x:Load="{x:Bind ViewModel.InstanceViewModel.IsPageTypeNotHome, Mode=OneWay}"
 				AccessKey="L"
-				AutomationProperties.Name="{helpers:ResourceString Name=NavToolbarLayoutOptionsButton/AutomationProperties/Name}"
-				Label="{helpers:ResourceString Name=NavToolbarLayoutOptionsButton/Label}"
+				AutomationProperties.Name="{helpers:ResourceString Name=Layout}"
+				Label="{helpers:ResourceString Name=Layout}"
 				LabelPosition="Collapsed"
 				Style="{StaticResource ToolBarAppBarButtonFlyoutStyle}"
-				ToolTipService.ToolTip="{helpers:ResourceString Name=NavToolbarLayoutOptionsButton/ToolTipService/ToolTip}">
+				ToolTipService.ToolTip="{helpers:ResourceString Name=Layout}">
 				<AppBarButton.Icon>
 					<FontIcon FontSize="10" Glyph="&#xE152;" />
 				</AppBarButton.Icon>
 				<AppBarButton.Flyout>
 					<Flyout contract8Present:ShouldConstrainToRootBounds="False" Placement="Bottom">
 						<StackPanel Spacing="12">
-							<TextBlock FontWeight="Medium" Text="{helpers:ResourceString Name=NavToolbarLayout/Text}" />
+							<TextBlock FontWeight="Medium" Text="{helpers:ResourceString Name=Layout}" />
 
 							<Grid ColumnSpacing="8" RowSpacing="8">
 								<Grid.RowDefinitions>
@@ -633,7 +633,7 @@
 									Padding="0"
 									HorizontalContentAlignment="Center"
 									VerticalContentAlignment="Center"
-									AutomationProperties.Name="{helpers:ResourceString Name=NavToolbarSmallIcons/AutomationProperties/Name}"
+									AutomationProperties.Name="{helpers:ResourceString Name=SmallIcons}"
 									Command="{x:Bind ViewModel.InstanceViewModel.FolderSettings.ToggleLayoutModeGridViewSmallCommand, Mode=OneWay}"
 									CommandParameter="{xh:SystemTypeToXaml Bool=True}"
 									CornerRadius="{StaticResource ControlCornerRadius}"
@@ -660,7 +660,7 @@
 									Padding="0"
 									HorizontalContentAlignment="Center"
 									VerticalContentAlignment="Center"
-									AutomationProperties.Name="{helpers:ResourceString Name=NavToolbarMediumIcons/AutomationProperties/Name}"
+									AutomationProperties.Name="{helpers:ResourceString Name=MediumIcons}"
 									Command="{x:Bind ViewModel.InstanceViewModel.FolderSettings.ToggleLayoutModeGridViewMediumCommand, Mode=OneWay}"
 									CommandParameter="{xh:SystemTypeToXaml Bool=True}"
 									CornerRadius="{StaticResource ControlCornerRadius}"
@@ -696,7 +696,7 @@
 									Padding="0"
 									HorizontalContentAlignment="Center"
 									VerticalContentAlignment="Center"
-									AutomationProperties.Name="{helpers:ResourceString Name=NavToolbarLargeIcons/AutomationProperties/Name}"
+									AutomationProperties.Name="{helpers:ResourceString Name=LargeIcons}"
 									Command="{x:Bind ViewModel.InstanceViewModel.FolderSettings.ToggleLayoutModeGridViewLargeCommand, Mode=OneWay}"
 									CommandParameter="{xh:SystemTypeToXaml Bool=True}"
 									CornerRadius="{StaticResource ControlCornerRadius}"
diff --git a/src/Files.App/UserControls/SearchBox.xaml b/src/Files.App/UserControls/SearchBox.xaml
index 3ee489a6452a..2d6916ac06c0 100644
--- a/src/Files.App/UserControls/SearchBox.xaml
+++ b/src/Files.App/UserControls/SearchBox.xaml
@@ -78,7 +78,7 @@
 		ItemTemplate="{StaticResource SuggestionTemplate}"
 		ItemsSource="{x:Bind SearchBoxViewModel.Suggestions, Mode=OneWay}"
 		KeyDown="SearchRegion_KeyDown"
-		PlaceholderText="{helpers:ResourceString Name=NavigationToolbarSearchRegion/PlaceholderText}"
+		PlaceholderText="{helpers:ResourceString Name=Search}"
 		QuerySubmitted="SearchRegion_QuerySubmitted"
 		Text="{x:Bind SearchBoxViewModel.Query, Mode=TwoWay}"
 		TextBoxStyle="{StaticResource TextBoxStyle}"
diff --git a/src/Files.App/UserControls/SidebarControl.xaml.cs b/src/Files.App/UserControls/SidebarControl.xaml.cs
index 443350d50ecc..a76c02674cda 100644
--- a/src/Files.App/UserControls/SidebarControl.xaml.cs
+++ b/src/Files.App/UserControls/SidebarControl.xaml.cs
@@ -212,7 +212,7 @@ private List<ContextMenuFlyoutItemViewModel> GetLocationItemMenuItems(INavigatio
 				},
 				new ContextMenuFlyoutItemViewModel()
 				{
-					Text = "SideBarOpenInNewTab/Text".GetLocalizedResource(),
+					Text = "OpenInNewTab".GetLocalizedResource(),
 					Glyph = "\uF113",
 					GlyphFontFamilyName = "CustomGlyph",
 					Command = OpenInNewTabCommand,
@@ -220,7 +220,7 @@ private List<ContextMenuFlyoutItemViewModel> GetLocationItemMenuItems(INavigatio
 				},
 				new ContextMenuFlyoutItemViewModel()
 				{
-					Text = "SideBarOpenInNewWindow/Text".GetLocalizedResource(),
+					Text = "OpenInNewWindow".GetLocalizedResource(),
 					Glyph = "\uE737",
 					Command = OpenInNewWindowCommand,
 					ShowItem = options.IsLocationItem && userSettingsService.PreferencesSettingsService.ShowOpenInNewTab
@@ -246,7 +246,7 @@ private List<ContextMenuFlyoutItemViewModel> GetLocationItemMenuItems(INavigatio
 				},
 				new ContextMenuFlyoutItemViewModel()
 				{
-					Text = "SideBarUnpinFromFavorites/Text".GetLocalizedResource(),
+					Text = "UnpinFromFavorites".GetLocalizedResource(),
 					Glyph = "\uE77A",
 					Command = UnpinItemCommand,
 					ShowItem = options.ShowUnpinItem || isDriveItemPinned
@@ -275,7 +275,7 @@ private List<ContextMenuFlyoutItemViewModel> GetLocationItemMenuItems(INavigatio
 				},
 				new ContextMenuFlyoutItemViewModel()
 				{
-					Text = "BaseLayoutContextFlyoutPropertiesFolder/Text".GetLocalizedResource(),
+					Text = "Properties".GetLocalizedResource(),
 					Glyph = "\uE946",
 					Command = OpenPropertiesCommand,
 					CommandParameter = menu,
@@ -702,7 +702,7 @@ private async void NavigationViewDriveItem_DragOver(object sender, DragEventArgs
 			var storageItems = await FilesystemHelpers.GetDraggedStorageItems(e.DataView);
 			var hasStorageItems = storageItems.Any();
 
-			if ("DriveCapacityUnknown".GetLocalizedResource().Equals(driveItem.SpaceText, StringComparison.OrdinalIgnoreCase) ||
+			if ("Unknown".GetLocalizedResource().Equals(driveItem.SpaceText, StringComparison.OrdinalIgnoreCase) ||
 				(hasStorageItems && storageItems.AreItemsAlreadyInFolder(driveItem.Path)))
 			{
 				e.AcceptedOperation = DataPackageOperation.None;
diff --git a/src/Files.App/UserControls/Widgets/BundlesWidget.xaml b/src/Files.App/UserControls/Widgets/BundlesWidget.xaml
index 3249fe5cbb48..8dca32a5e3ba 100644
--- a/src/Files.App/UserControls/Widgets/BundlesWidget.xaml
+++ b/src/Files.App/UserControls/Widgets/BundlesWidget.xaml
@@ -49,7 +49,7 @@
 				AutomationProperties.Name="{helpers:ResourceString Name=BundlesWidgetMoreOptionsButton/AutomationProperties/Name}"
 				Background="Transparent"
 				BorderBrush="Transparent"
-				ToolTipService.ToolTip="{helpers:ResourceString Name=BundlesWidgetMoreOptionsButton/ToolTipService/ToolTip}">
+				ToolTipService.ToolTip="{helpers:ResourceString Name=MoreOptions}">
 
 				<FontIcon
 					HorizontalAlignment="Center"
@@ -305,7 +305,7 @@
 															x:Name="OpenInNewTab"
 															x:Load="{x:Bind OpenInNewTabLoad, Mode=OneWay}"
 															Command="{x:Bind OpenInNewTabCommand}"
-															Text="{helpers:ResourceString Name=BundleItemFlyouOpenInNewTabMenuItem/Text}">
+															Text="{helpers:ResourceString Name=OpenInNewTab}">
 															<MenuFlyoutItem.Icon>
 																<FontIcon FontFamily="{StaticResource CustomGlyph}" Glyph="&#xF106;" />
 															</MenuFlyoutItem.Icon>
diff --git a/src/Files.App/UserControls/Widgets/DrivesWidget.xaml b/src/Files.App/UserControls/Widgets/DrivesWidget.xaml
index f0b6a3bcb824..22435dabd488 100644
--- a/src/Files.App/UserControls/Widgets/DrivesWidget.xaml
+++ b/src/Files.App/UserControls/Widgets/DrivesWidget.xaml
@@ -96,12 +96,12 @@
 								HorizontalContentAlignment="Center"
 								VerticalContentAlignment="Center"
 								x:Load="{x:Bind Item.ShowStorageSense, Mode=OneWay}"
-								AutomationProperties.Name="{helpers:ResourceString Name=DrivesWidgetOpenStorageSenseButton/AutomationProperties/Name}"
+								AutomationProperties.Name="{helpers:ResourceString Name=OpenStorageSense}"
 								Background="Transparent"
 								BorderBrush="Transparent"
 								Click="GoToStorageSense_Click"
 								Tag="{x:Bind Item.Path}"
-								ToolTipService.ToolTip="{helpers:ResourceString Name=DrivesWidgetOpenStorageSenseButton/ToolTipService/ToolTip}">
+								ToolTipService.ToolTip="{helpers:ResourceString Name=OpenStorageSense}">
 								<FontIcon
 									HorizontalAlignment="Center"
 									VerticalAlignment="Center"
diff --git a/src/Files.App/UserControls/Widgets/DrivesWidget.xaml.cs b/src/Files.App/UserControls/Widgets/DrivesWidget.xaml.cs
index 6254f267b3dd..4e38611f31c0 100644
--- a/src/Files.App/UserControls/Widgets/DrivesWidget.xaml.cs
+++ b/src/Files.App/UserControls/Widgets/DrivesWidget.xaml.cs
@@ -150,7 +150,7 @@ public override List<ContextMenuFlyoutItemViewModel> GetItemMenuItems(WidgetCard
 			{
 				new ContextMenuFlyoutItemViewModel()
 				{
-					Text = "SideBarOpenInNewTab/Text".GetLocalizedResource(),
+					Text = "OpenInNewTab".GetLocalizedResource(),
 					Glyph = "\uF113",
 					GlyphFontFamilyName = "CustomGlyph",
 					Command = OpenInNewTabCommand,
@@ -159,7 +159,7 @@ public override List<ContextMenuFlyoutItemViewModel> GetItemMenuItems(WidgetCard
 				},
 				new ContextMenuFlyoutItemViewModel()
 				{
-					Text = "SideBarOpenInNewWindow/Text".GetLocalizedResource(),
+					Text = "OpenInNewWindow".GetLocalizedResource(),
 					Glyph = "\uE737",
 					Command = OpenInNewWindowCommand,
 					CommandParameter = item,
@@ -188,7 +188,7 @@ public override List<ContextMenuFlyoutItemViewModel> GetItemMenuItems(WidgetCard
 				},
 				new ContextMenuFlyoutItemViewModel()
 				{
-					Text = "SideBarUnpinFromFavorites/Text".GetLocalizedResource(),
+					Text = "UnpinFromFavorites".GetLocalizedResource(),
 					Glyph = "\uE77A",
 					Command = UnpinFromFavoritesCommand,
 					CommandParameter = item,
@@ -212,7 +212,7 @@ public override List<ContextMenuFlyoutItemViewModel> GetItemMenuItems(WidgetCard
 				},
 				new ContextMenuFlyoutItemViewModel()
 				{
-					Text = "BaseLayoutContextFlyoutPropertiesFolder/Text".GetLocalizedResource(),
+					Text = "Properties".GetLocalizedResource(),
 					Glyph = "\uE946",
 					Command = OpenPropertiesCommand,
 					CommandParameter = item
diff --git a/src/Files.App/UserControls/Widgets/QuickAccessWidget.xaml.cs b/src/Files.App/UserControls/Widgets/QuickAccessWidget.xaml.cs
index 9c17cc21cda8..e6de58036fe4 100644
--- a/src/Files.App/UserControls/Widgets/QuickAccessWidget.xaml.cs
+++ b/src/Files.App/UserControls/Widgets/QuickAccessWidget.xaml.cs
@@ -158,7 +158,7 @@ public override List<ContextMenuFlyoutItemViewModel> GetItemMenuItems(WidgetCard
 			{				
 				new ContextMenuFlyoutItemViewModel()
 				{
-					Text = "SideBarOpenInNewTab/Text".GetLocalizedResource(),
+					Text = "OpenInNewTab".GetLocalizedResource(),
 					Glyph = "\uF113",
 					GlyphFontFamilyName = "CustomGlyph",
 					Command = OpenInNewTabCommand,
@@ -167,7 +167,7 @@ public override List<ContextMenuFlyoutItemViewModel> GetItemMenuItems(WidgetCard
 				},
 				new ContextMenuFlyoutItemViewModel()
 				{
-					Text = "SideBarOpenInNewWindow/Text".GetLocalizedResource(),
+					Text = "OpenInNewWindow".GetLocalizedResource(),
 					Glyph = "\uE737",
 					Command = OpenInNewWindowCommand,
 					CommandParameter = item,
@@ -196,7 +196,7 @@ public override List<ContextMenuFlyoutItemViewModel> GetItemMenuItems(WidgetCard
 				},
 				new ContextMenuFlyoutItemViewModel()
 				{
-					Text = "SideBarUnpinFromFavorites/Text".GetLocalizedResource(),
+					Text = "UnpinFromFavorites".GetLocalizedResource(),
 					Glyph = "\uE77A",
 					Command = UnpinFromFavoritesCommand,
 					CommandParameter = item,
@@ -204,7 +204,7 @@ public override List<ContextMenuFlyoutItemViewModel> GetItemMenuItems(WidgetCard
 				},
 				new ContextMenuFlyoutItemViewModel()
 				{
-					Text = "BaseLayoutContextFlyoutPropertiesFolder/Text".GetLocalizedResource(),
+					Text = "Properties".GetLocalizedResource(),
 					Glyph = "\uE946",
 					Command = OpenPropertiesCommand,
 					CommandParameter = item
diff --git a/src/Files.App/UserControls/Widgets/RecentFilesWidget.xaml.cs b/src/Files.App/UserControls/Widgets/RecentFilesWidget.xaml.cs
index 5a28676d189e..029e0dd361bd 100644
--- a/src/Files.App/UserControls/Widgets/RecentFilesWidget.xaml.cs
+++ b/src/Files.App/UserControls/Widgets/RecentFilesWidget.xaml.cs
@@ -153,7 +153,7 @@ public override List<ContextMenuFlyoutItemViewModel> GetItemMenuItems(WidgetCard
 				},
 				new ContextMenuFlyoutItemViewModel()
 				{
-					Text = "RecentItemOpenFileLocation/Text".GetLocalizedResource(),
+					Text = "OpenFileLocation".GetLocalizedResource(),
 					Glyph = "\uED25",
 					Command = OpenFileLocationCommand,
 					CommandParameter = item
diff --git a/src/Files.App/ViewModels/Properties/FileProperties.cs b/src/Files.App/ViewModels/Properties/FileProperties.cs
index 7201cfea8d6c..4c5b07b82cc1 100644
--- a/src/Files.App/ViewModels/Properties/FileProperties.cs
+++ b/src/Files.App/ViewModels/Properties/FileProperties.cs
@@ -68,7 +68,7 @@ public override void GetBaseProperties()
 				FileExtensionHelpers.IsMsiFile(shortcutItem.TargetPath);
 
 			ViewModel.ShortcutItemType = isApplication ? "Application".GetLocalizedResource() :
-				Item.IsLinkItem ? "PropertiesShortcutTypeLink".GetLocalizedResource() : "PropertiesShortcutTypeFile".GetLocalizedResource();
+				Item.IsLinkItem ? "PropertiesShortcutTypeLink".GetLocalizedResource() : "File".GetLocalizedResource();
 			ViewModel.ShortcutItemPath = shortcutItem.TargetPath;
 			ViewModel.IsShortcutItemPathReadOnly = shortcutItem.IsSymLink;
 			ViewModel.ShortcutItemWorkingDir = shortcutItem.WorkingDirectory;
diff --git a/src/Files.App/ViewModels/Widgets/Bundles/BundleContainerViewModel.cs b/src/Files.App/ViewModels/Widgets/Bundles/BundleContainerViewModel.cs
index 6c0226d76dde..df7124374637 100644
--- a/src/Files.App/ViewModels/Widgets/Bundles/BundleContainerViewModel.cs
+++ b/src/Files.App/ViewModels/Widgets/Bundles/BundleContainerViewModel.cs
@@ -538,7 +538,7 @@ public async Task<BundleContainerViewModel> SetBundleItems(IEnumerable<BundleIte
 		{
 			if (string.IsNullOrWhiteSpace(name))
 			{
-				return (false, "BundlesWidgetAddBundleErrorInputEmpty".GetLocalizedResource());
+				return (false, "ErrorInputEmpty".GetLocalizedResource());
 			}
 
 			if (!BundlesSettingsService.SavedBundles.Any((item) => item.Key == name))
diff --git a/src/Files.App/ViewModels/Widgets/Bundles/BundlesViewModel.cs b/src/Files.App/ViewModels/Widgets/Bundles/BundlesViewModel.cs
index 0eeebdcc92d0..87177e7fd93e 100644
--- a/src/Files.App/ViewModels/Widgets/Bundles/BundlesViewModel.cs
+++ b/src/Files.App/ViewModels/Widgets/Bundles/BundlesViewModel.cs
@@ -431,8 +431,8 @@ public Task Initialize()
 		{
 			if (string.IsNullOrWhiteSpace(name))
 			{
-				AddBundleErrorText = "BundlesWidgetAddBundleErrorInputEmpty".GetLocalizedResource();
-				return (false, "BundlesWidgetAddBundleErrorInputEmpty".GetLocalizedResource());
+				AddBundleErrorText = "ErrorInputEmpty".GetLocalizedResource();
+				return (false, "ErrorInputEmpty".GetLocalizedResource());
 			}
 
 			if (!Items.Any((item) => item.BundleName == name))
diff --git a/src/Files.App/Views/LayoutModes/ColumnViewBase.xaml b/src/Files.App/Views/LayoutModes/ColumnViewBase.xaml
index 1ba04483b0d7..e5526a3f8016 100644
--- a/src/Files.App/Views/LayoutModes/ColumnViewBase.xaml
+++ b/src/Files.App/Views/LayoutModes/ColumnViewBase.xaml
@@ -132,7 +132,7 @@
 		<TeachingTip
 			x:Name="FileNameTeachingTip"
 			Grid.RowSpan="2"
-			CloseButtonContent="{helpers:ResourceString Name=FileNameTeachingTip/CloseButtonContent}"
+			CloseButtonContent="{helpers:ResourceString Name=OK}"
 			PreferredPlacement="Auto"
 			Subtitle="{helpers:ResourceString Name=FileNameTeachingTip/Subtitle}"
 			Visibility="Collapsed" />
diff --git a/src/Files.App/Views/LayoutModes/DetailsLayoutBrowser.xaml b/src/Files.App/Views/LayoutModes/DetailsLayoutBrowser.xaml
index 6abeddb874fb..1ec2d9134dc6 100644
--- a/src/Files.App/Views/LayoutModes/DetailsLayoutBrowser.xaml
+++ b/src/Files.App/Views/LayoutModes/DetailsLayoutBrowser.xaml
@@ -214,7 +214,7 @@
 
 		<TeachingTip
 			x:Name="FileNameTeachingTip"
-			CloseButtonContent="{helpers:ResourceString Name=FileNameTeachingTip/CloseButtonContent}"
+			CloseButtonContent="{helpers:ResourceString Name=OK}"
 			PreferredPlacement="Auto"
 			Subtitle="{helpers:ResourceString Name=FileNameTeachingTip/Subtitle}"
 			Visibility="Collapsed" />
@@ -273,7 +273,7 @@
 									<ToggleMenuFlyoutItem
 										Click="ToggleMenuFlyoutItem_Click"
 										IsChecked="{x:Bind ColumnsViewModel.TagColumn.UserCollapsed, Mode=TwoWay, Converter={StaticResource BoolNegationConverter}}"
-										Text="{helpers:ResourceString Name=DetailsViewHeaderFlyout_ShowFileTag/Text}"
+										Text="{helpers:ResourceString Name=Tag}"
 										Visibility="{x:Bind ColumnsViewModel.TagColumn.IsHidden, Mode=OneWay, Converter={StaticResource NegatedBoolToVisibilityConverter}}" />
 									<ToggleMenuFlyoutItem
 										Click="ToggleMenuFlyoutItem_Click"
@@ -383,7 +383,7 @@
 								Grid.Column="3"
 								Command="{x:Bind UpdateSortOptionsCommand, Mode=OneWay}"
 								CommandParameter="Name"
-								Header="{helpers:ResourceString Name=nameColumn/Header}" />
+								Header="{helpers:ResourceString Name=Name}" />
 
 							<controls:GridSplitter
 								Grid.Column="4"
@@ -421,7 +421,7 @@
 								Grid.Column="7"
 								Command="{x:Bind UpdateSortOptionsCommand, Mode=OneWay}"
 								CommandParameter="OriginalPath"
-								Header="{helpers:ResourceString Name=originalPathColumn/Header}"
+								Header="{helpers:ResourceString Name=OriginalPath}"
 								Visibility="{x:Bind ColumnsViewModel.OriginalPathColumn.Visibility, Mode=OneWay}" />
 
 							<controls:GridSplitter
diff --git a/src/Files.App/Views/LayoutModes/GridViewBrowser.xaml b/src/Files.App/Views/LayoutModes/GridViewBrowser.xaml
index 9d995855d6be..e1cbb7e20bc5 100644
--- a/src/Files.App/Views/LayoutModes/GridViewBrowser.xaml
+++ b/src/Files.App/Views/LayoutModes/GridViewBrowser.xaml
@@ -522,7 +522,7 @@
 
 		<TeachingTip
 			x:Name="FileNameTeachingTip"
-			CloseButtonContent="{helpers:ResourceString Name=FileNameTeachingTip/CloseButtonContent}"
+			CloseButtonContent="{helpers:ResourceString Name=OK}"
 			PreferredPlacement="Auto"
 			Subtitle="{helpers:ResourceString Name=FileNameTeachingTip/Subtitle}"
 			Visibility="Collapsed" />
diff --git a/src/Files.App/Views/MainPage.xaml b/src/Files.App/Views/MainPage.xaml
index df7825ca70c1..82f3ea4965ad 100644
--- a/src/Files.App/Views/MainPage.xaml
+++ b/src/Files.App/Views/MainPage.xaml
@@ -239,12 +239,12 @@
 								Padding="8"
 								HorizontalAlignment="Left"
 								VerticalAlignment="Bottom"
-								AutomationProperties.Name="{helpers:ResourceString Name=HorizontalMultitaskingControlAddButton/AutomationProperties/Name}"
+								AutomationProperties.Name="{helpers:ResourceString Name=NewTabCtrlT}"
 								Background="Transparent"
 								BorderBrush="Transparent"
 								BorderThickness="0"
 								Click="{x:Bind ViewModel.AddNewTab, Mode=OneWay}"
-								ToolTipService.ToolTip="{helpers:ResourceString Name=HorizontalMultitaskingControlAddButton/ToolTipService/ToolTip}">
+								ToolTipService.ToolTip="{helpers:ResourceString Name=NewTabCtrlT}">
 								<Button.Content>
 									<FontIcon
 										x:Name="HorizontalMultitaskingControlAddButtonIcon"
diff --git a/src/Files.App/Views/Pages/Properties.xaml b/src/Files.App/Views/Pages/Properties.xaml
index a29d25d6e2d2..acd095fac28c 100644
--- a/src/Files.App/Views/Pages/Properties.xaml
+++ b/src/Files.App/Views/Pages/Properties.xaml
@@ -59,7 +59,7 @@
 				<TextBlock
 					VerticalAlignment="Center"
 					Style="{StaticResource CaptionTextBlockStyle}"
-					Text="{helpers:ResourceString Name=PropertiesTitle}" />
+					Text="{helpers:ResourceString Name=Properties}" />
 
 			</StackPanel>
 		</Border>
diff --git a/src/Files.App/Views/Pages/PropertiesDetails.xaml b/src/Files.App/Views/Pages/PropertiesDetails.xaml
index ea8c84fc54f6..72062ad1fb6a 100644
--- a/src/Files.App/Views/Pages/PropertiesDetails.xaml
+++ b/src/Files.App/Views/Pages/PropertiesDetails.xaml
@@ -98,7 +98,7 @@
 							<Flyout x:Name="ClearPropertiesFlyout">
 								<StackPanel Orientation="Vertical" Spacing="4">
 									<TextBlock Text="{helpers:ResourceString Name=ClearPropertiesFlyoutText/Text}" />
-									<Button Click="ClearPropertiesConfirmation_Click" Content="{helpers:ResourceString Name=ClearPropertiesFlyoutConfirmation/Content}" />
+									<Button Click="ClearPropertiesConfirmation_Click" Content="{helpers:ResourceString Name=Clear}" />
 								</StackPanel>
 							</Flyout>
 						</Button.Flyout>
diff --git a/src/Files.App/Views/Pages/PropertiesGeneral.xaml b/src/Files.App/Views/Pages/PropertiesGeneral.xaml
index bba2e17401b3..32fb54a9e259 100644
--- a/src/Files.App/Views/Pages/PropertiesGeneral.xaml
+++ b/src/Files.App/Views/Pages/PropertiesGeneral.xaml
@@ -87,7 +87,7 @@
 						x:Load="{x:Bind ViewModel.ItemNameVisibility, Mode=OneWay}"
 						GettingFocus="ItemFileName_GettingFocus"
 						LosingFocus="ItemFileName_LosingFocus"
-						PlaceholderText="{helpers:ResourceString Name=PropertiesItemFileName/PlaceholderText}"
+						PlaceholderText="{helpers:ResourceString Name=PropertyItemName}"
 						Text="{x:Bind ViewModel.ItemName, Mode=TwoWay}" />
 					<TextBlock
 						x:Name="itemFilesAndFoldersCountValueTop"
@@ -182,7 +182,7 @@
 							Grid.Column="0"
 							HorizontalAlignment="Left"
 							Style="{StaticResource PropertyName}"
-							Text="{helpers:ResourceString Name=PropertiesItemSize/Text}"
+							Text="{helpers:ResourceString Name=SizeLabel}"
 							Visibility="{x:Bind ViewModel.ItemSizeVisibility, Mode=OneWay}" />
 						<Grid
 							Grid.Row="1"
@@ -553,7 +553,7 @@
 							Grid.Row="2"
 							Grid.Column="0"
 							VerticalAlignment="Center"
-							Text="{helpers:ResourceString Name=PropertiesDialogHidden/Text}"
+							Text="{helpers:ResourceString Name=Hidden}"
 							TextWrapping="WrapWholeWords" />
 						<CheckBox
 							Grid.Row="2"
diff --git a/src/Files.App/Views/Pages/PropertiesLibrary.xaml b/src/Files.App/Views/Pages/PropertiesLibrary.xaml
index 71c989619a8a..fc8cb9cfea62 100644
--- a/src/Files.App/Views/Pages/PropertiesLibrary.xaml
+++ b/src/Files.App/Views/Pages/PropertiesLibrary.xaml
@@ -73,7 +73,7 @@
 						Command="{x:Bind RemoveLocationCommand}"
 						Icon="Delete"
 						IsEnabled="{x:Bind IsNotDefaultFolderSelected, Mode=OneWay}"
-						Label="{helpers:ResourceString Name=LibraryLocationsButtonRemove/Label}" />
+						Label="{helpers:ResourceString Name=Remove}" />
 				</CommandBar>
 
 				<MenuFlyoutSeparator
diff --git a/src/Files.App/Views/Pages/PropertiesSecurityAdvanced.xaml b/src/Files.App/Views/Pages/PropertiesSecurityAdvanced.xaml
index aac81ded5931..a4e9e6a380f1 100644
--- a/src/Files.App/Views/Pages/PropertiesSecurityAdvanced.xaml
+++ b/src/Files.App/Views/Pages/PropertiesSecurityAdvanced.xaml
@@ -198,7 +198,7 @@
 										HorizontalAlignment="Center"
 										FontSize="12"
 										FontWeight="SemiLight"
-										Text="{helpers:ResourceString Name=SecurityAdvancedTypeLabel/Text}" />
+										Text="{helpers:ResourceString Name=Type}" />
 									<TextBlock
 										Grid.Column="2"
 										FontSize="12"
@@ -493,7 +493,7 @@
 				Margin="0,0,10,0"
 				HorizontalAlignment="Right"
 				Click="OKButton_Click"
-				Content="{helpers:ResourceString Name=PropertiesDialogOKButton/Content}"
+				Content="{helpers:ResourceString Name=OK}"
 				Style="{StaticResource AccentButtonStyle}" />
 			<Button
 				x:Name="CancelButton"
diff --git a/src/Files.App/Views/SettingsPages/Folders.xaml b/src/Files.App/Views/SettingsPages/Folders.xaml
index bb808beb0bbf..ae257a4952fe 100644
--- a/src/Files.App/Views/SettingsPages/Folders.xaml
+++ b/src/Files.App/Views/SettingsPages/Folders.xaml
@@ -110,7 +110,7 @@
 								<ComboBoxItem Content="{helpers:ResourceString Name=DateModifiedLowerCase}" />
 								<ComboBoxItem Content="{helpers:ResourceString Name=DateCreated}" />
 								<ComboBoxItem Content="{helpers:ResourceString Name=Size}" />
-								<ComboBoxItem Content="{helpers:ResourceString Name=BaseLayoutContextFlyoutSortByType/Text}" />
+								<ComboBoxItem Content="{helpers:ResourceString Name=Type}" />
 								<ComboBoxItem Content="{helpers:ResourceString Name=Tag}" />
 							</ComboBox>
 						</local:SettingsBlockControl>
@@ -131,7 +131,7 @@
 								<ComboBoxItem Content="{helpers:ResourceString Name=DateModifiedLowerCase}" />
 								<ComboBoxItem Content="{helpers:ResourceString Name=DateCreated}" />
 								<ComboBoxItem Content="{helpers:ResourceString Name=Size}" />
-								<ComboBoxItem Content="{helpers:ResourceString Name=BaseLayoutContextFlyoutSortByType/Text}" />
+								<ComboBoxItem Content="{helpers:ResourceString Name=Type}" />
 								<ComboBoxItem Content="{helpers:ResourceString Name=Tag}" />
 							</ComboBox>
 						</local:SettingsBlockControl>
@@ -283,10 +283,10 @@
 								Style="{StaticResource RightAlignedToggleSwitchStyle}" />
 						</local:SettingsBlockControl>
 
-						<local:SettingsBlockControl Title="{helpers:ResourceString Name=SettingsPreferencesOpenFoldersNewTab/Title}" HorizontalAlignment="Stretch">
+						<local:SettingsBlockControl Title="{helpers:ResourceString Name=OpenFoldersInNewTab}" HorizontalAlignment="Stretch">
 							<ToggleSwitch
 								x:Name="OpenFoldersNewTab"
-								AutomationProperties.Name="{helpers:ResourceString Name=SettingsOpenFoldersNewTabToggleSwitch/AutomationProperties/Name}"
+								AutomationProperties.Name="{helpers:ResourceString Name=OpenFoldersInNewTab}"
 								IsOn="{x:Bind ViewModel.OpenFoldersNewTab, Mode=TwoWay}"
 								Style="{StaticResource RightAlignedToggleSwitchStyle}" />
 						</local:SettingsBlockControl>
diff --git a/src/Files.App/Views/SettingsPages/Preferences.xaml b/src/Files.App/Views/SettingsPages/Preferences.xaml
index dd5ebac9d982..b101ff16e4cb 100644
--- a/src/Files.App/Views/SettingsPages/Preferences.xaml
+++ b/src/Files.App/Views/SettingsPages/Preferences.xaml
@@ -35,13 +35,13 @@
 
 
 			<!--  Language settings  -->
-			<local:SettingsBlockControl Title="{helpers:ResourceString Name=SettingsPreferencesAppLanguage/Title}" HorizontalAlignment="Stretch">
+			<local:SettingsBlockControl Title="{helpers:ResourceString Name=Language}" HorizontalAlignment="Stretch">
 				<local:SettingsBlockControl.Icon>
 					<FontIcon Glyph="&#xF2B7;" />
 				</local:SettingsBlockControl.Icon>
 				<ComboBox
 					HorizontalAlignment="Left"
-					AutomationProperties.Name="{helpers:ResourceString Name=SettingsPreferencesAppLanguageComboBox/AutomationProperties/Name}"
+					AutomationProperties.Name="{helpers:ResourceString Name=Language}"
 					ItemsSource="{x:Bind ViewModel.AppLanguages}"
 					SelectedIndex="{x:Bind ViewModel.SelectedAppLanguageIndex, Mode=TwoWay}">
 					<ComboBox.ItemTemplate>