diff --git a/app/lint-baseline.xml b/app/lint-baseline.xml
index 361e36e1cb..d977ec1a48 100644
--- a/app/lint-baseline.xml
+++ b/app/lint-baseline.xml
@@ -7829,28 +7829,6 @@
             column="13"/>
     </issue>
 
-    <issue
-        id="UnusedResources"
-        message="The resource `R.string.tabs_menu_close_all_tabs` appears to be unused"
-        errorLine1="    &lt;string name=&quot;tabs_menu_close_all_tabs&quot;>Close all tabs&lt;/string>"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/values/strings.xml"
-            line="706"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="UnusedResources"
-        message="The resource `R.string.tabs_menu_share_tabs` appears to be unused"
-        errorLine1="    &lt;string name=&quot;tabs_menu_share_tabs&quot;>Share tabs&lt;/string>"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/values/strings.xml"
-            line="708"
-            column="13"/>
-    </issue>
-
     <issue
         id="UnusedResources"
         message="The resource `R.string.tab_share` appears to be unused"
@@ -9050,17 +9028,6 @@
             column="13"/>
     </issue>
 
-    <issue
-        id="UnusedResources"
-        message="The resource `R.layout.tab_header` appears to be unused"
-        errorLine1="&lt;androidx.constraintlayout.widget.ConstraintLayout"
-        errorLine2="^">
-        <location
-            file="src/main/res/layout/tab_header.xml"
-            line="5"
-            column="1"/>
-    </issue>
-
     <issue
         id="IconXmlAndPng"
         message="The following images appear both as density independent `.xml` files and as bitmap files: /Users/rotbolt/AndroidStudioProjects/fenix/app/src/main/res/drawable-hdpi/ic_logo_wordmark_normal.png, /Users/rotbolt/AndroidStudioProjects/fenix/app/src/main/res/drawable-night/ic_logo_wordmark_normal.xml">
diff --git a/app/src/main/res/layout/tab_header.xml b/app/src/main/res/layout/tab_header.xml
deleted file mode 100644
index 16432a4459..0000000000
--- a/app/src/main/res/layout/tab_header.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/tabs_header"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginBottom="8dp">
-
-    <TextView
-        android:id="@+id/header_text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="4.5dp"
-        android:text="@string/tab_header_label"
-        android:textAppearance="@style/HeaderTextStyle"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <ImageButton
-        android:id="@+id/share_tabs_button"
-        android:layout_width="48dp"
-        android:layout_height="48dp"
-        android:background="?android:attr/selectableItemBackgroundBorderless"
-        android:contentDescription="@string/tabs_menu_share_tabs"
-        app:srcCompat="@drawable/ic_share"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/close_tabs_button"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <ImageButton
-        android:id="@+id/close_tabs_button"
-        android:layout_width="48dp"
-        android:layout_height="48dp"
-        android:background="?android:attr/selectableItemBackgroundBorderless"
-        android:contentDescription="@string/tabs_menu_close_all_tabs"
-        app:srcCompat="@drawable/ic_delete"
-        app:tint="?primaryText"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/tabs_overflow_button"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <ImageButton
-        android:id="@+id/tabs_overflow_button"
-        android:layout_width="48dp"
-        android:layout_height="48dp"
-        android:background="?android:attr/selectableItemBackgroundBorderless"
-        android:contentDescription="@string/open_tabs_menu"
-        app:srcCompat="@drawable/ic_menu"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 937dc5a232..a929c4535e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -805,9 +805,9 @@
     <!-- Content description (not visible, for screen readers etc.): Opens the open tabs menu when pressed -->
     <string name="open_tabs_menu">Open tabs menu</string>
     <!-- Open tabs menu item to close all tabs -->
-    <string name="tabs_menu_close_all_tabs">Close all tabs</string>
+    <string name="tabs_menu_close_all_tabs" moz:removedIn="96" tools:ignore="UnusedResources">Close all tabs</string>
     <!-- Open tabs menu item to share all tabs -->
-    <string name="tabs_menu_share_tabs">Share tabs</string>
+    <string name="tabs_menu_share_tabs" moz:removedIn="96" tools:ignore="UnusedResources">Share tabs</string>
     <!-- Open tabs menu item to save tabs to collection -->
     <string name="tabs_menu_save_to_collection1">Save tabs to collection</string>
     <!-- Content description (not visible, for screen readers etc.): Opens the tab menu when pressed -->