diff --git a/theme/icons/firefox-symbolic.svg b/theme/icons/firefox-symbolic.svg
new file mode 100644
index 0000000..84c30e7
--- /dev/null
+++ b/theme/icons/firefox-symbolic.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
+ <path fill="context-fill" stroke="context-stroke" fill-opacity="context-fill-opacity" stroke-opacity="context-stroke-opacity" d="m15.728 5.8949v-0.0051c-0.0114-0.04333-0.02338-0.08666-0.03592-0.12942l-0.0051-0.01938-0.03592-0.1203-0.0086-0.02623c-0.01197-0.03877-0.02395-0.07697-0.03649-0.11403-0.0034-0.01026-0.0068-0.02053-0.0097-0.03079-0.01254-0.03706-0.02509-0.07412-0.0382-0.11118-0.0034-0.01083-0.0074-0.02167-0.0114-0.0325-0.01254-0.03649-0.02566-0.07298-0.03934-0.1089-0.0034-0.01083-8e-3 -0.02166-0.01197-0.0325l-0.04105-0.1089c-4e-3 -0.0091-8e-3 -0.01825-0.0114-0.02794-0.0034-0.0097-0.0086-0.0211-0.01254-0.03193l-0.0325-0.08039-0.0051-0.0114c-0.05131-0.12429-0.10586-0.24687-0.16363-0.36774-0.0034-0.0086-0.0074-0.01653-0.0114-0.02452-0.01368-0.02908-0.02794-0.05701-0.04219-0.08666l-0.02566-0.05131c-0.01254-0.02566-0.02623-0.05131-0.03934-0.07697l-0.03079-0.05701c-0.01254-0.02452-0.02566-0.04846-0.0382-0.07241l-0.03421-0.06272-0.0382-0.06842-0.07526-0.13c-0.01368-0.02224-0.0268-0.04447-0.03991-0.06671l-0.0382-0.06272-0.04276-0.06842-0.03763-0.05701-0.04561-0.0707-0.03706-0.05701-0.05017-0.07355-0.03535-0.05131c-0.01881-0.02737-0.0382-0.05701-0.05701-0.08153-0.01026-0.01368-0.01996-0.02794-0.03022-0.04219-0.02908-0.04048-0.05701-0.08096-0.08951-0.12144-0.2306-0.30279-0.48269-0.5886-0.7543-0.85522-0.18898-0.1946-0.39028-0.37685-0.60264-0.54563-0.12258-0.10605-0.25086-0.20582-0.382-0.30046-0.2608-0.19527-0.53929-0.36573-0.83184-0.50914-0.06956-0.03592-0.13968-0.07184-0.21038-0.10605-0.56932-0.27971-1.1694-0.49191-1.788-0.63229-0.08267-0.01767-0.16477-0.03421-0.24801-0.0496-0.41364-0.07929-0.83324-0.12354-1.2543-0.13235h-0.17731c-0.54875-0.0023-1.0962 0.0529-1.6335 0.16485-1.1369 0.23889-2.1363 0.72978-2.7686 1.3433h0.0029l0.0046-0.0034h4e-3l0.0086-0.0057c0.47265-0.28507 1.1249-0.51313 1.5913-0.63058l0.07754-0.01882c0.0878-0.02109 0.17788-0.04048 0.27139-0.05701l0.07754-0.01483c2.0668-0.37629 4.2709 0.2406 5.8058 1.7104 0.33237 0.31459 0.62339 0.67017 0.86605 1.0582 0.97894 1.5884 0.886 3.5845 0.12258 4.7618-0.56672 0.87517-1.7811 1.6956-2.9146 1.6865l0.06899 0.0034h-0.04561l-0.07013-0.0029c-0.5047-0.023581-0.99899-0.15172-1.4516-0.37629-1.7538-0.89512-2.0149-3.1255-0.74632-4.2037-0.42134-0.09065-1.2127 0.08666-1.764 0.90881-0.49431 0.7372-0.46638 1.8769-0.16135 2.6854-0.19508-0.39846-0.32757-0.82461-0.39283-1.2634-0.38314-2.5805 1.288-4.7932 2.8878-5.4403l0.03364-0.01311 0.04333-0.01654 0.07754-0.02794c-0.36033-0.31415-0.94131-0.49203-1.6146-0.51313-0.92933-0.02623-2.0348 0.24972-2.9818 0.88657-0.05663 0.03801-0.11251 0.07735-0.16762 0.11802-0.03421 0.02509-0.06785 0.05074-0.10149 0.0764l-0.03136 0.02452-0.06842 0.05701-0.03535 0.02908c-0.02224 0.01767-0.04333 0.03592-0.065 0.05701l-0.03364 0.02851-0.07526 0.06671-0.01938 0.0171-0.09293 0.06956-0.03136 0.03079-0.05701 0.05701-0.03649 0.03706c-0.01767 0.01767-0.03478 0.03535-0.05188 0.05359l-0.03649 0.03877-0.05245 0.05701c-0.01083 0.01197-0.02224 0.02395-0.03307 0.03649-0.02566 0.02908-0.05131 0.05701-0.07697 0.08837l-0.03649 0.04333-0.04276 0.05131-0.03934 0.0496-0.03763 0.04732-0.04048 0.05302-0.03364 0.04504-0.04105 0.05701-0.02338 0.0325c-0.02851 0.04105-0.05701 0.0821-0.08495 0.12372l-0.02395 0.03535-0.04276 0.06614c-8e-3 0.01254-0.01596 0.02452-0.02338 0.03706-0.01425 0.0228-0.02851 0.04561-0.04219 0.06842l-0.02052 0.03364-0.0439 0.07412c-0.0011 0.0024-0.0025 0.0047-4e-3 0.0068-0.03592 0.06214-0.0707 0.12543-0.10434 0.18929-0.01483 0.02794-0.02908 0.05701-0.04333 0.08438l-0.01254 0.02509c-0.01406 0.02775-0.02775 0.05568-0.04105 0.08381l-0.0114 0.02338c-0.06158 0.12942-0.11859 0.26227-0.17104 0.3991-0.0017 0.0047-0.0036 0.0092-0.0057 0.01368-0.01197 0.03193-0.02395 0.06386-0.03535 0.09578-0.0029 0.0063-0.0051 0.01254-0.0074 0.01881-0.0114 0.0325-0.02337 0.06557-0.03478 0.09863v0.0029c-0.02452 0.07241-0.04846 0.14539-0.07127 0.21951 0.04241-0.44133 0.13088-0.87701 0.26398-1.2999v-0.0091c0.0074-0.02452 0.01539-0.0496 0.02338-0.07412 0-0.0063 0.0034-0.01197 0.0057-0.01825 0.0068-0.02281 0.01425-0.04504 0.02167-0.06785l0.0086-0.02509 0.0211-0.06329c0.0034-0.01026 0.0068-0.02053 0.01083-0.03079l0.02053-0.05701 0.01254-0.03592 0.02053-0.05701c0.0046-0.01311 0.0097-0.02623 0.01483-0.03991 0.0051-0.01368 0.01311-0.03478 0.01938-0.05245l0.0171-0.0439c0.0063-0.0171 0.01254-0.03364 0.01938-0.05017l0.01882-0.04789 0.01882-0.04675 0.02109-0.05131c0.0063-0.01483 0.01254-0.02965 0.01825-0.04447l0.02395-0.05701c0.0057-0.01368 0.0114-0.02737 0.01767-0.04105 0.0063-0.01368 0.0171-0.03934 0.02566-0.05701l0.0171-0.0382c0.0091-0.02167 0.01938-0.04276 0.02908-0.06443l0.01539-0.03307c0.01083-0.02452 0.0228-0.04903 0.03421-0.07355l0.0114-0.02395 0.04447-0.09179 0.0034-0.0068 0.05017-0.10034c-0.2031 0.11441-0.3878 0.25876-0.54791 0.42818l-0.05701 0.05701c-0.42041 0.45169-0.75985 0.97244-1.0035 1.5394-0.38656 0.93047-0.57984 2.0012-0.57591 3.0725 0.0013 0.31857 0.02037 0.63683 0.05708 0.95328 0 0.01653 4e-3 0.03307 0.0057 0.0496 0.0091 0.08096 0.01825 0.16192 0.02851 0.24231v0.0171c0.50011 2.9068 2.5569 5.3039 5.354 6.2397s5.8823 0.25921 8.031-1.7614 3.0135-5.0584 2.2511-7.9077z"/>
+</svg>
diff --git a/theme/parts/icons.css b/theme/parts/icons.css
index 05d2b27..2b93b87 100644
--- a/theme/parts/icons.css
+++ b/theme/parts/icons.css
@@ -298,6 +298,11 @@ button.close::before {
     list-style-image: url("../icons/audio-muted-symbolic.svg") !important;
 }
 
