diff --git a/app/metrics.yaml b/app/metrics.yaml
index fa1b06991..402958711 100644
--- a/app/metrics.yaml
+++ b/app/metrics.yaml
@@ -1021,7 +1021,7 @@ metrics:
     expires: never
     metadata:
       tags:
-        - TopSites
+        - Shortcuts
   has_top_sites:
     type: boolean
     lifetime: application
@@ -1045,7 +1045,7 @@ metrics:
     expires: never
     metadata:
       tags:
-        - TopSites
+        - Shortcuts
   recently_used_pwa_count:
     type: counter
     lifetime: application
@@ -1534,6 +1534,9 @@ metrics:
     notification_emails:
       - android-probes@mozilla.com
     expires: 114
+    metadata:
+      tags:
+        - Wallpapers
 
 customize_home:
   most_visited_sites:
@@ -4862,7 +4865,7 @@ top_sites:
     expires: never
     metadata:
       tags:
-        - TopSites
+        - Shortcuts
   open_google_search_attribution:
     type: event
     description: |
@@ -4883,7 +4886,7 @@ top_sites:
     metadata:
       tags:
         - Search
-        - TopSites
+        - Shortcuts
   open_baidu_search_attribution:
     type: event
     description: |
@@ -4901,7 +4904,7 @@ top_sites:
     metadata:
       tags:
         - Search
-        - TopSites
+        - Shortcuts
   open_frecency:
     type: event
     description: |
@@ -4922,7 +4925,7 @@ top_sites:
     expires: never
     metadata:
       tags:
-        - TopSites
+        - Shortcuts
   open_pinned:
     type: event
     description: |
@@ -4943,7 +4946,7 @@ top_sites:
     expires: never
     metadata:
       tags:
-        - TopSites
+        - Shortcuts
   swipe_carousel:
     type: event
     description: |
@@ -4969,7 +4972,7 @@ top_sites:
     expires: never
     metadata:
       tags:
-        - TopSites
+        - Shortcuts
   long_press:
     type: event
     description: |
@@ -4998,7 +5001,7 @@ top_sites:
     expires: never
     metadata:
       tags:
-        - TopSites
+        - Shortcuts
   open_in_new_tab:
     type: event
     description: |
@@ -5019,7 +5022,7 @@ top_sites:
     expires: never
     metadata:
       tags:
-        - TopSites
+        - Shortcuts
   open_in_private_tab:
     type: event
     description: |
@@ -5040,7 +5043,7 @@ top_sites:
     expires: never
     metadata:
       tags:
-        - TopSites
+        - Shortcuts
   remove:
     type: event
     description: |
@@ -5061,7 +5064,7 @@ top_sites:
     expires: never
     metadata:
       tags:
-        - TopSites
+        - Shortcuts
   google_top_site_removed:
     type: event
     description: |
@@ -5165,7 +5168,7 @@ top_sites:
     expires: 112
     metadata:
       tags:
-        - TopSites
+        - Shortcuts
   contile_tile_id:
     type: quantity
     description: |
@@ -5186,7 +5189,7 @@ top_sites:
     unit: integer
     metadata:
       tags:
-        - TopSites
+        - Shortcuts
   contile_advertiser:
     type: string
     description: |
@@ -5206,7 +5209,7 @@ top_sites:
     expires: 112
     metadata:
       tags:
-        - TopSites
+        - Shortcuts
   contile_reporting_url:
     type: url
     description: |
@@ -5227,7 +5230,7 @@ top_sites:
     expires: 112
     metadata:
       tags:
-        - TopSites
+        - Shortcuts
   contile_impression:
     type: event
     description: |
@@ -5253,7 +5256,7 @@ top_sites:
     expires: 112
     metadata:
       tags:
-        - TopSites
+        - Shortcuts
   contile_click:
     type: event
     description: |
@@ -5279,7 +5282,7 @@ top_sites:
     expires: 112
     metadata:
       tags:
-        - TopSites
+        - Shortcuts
 
 app_theme:
   dark_theme_selected:
@@ -5333,7 +5336,7 @@ pocket:
     metadata:
       tags:
         - PocketIntegration
-        - TopSites
+        - Shortcuts
   pocket_top_site_removed:
     type: event
     description: |
@@ -5354,7 +5357,7 @@ pocket:
     metadata:
       tags:
         - PocketIntegration
-        - TopSites
+        - Shortcuts
   home_recs_shown:
     type: event
     description: |
@@ -7720,6 +7723,9 @@ wallpapers:
     data_sensitivity:
       - interaction
     expires: 114
+    metadata:
+      tags:
+        - Wallpapers
   wallpaper_selected:
     type: event
     description: |