+/* Firefox View */
+#firefox-view-button {
+	list-style-image: url("../icons/firefox-symbolic.svg") !important;
+}
+
 /* Private browsing button */
 #privatebrowsing-button {
 	list-style-image: url("../icons/eye-not-looking-symbolic.svg") !important;
diff --git a/theme/parts/tabsbar.css b/theme/parts/tabsbar.css
index a073337..451d025 100644
--- a/theme/parts/tabsbar.css
+++ b/theme/parts/tabsbar.css
@@ -86,6 +86,7 @@ spacer[part=overflow-start-indicator], spacer[part=overflow-end-indicator] {
 	border-radius: 6px !important;
 	margin: 5px 3px 6px !important;
 	padding: 0 9px !important;
+	min-height: 34px !important;
 }
 #TabsToolbar .toolbarbutton-1:not([disabled]):not(:active):not([open]):hover {
 	background-color: var(--gnome-tabbar-tab-hover-background) !important;
@@ -95,7 +96,7 @@ spacer[part=overflow-start-indicator], spacer[part=overflow-end-indicator] {
 }
 
 /* Fake tabsbar border */
-#tabbrowser-arrowscrollbox::after {
+#TabsToolbar::after {
 	content: "";
 	display: block;
 	width: 200%;
@@ -109,11 +110,6 @@ spacer[part=overflow-start-indicator], spacer[part=overflow-end-indicator] {
 	z-index: 6;
 }
 
-#tabbrowser-tabs[movingtab=true] #tabbrowser-arrowscrollbox::after  {
-	bottom: unset;
-	top: 44px;
-}
-
 /* Tab */
 .tabbrowser-tab {
 	border: 0 !important;
@@ -132,6 +128,7 @@ spacer[part=overflow-start-indicator], spacer[part=overflow-end-indicator] {
 }
 
 /* Tab separators */
+#TabsToolbar #firefox-view-button::after,
 .tabbrowser-tab:not([selected], :hover, [last-visible-tab="true"], [beforeselected-visible="true"], [beforehovered="true"])::after {
 	content: "";
 	display: block;
@@ -143,6 +140,9 @@ spacer[part=overflow-start-indicator], spacer[part=overflow-end-indicator] {
 .tabbrowser-tab::after {
 	right: -.5px;
 }
+#TabsToolbar #firefox-view-button::after {
+	left: 39px;
+}
 
 /* Tab labels */
 tab {
@@ -442,6 +442,20 @@ tab {
 	}
 }
 
+/* Firefox View */
+#TabsToolbar #firefox-view-button .toolbarbutton-icon {
+	box-shadow: none !important;
+	fill: var(--gnome-toolbar-icon-fill) !important;
+	height: 16px !important;
+	opacity: 1 !important;
+	width: 16px !important;
+}
+:root:not([privatebrowsingmode="temporary"]):not([firefoxviewhidden]) :is(#firefox-view-button, #wrapper-firefox-view-button) + #tabbrowser-tabs {
+  border-inline-start: 0 !important;
+  padding-inline-start: var(--tab-overflow-pinned-tabs-width) !important;
+  margin-inline-start: 0 !important;
+}
+
 /* OPTIONAL: Hide single tab */
 @supports -moz-bool-pref("gnomeTheme.hideSingleTab") {
 	#tabbrowser-tabs tab:only-of-type {