@@ -7740,6 +7746,9 @@ wallpapers:
     data_sensitivity:
       - interaction
     expires: 114
+    metadata:
+      tags:
+        - Wallpapers
   wallpaper_switched:
     type: event
     description: |
@@ -7760,6 +7769,9 @@ wallpapers:
     data_sensitivity:
       - interaction
     expires: 114
+    metadata:
+      tags:
+        - Wallpapers
   change_wallpaper_logo_toggled:
     type: event
     description: |
@@ -7778,6 +7790,9 @@ wallpapers:
     data_sensitivity:
       - interaction
     expires: 114
+    metadata:
+      tags:
+        - Wallpapers
 
 recently_visited_homepage:
   history_highlight_opened:
diff --git a/app/src/test/java/org/mozilla/fenix/FenixApplicationTest.kt b/app/src/test/java/org/mozilla/fenix/FenixApplicationTest.kt
index 7c114d3fc..7617e3569 100644
--- a/app/src/test/java/org/mozilla/fenix/FenixApplicationTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/FenixApplicationTest.kt
@@ -187,6 +187,7 @@ class FenixApplicationTest {
         assertEquals(listOf("switch", "touch exploration"), Preferences.accessibilityServices.testGetValue())
         assertEquals(true, Preferences.inactiveTabsEnabled.testGetValue())
         assertEquals(expectedAppInstallSource, Metrics.installSource.testGetValue())
+        assertTrue(Metrics.defaultWallpaper.testGetValue())
 
         val contextId = TopSites.contextId.testGetValue()!!.toString()
 
diff --git a/app/tags.yaml b/app/tags.yaml
index 120aa56f9..18bc213b5 100644
--- a/app/tags.yaml
+++ b/app/tags.yaml
@@ -77,6 +77,9 @@ History:
 HomeScreen:
   description: Corresponds to the [Feature:HomeScreen](https://github.com/mozilla-mobile/fenix/issues?q=label%3AFeature%3AHomeScreen)
     label on GitHub.
+HomescreenShortcuts:
+  description: bookmarks on the Android homescreen. Corresponds to the [Feature:HomescreenShortcuts](https://github.com/mozilla-mobile/fenix/issues?q=label%3AFeature%3AHomescreenShortcuts)
+    label on GitHub.
 IME:
   description: Text entry and keyboards. Corresponds to the [Feature:IME](https://github.com/mozilla-mobile/fenix/issues?q=label%3AFeature%3AIME)
     label on GitHub.
@@ -167,7 +170,7 @@ Sharing:
   description: Corresponds to the [Feature:Sharing](https://github.com/mozilla-mobile/fenix/issues?q=label%3AFeature%3ASharing)
     label on GitHub.
 Shortcuts:
-  description: bookmarks on the Android homescreen. Corresponds to the [Feature:Shortcuts](https://github.com/mozilla-mobile/fenix/issues?q=label%3AFeature%3AShortcuts)
+  description: Top Sites/Topsites on the Firefox home page. Corresponds to the [Feature:Shortcuts](https://github.com/mozilla-mobile/fenix/issues?q=label%3AFeature%3AShortcuts)
     label on GitHub.
 SitePermissions:
   description: Corresponds to the [Feature:SitePermissions](https://github.com/mozilla-mobile/fenix/issues?q=label%3AFeature%3ASitePermissions)
@@ -197,15 +200,15 @@ Themes:
 Toolbar:
   description: Address bar, see also Feature:Search. Corresponds to the [Feature:Toolbar](https://github.com/mozilla-mobile/fenix/issues?q=label%3AFeature%3AToolbar)
     label on GitHub.
-TopSites:
-  description: Corresponds to the [Feature:TopSites](https://github.com/mozilla-mobile/fenix/issues?q=label%3AFeature%3ATopSites)
-    label on GitHub.
 TrackingProtection:
   description: Corresponds to the [Feature:TrackingProtection](https://github.com/mozilla-mobile/fenix/issues?q=label%3AFeature%3ATrackingProtection)
     label on GitHub.
 Voice:
   description: Corresponds to the [Feature:Voice](https://github.com/mozilla-mobile/fenix/issues?q=label%3AFeature%3AVoice)
     label on GitHub.
+Wallpapers:
+  description: Corresponds to the [Feature:Wallpapers](https://github.com/mozilla-mobile/fenix/issues?q=label%3AFeature%3AWallpapers)
+    label on GitHub.
 WebAuthn:
   description: Feature work pertaining to WebAuthn. Corresponds to the [Feature:WebAuthn](https://github.com/mozilla-mobile/fenix/issues?q=label%3AFeature%3AWebAuthn)
     label on GitHub.