diff --git a/container/doctabs.go b/container/doctabs.go
index cb276f6b91..b1bcf468e3 100644
--- a/container/doctabs.go
+++ b/container/doctabs.go
@@ -319,18 +319,7 @@ func (r *docTabsRenderer) buildTabButtons(count int, buttons *fyne.Container) {
 	buttons.Objects = nil
 
 	var iconPos buttonIconPosition
-	if fyne.CurrentDevice().IsMobile() {
-		cells := count
-		if cells == 0 {
-			cells = 1
-		}
-		if r.docTabs.location == TabLocationTop || r.docTabs.location == TabLocationBottom {
-			buttons.Layout = layout.NewGridLayoutWithColumns(cells)
-		} else {
-			buttons.Layout = layout.NewGridLayoutWithRows(cells)
-		}
-		iconPos = buttonIconTop
-	} else if r.docTabs.location == TabLocationLeading || r.docTabs.location == TabLocationTrailing {
+	if r.docTabs.location == TabLocationLeading || r.docTabs.location == TabLocationTrailing {
 		buttons.Layout = layout.NewVBoxLayout()
 		iconPos = buttonIconTop
 	} else {
diff --git a/container/doctabs_mobile_test.go b/container/doctabs_mobile_test.go
index 10f761e383..034c3ed9cf 100644
--- a/container/doctabs_mobile_test.go
+++ b/container/doctabs_mobile_test.go
@@ -347,11 +347,11 @@ func TestDocTabs_Tapped(t *testing.T) {
 	require.Equal(t, 0, tabs.SelectedIndex())
 	test.AssertRendersToMarkup(t, "doctabs/mobile/tapped_first_selected.xml", c)
 
-	test.TapCanvas(c, fyne.NewPos(120, 10))
+	test.TapCanvas(c, fyne.NewPos(100, 10))
 	assert.Equal(t, 1, tabs.SelectedIndex())
 	test.AssertRendersToMarkup(t, "doctabs/mobile/tapped_second_selected.xml", c)
 
-	test.TapCanvas(c, fyne.NewPos(240, 10))
+	test.TapCanvas(c, fyne.NewPos(180, 10))
 	assert.Equal(t, 2, tabs.SelectedIndex())
 	test.AssertRendersToMarkup(t, "doctabs/mobile/tapped_third_selected.xml", c)
 
@@ -359,7 +359,7 @@ func TestDocTabs_Tapped(t *testing.T) {
 	require.Equal(t, 0, tabs.SelectedIndex())
 	test.AssertRendersToMarkup(t, "doctabs/mobile/tapped_first_selected.xml", c)
 
-	test.TapCanvas(c, fyne.NewPos(330, 10))
+	test.TapCanvas(c, fyne.NewPos(320, 10))
 	require.Equal(t, 3, tabs.SelectedIndex())
 	test.AssertRendersToMarkup(t, "doctabs/mobile/tapped_create_tab.xml", c)
 
diff --git a/container/testdata/doctabs/mobile/change_content_change_hidden.xml b/container/testdata/doctabs/mobile/change_content_change_hidden.xml
index 300aea2165..3dd8a4f83b 100644
--- a/container/testdata/doctabs/mobile/change_content_change_hidden.xml
+++ b/container/testdata/doctabs/mobile/change_content_change_hidden.xml
@@ -3,16 +3,16 @@
 		<widget size="150x150" type="*container.DocTabs">
 			<container size="150x36">
 				<widget size="110x36" type="*widget.Scroll">
-					<container size="148x36">
-						<widget size="72x36" type="*container.tabButton">
-							<text bold color="primary" pos="4,8" size="64x19">Test1</text>
-							<widget pos="48,8" size="20x20" type="*container.tabCloseButton">
+					<container size="156x36">
+						<widget size="76x36" type="*container.tabButton">
+							<text bold color="primary" pos="8,8" size="60x20">Test1</text>
+							<widget pos="52,8" size="20x20" type="*container.tabCloseButton">
 								<image rsc="cancelIcon" size="iconInlineSize" themed="primary"/>
 							</widget>
 						</widget>
-						<widget pos="76,0" size="72x36" type="*container.tabButton">
-							<text bold pos="4,8" size="64x19">Test2</text>
-							<widget pos="48,8" size="20x20" type="*container.tabCloseButton">
+						<widget pos="80,0" size="76x36" type="*container.tabButton">
+							<text bold pos="8,8" size="60x20">Test2</text>
+							<widget pos="52,8" size="20x20" type="*container.tabCloseButton">
 								<image rsc="cancelIcon" size="iconInlineSize"/>
 							</widget>
 						</widget>
@@ -21,8 +21,8 @@
 						<linearGradient angle="270" endColor="shadow" pos="-8,0" size="8x36"/>
 					</widget>
 					<widget pos="0,30" size="110x6" type="*widget.scrollBarArea">
-						<widget pos="0,3" size="81x3" type="*widget.scrollBar">
-							<rectangle fillColor="scrollbar" size="81x3"/>
+						<widget pos="0,3" size="77x3" type="*widget.scrollBar">
+							<rectangle fillColor="scrollbar" size="77x3"/>
 						</widget>
 					</widget>
 				</widget>
@@ -35,7 +35,7 @@
 				</container>
 			</container>
 			<rectangle fillColor="shadow" pos="0,36" size="150x4"/>
-			<rectangle fillColor="primary" pos="0,36" radius="4" size="72x4"/>
+			<rectangle fillColor="primary" pos="0,36" radius="4" size="76x4"/>
 			<widget pos="0,40" size="150x110" type="*widget.Label">
 				<text pos="8,8" size="34x19">Text3</text>
 			</widget>
diff --git a/container/testdata/doctabs/mobile/change_content_change_visible.xml b/container/testdata/doctabs/mobile/change_content_change_visible.xml
index 300aea2165..3dd8a4f83b 100644
--- a/container/testdata/doctabs/mobile/change_content_change_visible.xml
+++ b/container/testdata/doctabs/mobile/change_content_change_visible.xml
@@ -3,16 +3,16 @@
 		<widget size="150x150" type="*container.DocTabs">
 			<container size="150x36">
 				<widget size="110x36" type="*widget.Scroll">
-					<container size="148x36">
-						<widget size="72x36" type="*container.tabButton">
-							<text bold color="primary" pos="4,8" size="64x19">Test1</text>
-							<widget pos="48,8" size="20x20" type="*container.tabCloseButton">
+					<container size="156x36">
+						<widget size="76x36" type="*container.tabButton">
+							<text bold color="primary" pos="8,8" size="60x20">Test1</text>
+							<widget pos="52,8" size="20x20" type="*container.tabCloseButton">
 								<image rsc="cancelIcon" size="iconInlineSize" themed="primary"/>
 							</widget>
 						</widget>
-						<widget pos="76,0" size="72x36" type="*container.tabButton">
-							<text bold pos="4,8" size="64x19">Test2</text>
-							<widget pos="48,8" size="20x20" type="*container.tabCloseButton">
+						<widget pos="80,0" size="76x36" type="*container.tabButton">
+							<text bold pos="8,8" size="60x20">Test2</text>
+							<widget pos="52,8" size="20x20" type="*container.tabCloseButton">
 								<image rsc="cancelIcon" size="iconInlineSize"/>
 							</widget>
 						</widget>
@@ -21,8 +21,8 @@
 						<linearGradient angle="270" endColor="shadow" pos="-8,0" size="8x36"/>
 					</widget>
 					<widget pos="0,30" size="110x6" type="*widget.scrollBarArea">
-						<widget pos="0,3" size="81x3" type="*widget.scrollBar">
-							<rectangle fillColor="scrollbar" size="81x3"/>
+						<widget pos="0,3" size="77x3" type="*widget.scrollBar">
+							<rectangle fillColor="scrollbar" size="77x3"/>
 						</widget>
 					</widget>
 				</widget>
@@ -35,7 +35,7 @@
 				</container>
 			</container>
 			<rectangle fillColor="shadow" pos="0,36" size="150x4"/>
-			<rectangle fillColor="primary" pos="0,36" radius="4" size="72x4"/>
+			<rectangle fillColor="primary" pos="0,36" radius="4" size="76x4"/>
 			<widget pos="0,40" size="150x110" type="*widget.Label">
 				<text pos="8,8" size="34x19">Text3</text>
 			</widget>
diff --git a/container/testdata/doctabs/mobile/change_content_initial.xml b/container/testdata/doctabs/mobile/change_content_initial.xml
index 9f24e17f28..1b5b1aa832 100644
--- a/container/testdata/doctabs/mobile/change_content_initial.xml
+++ b/container/testdata/doctabs/mobile/change_content_initial.xml
@@ -3,16 +3,16 @@
 		<widget size="150x150" type="*container.DocTabs">
 			<container size="150x36">
 				<widget size="110x36" type="*widget.Scroll">
-					<container size="148x36">
-						<widget size="72x36" type="*container.tabButton">
-							<text bold color="primary" pos="4,8" size="64x19">Test1</text>
-							<widget pos="48,8" size="20x20" type="*container.tabCloseButton">
+					<container size="156x36">
+						<widget size="76x36" type="*container.tabButton">
+							<text bold color="primary" pos="8,8" size="60x20">Test1</text>
+							<widget pos="52,8" size="20x20" type="*container.tabCloseButton">
 								<image rsc="cancelIcon" size="iconInlineSize" themed="primary"/>
 							</widget>
 						</widget>
-						<widget pos="76,0" size="72x36" type="*container.tabButton">
-							<text bold pos="4,8" size="64x19">Test2</text>
-							<widget pos="48,8" size="20x20" type="*container.tabCloseButton">
+						<widget pos="80,0" size="76x36" type="*container.tabButton">
+							<text bold pos="8,8" size="60x20">Test2</text>
+							<widget pos="52,8" size="20x20" type="*container.tabCloseButton">
 								<image rsc="cancelIcon" size="iconInlineSize"/>
 							</widget>
 						</widget>
@@ -21,8 +21,8 @@
 						<linearGradient angle="270" endColor="shadow" pos="-8,0" size="8x36"/>
 					</widget>
 					<widget pos="0,30" size="110x6" type="*widget.scrollBarArea">
-						<widget pos="0,3" size="81x3" type="*widget.scrollBar">
-							<rectangle fillColor="scrollbar" size="81x3"/>
+						<widget pos="0,3" size="77x3" type="*widget.scrollBar">
+							<rectangle fillColor="scrollbar" size="77x3"/>
 						</widget>
 					</widget>
 				</widget>
@@ -35,7 +35,7 @@
 				</container>
 			</container>
 			<rectangle fillColor="shadow" pos="0,36" size="150x4"/>
-			<rectangle fillColor="primary" pos="0,36" radius="4" size="72x4"/>
+			<rectangle fillColor="primary" pos="0,36" radius="4" size="76x4"/>
 			<widget pos="0,40" size="150x110" type="*widget.Label">
 				<text pos="8,8" size="34x19">Text1</text>
 			</widget>
diff --git a/container/testdata/doctabs/mobile/change_icon_change_selected.xml b/container/testdata/doctabs/mobile/change_icon_change_selected.xml
index e0456fcfc3..bd61382688 100644
--- a/container/testdata/doctabs/mobile/change_icon_change_selected.xml
+++ b/container/testdata/doctabs/mobile/change_icon_change_selected.xml
@@ -1,42 +1,34 @@
 <canvas size="150x150">
 	<content>
 		<widget size="150x150" type="*container.DocTabs">
-			<container size="150x56">
-				<widget size="110x56" type="*widget.Scroll">
-					<container size="148x56">
-						<widget size="72x56" type="*container.tabButton">
-							<widget pos="48,18" size="20x20" type="*container.tabCloseButton">
+			<container size="150x36">
+				<widget size="110x36" type="*widget.Scroll">
+					<container size="110x36">
+						<widget size="52x36" type="*container.tabButton">
+							<widget pos="28,8" size="20x20" type="*container.tabCloseButton">
 								<image rsc="cancelIcon" size="iconInlineSize" themed="primary"/>
 							</widget>
-							<image pos="16,8" rsc="infoIcon" size="40x40" themed="primary"/>
+							<image pos="4,8" rsc="infoIcon" size="iconInlineSize" themed="primary"/>
 						</widget>
-						<widget pos="76,0" size="72x56" type="*container.tabButton">
-							<widget pos="48,18" size="20x20" type="*container.tabCloseButton">
+						<widget pos="56,0" size="52x36" type="*container.tabButton">
+							<widget pos="28,8" size="20x20" type="*container.tabCloseButton">
 								<image rsc="cancelIcon" size="iconInlineSize"/>
 							</widget>
-							<image pos="16,8" rsc="confirmIcon" size="40x40"/>
+							<image pos="4,8" rsc="confirmIcon" size="iconInlineSize"/>
 						</widget>
 					</container>
-					<widget pos="110,0" size="0x56" type="*widget.Shadow">
-						<linearGradient angle="270" endColor="shadow" pos="-8,0" size="8x56"/>
-					</widget>
-					<widget pos="0,50" size="110x6" type="*widget.scrollBarArea">
-						<widget pos="0,3" size="81x3" type="*widget.scrollBar">
-							<rectangle fillColor="scrollbar" size="81x3"/>
-						</widget>
-					</widget>
 				</widget>
-				<container pos="114,0" size="36x56">
-					<widget size="36x56" type="*widget.Button">
-						<rectangle radius="4" size="36x56"/>
-						<rectangle size="36x56"/>
-						<image fillMode="contain" pos="8,18" rsc="more-horizontal.svg" size="iconInlineSize" themed="default"/>
+				<container pos="114,0" size="36x36">
+					<widget size="36x36" type="*widget.Button">
+						<rectangle radius="4" size="36x36"/>
+						<rectangle size="36x36"/>
+						<image fillMode="contain" pos="8,8" rsc="more-horizontal.svg" size="iconInlineSize" themed="default"/>
 					</widget>
 				</container>
 			</container>
-			<rectangle fillColor="shadow" pos="0,56" size="150x4"/>
-			<rectangle fillColor="primary" pos="0,56" radius="4" size="72x4"/>
-			<widget pos="0,60" size="150x90" type="*widget.Label">
+			<rectangle fillColor="shadow" pos="0,36" size="150x4"/>
+			<rectangle fillColor="primary" pos="0,36" radius="4" size="52x4"/>
+			<widget pos="0,40" size="150x110" type="*widget.Label">
 				<text pos="8,8" size="34x19">Text1</text>
 			</widget>
 		</widget>
diff --git a/container/testdata/doctabs/mobile/change_icon_change_unselected.xml b/container/testdata/doctabs/mobile/change_icon_change_unselected.xml
index d3123d2712..79530754a1 100644
--- a/container/testdata/doctabs/mobile/change_icon_change_unselected.xml
+++ b/container/testdata/doctabs/mobile/change_icon_change_unselected.xml
@@ -1,42 +1,34 @@
 <canvas size="150x150">
 	<content>
 		<widget size="150x150" type="*container.DocTabs">
-			<container size="150x56">
-				<widget size="110x56" type="*widget.Scroll">
-					<container size="148x56">
-						<widget size="72x56" type="*container.tabButton">
-							<widget pos="48,18" size="20x20" type="*container.tabCloseButton">
+			<container size="150x36">
+				<widget size="110x36" type="*widget.Scroll">
+					<container size="110x36">
+						<widget size="52x36" type="*container.tabButton">
+							<widget pos="28,8" size="20x20" type="*container.tabCloseButton">
 								<image rsc="cancelIcon" size="iconInlineSize" themed="primary"/>
 							</widget>
-							<image pos="16,8" rsc="infoIcon" size="40x40" themed="primary"/>
+							<image pos="4,8" rsc="infoIcon" size="iconInlineSize" themed="primary"/>
 						</widget>
-						<widget pos="76,0" size="72x56" type="*container.tabButton">
-							<widget pos="48,18" size="20x20" type="*container.tabCloseButton">
+						<widget pos="56,0" size="52x36" type="*container.tabButton">
+							<widget pos="28,8" size="20x20" type="*container.tabCloseButton">
 								<image rsc="cancelIcon" size="iconInlineSize"/>
 							</widget>
-							<image pos="16,8" rsc="contentAddIcon" size="40x40"/>
+							<image pos="4,8" rsc="contentAddIcon" size="iconInlineSize"/>
 						</widget>
 					</container>
-					<widget pos="110,0" size="0x56" type="*widget.Shadow">
-						<linearGradient angle="270" endColor="shadow" pos="-8,0" size="8x56"/>
-					</widget>
-					<widget pos="0,50" size="110x6" type="*widget.scrollBarArea">
-						<widget pos="0,3" size="81x3" type="*widget.scrollBar">
-							<rectangle fillColor="scrollbar" size="81x3"/>
-						</widget>
-					</widget>
 				</widget>
-				<container pos="114,0" size="36x56">
-					<widget size="36x56" type="*widget.Button">
-						<rectangle radius="4" size="36x56"/>
-						<rectangle size="36x56"/>
-						<image fillMode="contain" pos="8,18" rsc="more-horizontal.svg" size="iconInlineSize" themed="default"/>
+				<container pos="114,0" size="36x36">
+					<widget size="36x36" type="*widget.Button">
+						<rectangle radius="4" size="36x36"/>
+						<rectangle size="36x36"/>
+						<image fillMode="contain" pos="8,8" rsc="more-horizontal.svg" size="iconInlineSize" themed="default"/>
 					</widget>
 				</container>
 			</container>
-			<rectangle fillColor="shadow" pos="0,56" size="150x4"/>
-			<rectangle fillColor="primary" pos="0,56" radius="4" size="72x4"/>
-			<widget pos="0,60" size="150x90" type="*widget.Label">
+			<rectangle fillColor="shadow" pos="0,36" size="150x4"/>
+			<rectangle fillColor="primary" pos="0,36" radius="4" size="52x4"/>
+			<widget pos="0,40" size="150x110" type="*widget.Label">
 				<text pos="8,8" size="34x19">Text1</text>
 			</widget>
 		</widget>
diff --git a/container/testdata/doctabs/mobile/change_icon_initial.xml b/container/testdata/doctabs/mobile/change_icon_initial.xml
index 8777680652..aecf735ec1 100644
--- a/container/testdata/doctabs/mobile/change_icon_initial.xml
+++ b/container/testdata/doctabs/mobile/change_icon_initial.xml
@@ -1,42 +1,34 @@
 <canvas size="150x150">
 	<content>
 		<widget size="150x150" type="*container.DocTabs">
-			<container size="150x56">
-				<widget size="110x56" type="*widget.Scroll">
-					<container size="148x56">
-						<widget size="72x56" type="*container.tabButton">
-							<widget pos="48,18" size="20x20" type="*container.tabCloseButton">
+			<container size="150x36">
+				<widget size="110x36" type="*widget.Scroll">
+					<container size="110x36">
+						<widget size="52x36" type="*container.tabButton">
+							<widget pos="28,8" size="20x20" type="*container.tabCloseButton">
 								<image rsc="cancelIcon" size="iconInlineSize" themed="primary"/>
 							</widget>
-							<image pos="16,8" rsc="cancelIcon" size="40x40" themed="primary"/>
+							<image pos="4,8" rsc="cancelIcon" size="iconInlineSize" themed="primary"/>
 						</widget>
-						<widget pos="76,0" size="72x56" type="*container.tabButton">
-							<widget pos="48,18" size="20x20" type="*container.tabCloseButton">
+						<widget pos="56,0" size="52x36" type="*container.tabButton">
+							<widget pos="28,8" size="20x20" type="*container.tabCloseButton">
 								<image rsc="cancelIcon" size="iconInlineSize"/>
 							</widget>
-							<image pos="16,8" rsc="confirmIcon" size="40x40"/>
+							<image pos="4,8" rsc="confirmIcon" size="iconInlineSize"/>
 						</widget>
 					</container>
-					<widget pos="110,0" size="0x56" type="*widget.Shadow">
-						<linearGradient angle="270" endColor="shadow" pos="-8,0" size="8x56"/>
-					</widget>
-					<widget pos="0,50" size="110x6" type="*widget.scrollBarArea">
-						<widget pos="0,3" size="81x3" type="*widget.scrollBar">
-							<rectangle fillColor="scrollbar" size="81x3"/>
-						</widget>
-					</widget>
 				</widget>
-				<container pos="114,0" size="36x56">
-					<widget size="36x56" type="*widget.Button">
-						<rectangle radius="4" size="36x56"/>
-						<rectangle size="36x56"/>
-						<image fillMode="contain" pos="8,18" rsc="more-horizontal.svg" size="iconInlineSize" themed="default"/>
+				<container pos="114,0" size="36x36">
+					<widget size="36x36" type="*widget.Button">
+						<rectangle radius="4" size="36x36"/>
+						<rectangle size="36x36"/>
+						<image fillMode="contain" pos="8,8" rsc="more-horizontal.svg" size="iconInlineSize" themed="default"/>
 					</widget>
 				</container>
 			</container>
-			<rectangle fillColor="shadow" pos="0,56" size="150x4"/>
-			<rectangle fillColor="primary" pos="0,56" radius="4" size="72x4"/>
-			<widget pos="0,60" size="150x90" type="*widget.Label">
+			<rectangle fillColor="shadow" pos="0,36" size="150x4"/>
+			<rectangle fillColor="primary" pos="0,36" radius="4" size="52x4"/>
+			<widget pos="0,40" size="150x110" type="*widget.Label">
 				<text pos="8,8" size="34x19">Text1</text>
 			</widget>
 		</widget>
diff --git a/container/testdata/doctabs/mobile/change_label_change_selected.xml b/container/testdata/doctabs/mobile/change_label_change_selected.xml
index 63a6859578..4677f3fea7 100644
--- a/container/testdata/doctabs/mobile/change_label_change_selected.xml
+++ b/container/testdata/doctabs/mobile/change_label_change_selected.xml
@@ -3,16 +3,16 @@
 		<widget size="150x150" type="*container.DocTabs">
 			<container size="150x36">
 				<widget size="110x36" type="*widget.Scroll">
-					<container size="154x36">
-						<widget size="75x36" type="*container.tabButton">
-							<text bold color="primary" pos="4,8" size="67x19">New 1</text>
-							<widget pos="51,8" size="20x20" type="*container.tabCloseButton">
+					<container size="163x36">
+						<widget size="83x36" type="*container.tabButton">
+							<text bold color="primary" pos="8,8" size="67x20">New 1</text>
+							<widget pos="59,8" size="20x20" type="*container.tabCloseButton">
 								<image rsc="cancelIcon" size="iconInlineSize" themed="primary"/>
 							</widget>
 						</widget>
-						<widget pos="79,0" size="75x36" type="*container.tabButton">
-							<text bold pos="4,8" size="67x19">Test2</text>
-							<widget pos="51,8" size="20x20" type="*container.tabCloseButton">
+						<widget pos="87,0" size="76x36" type="*container.tabButton">
+							<text bold pos="8,8" size="60x20">Test2</text>
+							<widget pos="52,8" size="20x20" type="*container.tabCloseButton">
 								<image rsc="cancelIcon" size="iconInlineSize"/>
 							</widget>
 						</widget>
@@ -21,8 +21,8 @@
 						<linearGradient angle="270" endColor="shadow" pos="-8,0" size="8x36"/>
 					</widget>
 					<widget pos="0,30" size="110x6" type="*widget.scrollBarArea">
-						<widget pos="0,3" size="78x3" type="*widget.scrollBar">
-							<rectangle fillColor="scrollbar" size="78x3"/>
+						<widget pos="0,3" size="74x3" type="*widget.scrollBar">
+							<rectangle fillColor="scrollbar" size="74x3"/>
 						</widget>
 					</widget>
 				</widget>
@@ -35,7 +35,7 @@
 				</container>
 			</container>
 			<rectangle fillColor="shadow" pos="0,36" size="150x4"/>
-			<rectangle fillColor="primary" pos="0,36" radius="4" size="75x4"/>
+			<rectangle fillColor="primary" pos="0,36" radius="4" size="83x4"/>
 			<widget pos="0,40" size="150x110" type="*widget.Label">
 				<text pos="8,8" size="34x19">Text1</text>
 			</widget>
diff --git a/container/testdata/doctabs/mobile/change_label_change_unselected.xml b/container/testdata/doctabs/mobile/change_label_change_unselected.xml
index 11b5e1d393..7bb1918d7d 100644
--- a/container/testdata/doctabs/mobile/change_label_change_unselected.xml
+++ b/container/testdata/doctabs/mobile/change_label_change_unselected.xml
@@ -3,16 +3,16 @@
 		<widget size="150x150" type="*container.DocTabs">
 			<container size="150x36">
 				<widget size="110x36" type="*widget.Scroll">
-					<container size="154x36">
-						<widget size="75x36" type="*container.tabButton">
-							<text bold color="primary" pos="4,8" size="67x19">New 1</text>
-							<widget pos="51,8" size="20x20" type="*container.tabCloseButton">
+					<container size="170x36">
+						<widget size="83x36" type="*container.tabButton">
+							<text bold color="primary" pos="8,8" size="67x20">New 1</text>
+							<widget pos="59,8" size="20x20" type="*container.tabCloseButton">
 								<image rsc="cancelIcon" size="iconInlineSize" themed="primary"/>
 							</widget>
 						</widget>
-						<widget pos="79,0" size="75x36" type="*container.tabButton">
-							<text bold pos="4,8" size="67x19">New 2</text>
-							<widget pos="51,8" size="20x20" type="*container.tabCloseButton">
+						<widget pos="87,0" size="83x36" type="*container.tabButton">
+							<text bold pos="8,8" size="67x20">New 2</text>
+							<widget pos="59,8" size="20x20" type="*container.tabCloseButton">
 								<image rsc="cancelIcon" size="iconInlineSize"/>
 							</widget>
 						</widget>
@@ -21,8 +21,8 @@
 						<linearGradient angle="270" endColor="shadow" pos="-8,0" size="8x36"/>
 					</widget>
 					<widget pos="0,30" size="110x6" type="*widget.scrollBarArea">
-						<widget pos="0,3" size="78x3" type="*widget.scrollBar">
-							<rectangle fillColor="scrollbar" size="78x3"/>
+						<widget pos="0,3" size="71x3" type="*widget.scrollBar">
+							<rectangle fillColor="scrollbar" size="71x3"/>
 						</widget>
 					</widget>
 				</widget>
@@ -35,7 +35,7 @@
 				</container>
 			</container>
 			<rectangle fillColor="shadow" pos="0,36" size="150x4"/>
-			<rectangle fillColor="primary" pos="0,36" radius="4" size="75x4"/>
+			<rectangle fillColor="primary" pos="0,36" radius="4" size="83x4"/>
 			<widget pos="0,40" size="150x110" type="*widget.Label">
 				<text pos="8,8" size="34x19">Text1</text>
 			</widget>
diff --git a/container/testdata/doctabs/mobile/change_label_initial.xml b/container/testdata/doctabs/mobile/change_label_initial.xml
index 9f24e17f28..1b5b1aa832 100644
--- a/container/testdata/doctabs/mobile/change_label_initial.xml
+++ b/container/testdata/doctabs/mobile/change_label_initial.xml
@@ -3,16 +3,16 @@
 		<widget size="150x150" type="*container.DocTabs">
 			<container size="150x36">
 				<widget size="110x36" type="*widget.Scroll">
-					<container size="148x36">
-						<widget size="72x36" type="*container.tabButton">
-							<text bold color="primary" pos="4,8" size="64x19">Test1</text>
-							<widget pos="48,8" size="20x20" type="*container.tabCloseButton">
+					<container size="156x36">
+						<widget size="76x36" type="*container.tabButton">
+							<text bold color="primary" pos="8,8" size="60x20">Test1</text>
+							<widget pos="52,8" size="20x20" type="*container.tabCloseButton">
 								<image rsc="cancelIcon" size="iconInlineSize" themed="primary"/>
 							</widget>
 						</widget>
-						<widget pos="76,0" size="72x36" type="*container.tabButton">
-							<text bold pos="4,8" size="64x19">Test2</text>
-							<widget pos="48,8" size="20x20" type="*container.tabCloseButton">
+						<widget pos="80,0" size="76x36" type="*container.tabButton">
+							<text bold pos="8,8" size="60x20">Test2</text>
+							<widget pos="52,8" size="20x20" type="*container.tabCloseButton">
 								<image rsc="cancelIcon" size="iconInlineSize"/>
 							</widget>
 						</widget>
@@ -21,8 +21,8 @@
 						<linearGradient angle="270" endColor="shadow" pos="-8,0" size="8x36"/>
 					</widget>
 					<widget pos="0,30" size="110x6" type="*widget.scrollBarArea">
-						<widget pos="0,3" size="81x3" type="*widget.scrollBar">
-							<rectangle fillColor="scrollbar" size="81x3"/>
+						<widget pos="0,3" size="77x3" type="*widget.scrollBar">
+							<rectangle fillColor="scrollbar" size="77x3"/>
 						</widget>
 					</widget>
 				</widget>
@@ -35,7 +35,7 @@
 				</container>
 			</container>
 			<rectangle fillColor="shadow" pos="0,36" size="150x4"/>
-			<rectangle fillColor="primary" pos="0,36" radius="4" size="72x4"/>
+			<rectangle fillColor="primary" pos="0,36" radius="4" size="76x4"/>
 			<widget pos="0,40" size="150x110" type="*widget.Label">
 				<text pos="8,8" size="34x19">Text1</text>
 			</widget>
diff --git a/container/testdata/doctabs/mobile/dynamic_appended.xml b/container/testdata/doctabs/mobile/dynamic_appended.xml
index 11cd223128..f9ded16d12 100644
--- a/container/testdata/doctabs/mobile/dynamic_appended.xml
+++ b/container/testdata/doctabs/mobile/dynamic_appended.xml
@@ -4,15 +4,15 @@
 			<container size="300x36">
 				<widget size="260x36" type="*widget.Scroll">
 					<container size="260x36">
-						<widget size="128x36" type="*container.tabButton">
-							<text bold color="primary" pos="4,8" size="120x19">Test1</text>
-							<widget pos="104,8" size="20x20" type="*container.tabCloseButton">
+						<widget size="76x36" type="*container.tabButton">
+							<text bold color="primary" pos="8,8" size="60x20">Test1</text>
+							<widget pos="52,8" size="20x20" type="*container.tabCloseButton">
 								<image rsc="cancelIcon" size="iconInlineSize" themed="primary"/>
 							</widget>
 						</widget>
-						<widget pos="132,0" size="128x36" type="*container.tabButton">
-							<text bold pos="4,8" size="120x19">Test2</text>
-							<widget pos="104,8" size="20x20" type="*container.tabCloseButton">
+						<widget pos="80,0" size="76x36" type="*container.tabButton">
+							<text bold pos="8,8" size="60x20">Test2</text>
+							<widget pos="52,8" size="20x20" type="*container.tabCloseButton">
 								<image rsc="cancelIcon" size="iconInlineSize"/>
 							</widget>
 						</widget>
@@ -27,7 +27,7 @@
 				</container>
 			</container>
 			<rectangle fillColor="shadow" pos="0,36" size="300x4"/>
-			<rectangle fillColor="primary" pos="0,36" radius="4" size="128x4"/>
+			<rectangle fillColor="primary" pos="0,36" radius="4" size="76x4"/>
 			<widget pos="0,40" size="300x110" type="*widget.Label">
 				<text pos="8,8" size="38x19">Text 1</text>
 			</widget>
diff --git a/container/testdata/doctabs/mobile/dynamic_appended_and_removed.xml b/container/testdata/doctabs/mobile/dynamic_appended_and_removed.xml
index 59a354a729..df39a97749 100644
--- a/container/testdata/doctabs/mobile/dynamic_appended_and_removed.xml
+++ b/container/testdata/doctabs/mobile/dynamic_appended_and_removed.xml
@@ -4,9 +4,9 @@
 			<container size="300x36">
 				<widget size="260x36" type="*widget.Scroll">
 					<container size="260x36">
-						<widget size="260x36" type="*container.tabButton">
-							<text bold color="primary" pos="4,8" size="252x19">Test2</text>
-							<widget pos="236,8" size="20x20" type="*container.tabCloseButton">
+						<widget size="76x36" type="*container.tabButton">
+							<text bold color="primary" pos="8,8" size="60x20">Test2</text>
+							<widget pos="52,8" size="20x20" type="*container.tabCloseButton">
 								<image rsc="cancelIcon" size="iconInlineSize" themed="primary"/>
 							</widget>
 						</widget>
@@ -21,7 +21,7 @@
 				</container>
 			</container>
 			<rectangle fillColor="shadow" pos="0,36" size="300x4"/>
-			<rectangle fillColor="primary" pos="0,36" radius="4" size="260x4"/>
+			<rectangle fillColor="primary" pos="0,36" radius="4" size="76x4"/>
 			<widget pos="0,40" size="300x110" type="*widget.Label">
 				<text pos="8,8" size="38x19">Text 2</text>
 			</widget>
diff --git a/container/testdata/doctabs/mobile/dynamic_appended_another_three.xml b/container/testdata/doctabs/mobile/dynamic_appended_another_three.xml
index b4e262ec87..9d0be92c4e 100644
--- a/container/testdata/doctabs/mobile/dynamic_appended_another_three.xml
+++ b/container/testdata/doctabs/mobile/dynamic_appended_another_three.xml
@@ -3,28 +3,28 @@
 		<widget size="300x150" type="*container.DocTabs">
 			<container size="300x36">
 				<widget size="260x36" type="*widget.Scroll">
-					<container size="300x36">
-						<widget size="72x36" type="*container.tabButton">
-							<text bold color="primary" pos="4,8" size="64x19">Test2</text>
-							<widget pos="48,8" size="20x20" type="*container.tabCloseButton">
+					<container size="317x36">
+						<widget size="76x36" type="*container.tabButton">
+							<text bold color="primary" pos="8,8" size="60x20">Test2</text>
+							<widget pos="52,8" size="20x20" type="*container.tabCloseButton">
 								<image rsc="cancelIcon" size="iconInlineSize" themed="primary"/>
 							</widget>
 						</widget>
-						<widget pos="76,0" size="72x36" type="*container.tabButton">
-							<text bold pos="4,8" size="64x19">Test3</text>
-							<widget pos="48,8" size="20x20" type="*container.tabCloseButton">
+						<widget pos="80,0" size="76x36" type="*container.tabButton">
+							<text bold pos="8,8" size="60x20">Test3</text>
+							<widget pos="52,8" size="20x20" type="*container.tabCloseButton">
 								<image rsc="cancelIcon" size="iconInlineSize"/>
 							</widget>
 						</widget>
-						<widget pos="152,0" size="72x36" type="*container.tabButton">
-							<text bold pos="4,8" size="64x19">Test4</text>
-							<widget pos="48,8" size="20x20" type="*container.tabCloseButton">
+						<widget pos="160,0" size="76x36" type="*container.tabButton">
+							<text bold pos="8,8" size="60x20">Test4</text>
+							<widget pos="52,8" size="20x20" type="*container.tabCloseButton">
 								<image rsc="cancelIcon" size="iconInlineSize"/>
 							</widget>
 						</widget>
-						<widget pos="228,0" size="72x36" type="*container.tabButton">
-							<text bold pos="4,8" size="64x19">Test5</text>
-							<widget pos="48,8" size="20x20" type="*container.tabCloseButton">
+						<widget pos="241,0" size="76x36" type="*container.tabButton">
+							<text bold pos="8,8" size="60x20">Test5</text>
+							<widget pos="52,8" size="20x20" type="*container.tabCloseButton">
 								<image rsc="cancelIcon" size="iconInlineSize"/>
 							</widget>
 						</widget>
@@ -33,8 +33,8 @@
 						<linearGradient angle="270" endColor="shadow" pos="-8,0" size="8x36"/>
 					</widget>
 					<widget pos="0,30" size="260x6" type="*widget.scrollBarArea">
-						<widget pos="0,3" size="225x3" type="*widget.scrollBar">
-							<rectangle fillColor="scrollbar" size="225x3"/>
+						<widget pos="0,3" size="212x3" type="*widget.scrollBar">
+							<rectangle fillColor="scrollbar" size="212x3"/>
 						</widget>
 					</widget>
 				</widget>
@@ -47,7 +47,7 @@
 				</container>
 			</container>
 			<rectangle fillColor="shadow" pos="0,36" size="300x4"/>
-			<rectangle fillColor="primary" pos="0,36" radius="4" size="72x4"/>
+			<rectangle fillColor="primary" pos="0,36" radius="4" size="76x4"/>
 			<widget pos="0,40" size="300x110" type="*widget.Label">
 				<text pos="8,8" size="38x19">Text 2</text>
 			</widget>
diff --git a/container/testdata/doctabs/mobile/dynamic_initial.xml b/container/testdata/doctabs/mobile/dynamic_initial.xml
index 6b79f71956..a93a164b8e 100644
--- a/container/testdata/doctabs/mobile/dynamic_initial.xml
+++ b/container/testdata/doctabs/mobile/dynamic_initial.xml
@@ -4,9 +4,9 @@
 			<container size="300x36">
 				<widget size="260x36" type="*widget.Scroll">
 					<container size="260x36">
-						<widget size="260x36" type="*container.tabButton">
-							<text bold color="primary" pos="4,8" size="252x19">Test1</text>
-							<widget pos="236,8" size="20x20" type="*container.tabCloseButton">
+						<widget size="76x36" type="*container.tabButton">
+							<text bold color="primary" pos="8,8" size="60x20">Test1</text>
+							<widget pos="52,8" size="20x20" type="*container.tabCloseButton">
 								<image rsc="cancelIcon" size="iconInlineSize" themed="primary"/>
 							</widget>
 						</widget>
@@ -21,7 +21,7 @@
 				</container>
 			</container>
 			<rectangle fillColor="shadow" pos="0,36" size="300x4"/>
-			<rectangle fillColor="primary" pos="0,36" radius="4" size="260x4"/>
+			<rectangle fillColor="primary" pos="0,36" radius="4" size="76x4"/>
 			<widget pos="0,40" size="300x110" type="*widget.Label">
 				<text pos="8,8" size="38x19">Text 1</text>
 			</widget>
diff --git a/container/testdata/doctabs/mobile/dynamic_replaced_completely.xml b/container/testdata/doctabs/mobile/dynamic_replaced_completely.xml
index b52b0bad50..4d87866b2a 100644
--- a/container/testdata/doctabs/mobile/dynamic_replaced_completely.xml
+++ b/container/testdata/doctabs/mobile/dynamic_replaced_completely.xml
@@ -4,21 +4,21 @@
 			<container size="300x36">
 				<widget size="260x36" type="*widget.Scroll">
 					<container size="260x36">
-						<widget size="84x36" type="*container.tabButton">
-							<text bold color="primary" pos="4,8" size="76x19">Test6</text>
-							<widget pos="60,8" size="20x20" type="*container.tabCloseButton">
+						<widget size="76x36" type="*container.tabButton">
+							<text bold color="primary" pos="8,8" size="60x20">Test6</text>
+							<widget pos="52,8" size="20x20" type="*container.tabCloseButton">
 								<image rsc="cancelIcon" size="iconInlineSize" themed="primary"/>
 							</widget>
 						</widget>
-						<widget pos="88,0" size="84x36" type="*container.tabButton">
-							<text bold pos="4,8" size="76x19">Test7</text>
-							<widget pos="60,8" size="20x20" type="*container.tabCloseButton">
+						<widget pos="80,0" size="76x36" type="*container.tabButton">
+							<text bold pos="8,8" size="60x20">Test7</text>
+							<widget pos="52,8" size="20x20" type="*container.tabCloseButton">
 								<image rsc="cancelIcon" size="iconInlineSize"/>
 							</widget>
 						</widget>
-						<widget pos="176,0" size="84x36" type="*container.tabButton">
-							<text bold pos="4,8" size="76x19">Test8</text>
-							<widget pos="60,8" size="20x20" type="*container.tabCloseButton">
+						<widget pos="160,0" size="76x36" type="*container.tabButton">
+							<text bold pos="8,8" size="60x20">Test8</text>
+							<widget pos="52,8" size="20x20" type="*container.tabCloseButton">
 								<image rsc="cancelIcon" size="iconInlineSize"/>
 							</widget>
 						</widget>
@@ -33,7 +33,7 @@
 				</container>
 			</container>
 			<rectangle fillColor="shadow" pos="0,36" size="300x4"/>
-			<rectangle fillColor="primary" pos="0,36" radius="4" size="84x4"/>
+			<rectangle fillColor="primary" pos="0,36" radius="4" size="76x4"/>
 			<widget pos="0,40" size="300x110" type="*widget.Label">
 				<text pos="8,8" size="38x19">Text 6</text>
 			</widget>
diff --git a/container/testdata/doctabs/mobile/hover_none.xml b/container/testdata/doctabs/mobile/hover_none.xml
index 10523657c6..be39e6a4ab 100644
--- a/container/testdata/doctabs/mobile/hover_none.xml
+++ b/container/testdata/doctabs/mobile/hover_none.xml
@@ -3,16 +3,16 @@
 		<widget size="150x150" type="*container.DocTabs">
 			<container size="150x36">
 				<widget size="110x36" type="*widget.Scroll">
-					<container size="148x36">
-						<widget size="72x36" type="*container.tabButton">
-							<text bold color="primary" pos="4,8" size="64x19">Test1</text>
-							<widget pos="48,8" size="20x20" type="*container.tabCloseButton">
+					<container size="156x36">
+						<widget size="76x36" type="*container.tabButton">
+							<text bold color="primary" pos="8,8" size="60x20">Test1</text>
+							<widget pos="52,8" size="20x20" type="*container.tabCloseButton">
 								<image rsc="cancelIcon" size="iconInlineSize" themed="primary"/>
 							</widget>
 						</widget>
-						<widget pos="76,0" size="72x36" type="*container.tabButton">
-							<text bold pos="4,8" size="64x19">Test2</text>
-							<widget pos="48,8" size="20x20" type="*container.tabCloseButton">
+						<widget pos="80,0" size="76x36" type="*container.tabButton">
+							<text bold pos="8,8" size="60x20">Test2</text>
+							<widget pos="52,8" size="20x20" type="*container.tabCloseButton">
 								<image rsc="cancelIcon" size="iconInlineSize"/>
 							</widget>
 						</widget>
@@ -21,8 +21,8 @@
 						<linearGradient angle="270" endColor="shadow" pos="-8,0" size="8x36"/>
 					</widget>
 					<widget pos="0,30" size="110x6" type="*widget.scrollBarArea">
-						<widget pos="0,3" size="81x3" type="*widget.scrollBar">
-							<rectangle fillColor="scrollbar" size="81x3"/>
+						<widget pos="0,3" size="77x3" type="*widget.scrollBar">
+							<rectangle fillColor="scrollbar" size="77x3"/>
 						</widget>
 					</widget>
 				</widget>
@@ -35,7 +35,7 @@
 				</container>
 			</container>
 			<rectangle fillColor="shadow" pos="0,36" size="150x4"/>
-			<rectangle fillColor="primary" pos="0,36" radius="3" size="72x4"/>
+			<rectangle fillColor="primary" pos="0,36" radius="3" size="76x4"/>
 			<widget pos="0,40" size="150x110" type="*widget.Label">
 				<text pos="8,8" size="34x19">Text1</text>
 			</widget>
diff --git a/container/testdata/doctabs/mobile/layout_bottom_ico.xml b/container/testdata/doctabs/mobile/layout_bottom_ico.xml
index ce7b86ee72..1df0bd559d 100644
--- a/container/testdata/doctabs/mobile/layout_bottom_ico.xml
+++ b/container/testdata/doctabs/mobile/layout_bottom_ico.xml
@@ -1,28 +1,28 @@
 <canvas size="150x150">
 	<content>
 		<widget size="150x150" type="*container.DocTabs">
-			<container pos="0,94" size="150x56">
-				<widget size="110x56" type="*widget.Scroll">
-					<container size="110x56">
-						<widget size="110x56" type="*container.tabButton">
-							<widget pos="86,18" size="20x20" type="*container.tabCloseButton">
+			<container pos="0,114" size="150x36">
+				<widget size="110x36" type="*widget.Scroll">
+					<container size="110x36">
+						<widget size="52x36" type="*container.tabButton">
+							<widget pos="28,8" size="20x20" type="*container.tabCloseButton">
 								<image rsc="cancelIcon" size="iconInlineSize" themed="primary"/>
 							</widget>
-							<image pos="35,8" rsc="infoIcon" size="40x40" themed="primary"/>
+							<image pos="4,8" rsc="infoIcon" size="iconInlineSize" themed="primary"/>
 						</widget>
 					</container>
 				</widget>
-				<container pos="114,0" size="36x56">
-					<widget size="36x56" type="*widget.Button">
-						<rectangle radius="4" size="36x56"/>
-						<rectangle size="36x56"/>
-						<image fillMode="contain" pos="8,18" rsc="more-horizontal.svg" size="iconInlineSize" themed="default"/>
+				<container pos="114,0" size="36x36">
+					<widget size="36x36" type="*widget.Button">
+						<rectangle radius="4" size="36x36"/>
+						<rectangle size="36x36"/>
+						<image fillMode="contain" pos="8,8" rsc="more-horizontal.svg" size="iconInlineSize" themed="default"/>
 					</widget>
 				</container>
 			</container>
-			<rectangle fillColor="shadow" pos="0,90" size="150x4"/>
-			<rectangle fillColor="primary" pos="0,90" radius="4" size="110x4"/>
-			<circle fillColor="background" size="150x90"/>
+			<rectangle fillColor="shadow" pos="0,110" size="150x4"/>
+			<rectangle fillColor="primary" pos="0,110" radius="4" size="52x4"/>
+			<circle fillColor="background" size="150x110"/>
 		</widget>
 	</content>
 </canvas>
diff --git a/container/testdata/doctabs/mobile/layout_bottom_icon_and_text.xml b/container/testdata/doctabs/mobile/layout_bottom_icon_and_text.xml
index be9e00add3..a7a8acf5e5 100644
--- a/container/testdata/doctabs/mobile/layout_bottom_icon_and_text.xml
+++ b/container/testdata/doctabs/mobile/layout_bottom_icon_and_text.xml
@@ -1,29 +1,29 @@
 <canvas size="150x150">
 	<content>
 		<widget size="150x150" type="*container.DocTabs">
-			<container pos="0,70" size="150x79">
-				<widget size="110x79" type="*widget.Scroll">
-					<container size="110x79">
-						<widget size="110x79" type="*container.tabButton">
-							<text bold color="primary" pos="4,52" size="102x19">Text1</text>
-							<widget pos="86,29" size="20x20" type="*container.tabCloseButton">
+			<container pos="0,114" size="150x36">
+				<widget size="110x36" type="*widget.Scroll">
+					<container size="110x36">
+						<widget size="101x36" type="*container.tabButton">
+							<text bold color="primary" pos="32,8" size="61x20">Text1</text>
+							<widget pos="77,8" size="20x20" type="*container.tabCloseButton">
 								<image rsc="cancelIcon" size="iconInlineSize" themed="primary"/>
 							</widget>
-							<image pos="35,8" rsc="cancelIcon" size="40x40" themed="primary"/>
+							<image pos="8,8" rsc="cancelIcon" size="iconInlineSize" themed="primary"/>
 						</widget>
 					</container>
 				</widget>
-				<container pos="114,0" size="36x79">
-					<widget size="36x79" type="*widget.Button">
-						<rectangle radius="4" size="36x79"/>
-						<rectangle size="36x79"/>
-						<image fillMode="contain" pos="8,29" rsc="more-horizontal.svg" size="iconInlineSize" themed="default"/>
+				<container pos="114,0" size="36x36">
+					<widget size="36x36" type="*widget.Button">
+						<rectangle radius="4" size="36x36"/>
+						<rectangle size="36x36"/>
+						<image fillMode="contain" pos="8,8" rsc="more-horizontal.svg" size="iconInlineSize" themed="default"/>
 					</widget>
 				</container>
 			</container>
-			<rectangle fillColor="shadow" pos="0,66" size="150x4"/>
-			<rectangle fillColor="primary" pos="0,66" radius="4" size="110x4"/>
-			<circle fillColor="background" size="150x66"/>
+			<rectangle fillColor="shadow" pos="0,110" size="150x4"/>
+			<rectangle fillColor="primary" pos="0,110" radius="4" size="101x4"/>
+			<circle fillColor="background" size="150x110"/>
 		</widget>
 	</content>
 </canvas>
diff --git a/container/testdata/doctabs/mobile/layout_bottom_text.xml b/container/testdata/doctabs/mobile/layout_bottom_text.xml
index 704d9466a8..6b149f6c06 100644
--- a/container/testdata/doctabs/mobile/layout_bottom_text.xml
+++ b/container/testdata/doctabs/mobile/layout_bottom_text.xml
@@ -4,9 +4,9 @@
 			<container pos="0,114" size="150x36">
 				<widget size="110x36" type="*widget.Scroll">
 					<container size="110x36">
-						<widget size="110x36" type="*container.tabButton">
-							<text bold color="primary" pos="4,8" size="102x19">Text2</text>
-							<widget pos="86,8" size="20x20" type="*container.tabCloseButton">
+						<widget size="77x36" type="*container.tabButton">
+							<text bold color="primary" pos="8,8" size="61x20">Text2</text>
+							<widget pos="53,8" size="20x20" type="*container.tabCloseButton">
 								<image rsc="cancelIcon" size="iconInlineSize" themed="primary"/>
 							</widget>
 						</widget>
@@ -21,7 +21,7 @@
 				</container>
 			</container>
 			<rectangle fillColor="shadow" pos="0,110" size="150x4"/>
-			<rectangle fillColor="primary" pos="0,110" radius="4" size="110x4"/>
+			<rectangle fillColor="primary" pos="0,110" radius="4" size="77x4"/>
 			<circle fillColor="background" size="150x110"/>
 		</widget>
 	</content>
diff --git a/container/testdata/doctabs/mobile/layout_top_icon.xml b/container/testdata/doctabs/mobile/layout_top_icon.xml
index c2639051ef..087896f2b4 100644
--- a/container/testdata/doctabs/mobile/layout_top_icon.xml
+++ b/container/testdata/doctabs/mobile/layout_top_icon.xml
@@ -1,28 +1,28 @@
 <canvas size="150x150">
 	<content>
 		<widget size="150x150" type="*container.DocTabs">
-			<container size="150x56">
-				<widget size="110x56" type="*widget.Scroll">
-					<container size="110x56">
-						<widget size="110x56" type="*container.tabButton">
-							<widget pos="86,18" size="20x20" type="*container.tabCloseButton">
+			<container size="150x36">
+				<widget size="110x36" type="*widget.Scroll">
+					<container size="110x36">
+						<widget size="52x36" type="*container.tabButton">
+							<widget pos="28,8" size="20x20" type="*container.tabCloseButton">
 								<image rsc="cancelIcon" size="iconInlineSize" themed="primary"/>
 							</widget>
-							<image pos="35,8" rsc="infoIcon" size="40x40" themed="primary"/>
+							<image pos="4,8" rsc="infoIcon" size="iconInlineSize" themed="primary"/>
 						</widget>
 					</container>
 				</widget>
-				<container pos="114,0" size="36x56">
-					<widget size="36x56" type="*widget.Button">
-						<rectangle radius="4" size="36x56"/>
-						<rectangle size="36x56"/>
-						<image fillMode="contain" pos="8,18" rsc="more-horizontal.svg" size="iconInlineSize" themed="default"/>
+				<container pos="114,0" size="36x36">
+					<widget size="36x36" type="*widget.Button">
+						<rectangle radius="4" size="36x36"/>
+						<rectangle size="36x36"/>
+						<image fillMode="contain" pos="8,8" rsc="more-horizontal.svg" size="iconInlineSize" themed="default"/>
 					</widget>
 				</container>
 			</container>
-			<rectangle fillColor="shadow" pos="0,56" size="150x4"/>
-			<rectangle fillColor="primary" pos="0,56" radius="4" size="110x4"/>
-			<circle fillColor="background" pos="0,60" size="150x90"/>
+			<rectangle fillColor="shadow" pos="0,36" size="150x4"/>
+			<rectangle fillColor="primary" pos="0,36" radius="4" size="52x4"/>
+			<circle fillColor="background" pos="0,40" size="150x110"/>
 		</widget>
 	</content>
 </canvas>
diff --git a/container/testdata/doctabs/mobile/layout_top_icon_and_text.xml b/container/testdata/doctabs/mobile/layout_top_icon_and_text.xml
index 8b50f0680f..f326c67766 100644
--- a/container/testdata/doctabs/mobile/layout_top_icon_and_text.xml
+++ b/container/testdata/doctabs/mobile/layout_top_icon_and_text.xml
@@ -1,29 +1,29 @@
 <canvas size="150x150">
 	<content>
 		<widget size="150x150" type="*container.DocTabs">
-			<container size="150x79">
-				<widget size="110x79" type="*widget.Scroll">
-					<container size="110x79">
-						<widget size="110x79" type="*container.tabButton">
-							<text bold color="primary" pos="4,52" size="102x19">Text1</text>
-							<widget pos="86,29" size="20x20" type="*container.tabCloseButton">
+			<container size="150x36">
+				<widget size="110x36" type="*widget.Scroll">
+					<container size="110x36">
+						<widget size="101x36" type="*container.tabButton">
+							<text bold color="primary" pos="32,8" size="61x20">Text1</text>
+							<widget pos="77,8" size="20x20" type="*container.tabCloseButton">
 								<image rsc="cancelIcon" size="iconInlineSize" themed="primary"/>
 							</widget>
-							<image pos="35,8" rsc="cancelIcon" size="40x40" themed="primary"/>
+							<image pos="8,8" rsc="cancelIcon" size="iconInlineSize" themed="primary"/>
 						</widget>
 					</container>
 				</widget>
-				<container pos="114,0" size="36x79">
-					<widget size="36x79" type="*widget.Button">
-						<rectangle radius="4" size="36x79"/>
-						<rectangle size="36x79"/>
-						<image fillMode="contain" pos="8,29" rsc="more-horizontal.svg" size="iconInlineSize" themed="default"/>
+				<container pos="114,0" size="36x36">
+					<widget size="36x36" type="*widget.Button">
+						<rectangle radius="4" size="36x36"/>
+						<rectangle size="36x36"/>
+						<image fillMode="contain" pos="8,8" rsc="more-horizontal.svg" size="iconInlineSize" themed="default"/>
 					</widget>
 				</container>
 			</container>
-			<rectangle fillColor="shadow" pos="0,79" size="150x4"/>
-			<rectangle fillColor="primary" pos="0,79" radius="4" size="110x4"/>
-			<circle fillColor="background" pos="0,83" size="150x66"/>
+			<rectangle fillColor="shadow" pos="0,36" size="150x4"/>
+			<rectangle fillColor="primary" pos="0,36" radius="4" size="101x4"/>
+			<circle fillColor="background" pos="0,40" size="150x110"/>
 		</widget>
 	</content>
 </canvas>
diff --git a/container/testdata/doctabs/mobile/layout_top_text.xml b/container/testdata/doctabs/mobile/layout_top_text.xml
index e2a0b4f244..a5398f6ea0 100644
--- a/container/testdata/doctabs/mobile/layout_top_text.xml
+++ b/container/testdata/doctabs/mobile/layout_top_text.xml
@@ -4,9 +4,9 @@
 			<container size="150x36">
 				<widget size="110x36" type="*widget.Scroll">
 					<container size="110x36">
-						<widget size="110x36" type="*container.tabButton">
-							<text bold color="primary" pos="4,8" size="102x19">Text2</text>
-							<widget pos="86,8" size="20x20" type="*container.tabCloseButton">
+						<widget size="77x36" type="*container.tabButton">
+							<text bold color="primary" pos="8,8" size="61x20">Text2</text>
+							<widget pos="53,8" size="20x20" type="*container.tabCloseButton">
 								<image rsc="cancelIcon" size="iconInlineSize" themed="primary"/>
 							</widget>
 						</widget>
@@ -21,7 +21,7 @@
 				</container>
 			</container>
 			<rectangle fillColor="shadow" pos="0,36" size="150x4"/>
-			<rectangle fillColor="primary" pos="0,36" radius="4" size="110x4"/>
+			<rectangle fillColor="primary" pos="0,36" radius="4" size="77x4"/>
 			<circle fillColor="background" pos="0,40" size="150x110"/>
 		</widget>
 	</content>
diff --git a/container/testdata/doctabs/mobile/tab_location_bottom.xml b/container/testdata/doctabs/mobile/tab_location_bottom.xml
index 8b4e701db1..0efc29f7c5 100644
--- a/container/testdata/doctabs/mobile/tab_location_bottom.xml
+++ b/container/testdata/doctabs/mobile/tab_location_bottom.xml
@@ -3,22 +3,22 @@
 		<widget size="72x75" type="*container.DocTabs">
 			<container pos="0,39" size="72x36">
 				<widget size="32x36" type="*widget.Scroll">
-					<container size="224x36">
-						<widget size="72x36" type="*container.tabButton">
-							<text bold color="primary" pos="4,8" size="64x19">Test1</text>
-							<widget pos="48,8" size="20x20" type="*container.tabCloseButton">
+					<container size="237x36">
+						<widget size="76x36" type="*container.tabButton">
+							<text bold color="primary" pos="8,8" size="60x20">Test1</text>
+							<widget pos="52,8" size="20x20" type="*container.tabCloseButton">
 								<image rsc="cancelIcon" size="iconInlineSize" themed="primary"/>
 							</widget>
 						</widget>
-						<widget pos="76,0" size="72x36" type="*container.tabButton">
-							<text bold pos="4,8" size="64x19">Test2</text>
-							<widget pos="48,8" size="20x20" type="*container.tabCloseButton">
+						<widget pos="80,0" size="76x36" type="*container.tabButton">
+							<text bold pos="8,8" size="60x20">Test2</text>
+							<widget pos="52,8" size="20x20" type="*container.tabCloseButton">
 								<image rsc="cancelIcon" size="iconInlineSize"/>
 							</widget>
 						</widget>
-						<widget pos="152,0" size="72x36" type="*container.tabButton">
-							<text bold pos="4,8" size="64x19">Test3</text>
-							<widget pos="48,8" size="20x20" type="*container.tabCloseButton">
+						<widget pos="160,0" size="76x36" type="*container.tabButton">
+							<text bold pos="8,8" size="60x20">Test3</text>
+							<widget pos="52,8" size="20x20" type="*container.tabCloseButton">
 								<image rsc="cancelIcon" size="iconInlineSize"/>
 							</widget>
 						</widget>
diff --git a/container/testdata/doctabs/mobile/tab_location_top.xml b/container/testdata/doctabs/mobile/tab_location_top.xml
index a78ea73487..2f20cf2025 100644
--- a/container/testdata/doctabs/mobile/tab_location_top.xml
+++ b/container/testdata/doctabs/mobile/tab_location_top.xml
@@ -3,22 +3,22 @@
 		<widget size="72x75" type="*container.DocTabs">
 			<container size="72x36">
 				<widget size="32x36" type="*widget.Scroll">
-					<container size="224x36">
-						<widget size="72x36" type="*container.tabButton">
-							<text bold color="primary" pos="4,8" size="64x19">Test1</text>
-							<widget pos="48,8" size="20x20" type="*container.tabCloseButton">
+					<container size="237x36">
+						<widget size="76x36" type="*container.tabButton">
+							<text bold color="primary" pos="8,8" size="60x20">Test1</text>
+							<widget pos="52,8" size="20x20" type="*container.tabCloseButton">
 								<image rsc="cancelIcon" size="iconInlineSize" themed="primary"/>
 							</widget>
 						</widget>
-						<widget pos="76,0" size="72x36" type="*container.tabButton">
-							<text bold pos="4,8" size="64x19">Test2</text>
-							<widget pos="48,8" size="20x20" type="*container.tabCloseButton">
+						<widget pos="80,0" size="76x36" type="*container.tabButton">
+							<text bold pos="8,8" size="60x20">Test2</text>
+							<widget pos="52,8" size="20x20" type="*container.tabCloseButton">
 								<image rsc="cancelIcon" size="iconInlineSize"/>
 							</widget>
 						</widget>
-						<widget pos="152,0" size="72x36" type="*container.tabButton">
-							<text bold pos="4,8" size="64x19">Test3</text>
-							<widget pos="48,8" size="20x20" type="*container.tabCloseButton">
+						<widget pos="160,0" size="76x36" type="*container.tabButton">
+							<text bold pos="8,8" size="60x20">Test3</text>
+							<widget pos="52,8" size="20x20" type="*container.tabCloseButton">
 								<image rsc="cancelIcon" size="iconInlineSize"/>
 							</widget>
 						</widget>
diff --git a/container/testdata/doctabs/mobile/tapped_all_tabs.xml b/container/testdata/doctabs/mobile/tapped_all_tabs.xml
index 94d4bf8792..b07cb0685e 100644
--- a/container/testdata/doctabs/mobile/tapped_all_tabs.xml
+++ b/container/testdata/doctabs/mobile/tapped_all_tabs.xml
@@ -3,28 +3,28 @@
 		<widget size="380x100" type="*container.DocTabs">
 			<container size="380x36">
 				<widget size="300x36" type="*widget.Scroll">
-					<container pos="-69,0" size="369x36">
-						<widget size="89x36" type="*container.tabButton">
-							<text bold pos="4,8" size="81x19">Test1</text>
-							<widget pos="65,8" size="20x20" type="*container.tabCloseButton">
+					<container pos="-38,0" size="338x36">
+						<widget size="76x36" type="*container.tabButton">
+							<text bold pos="8,8" size="60x20">Test1</text>
+							<widget pos="52,8" size="20x20" type="*container.tabCloseButton">
 								<image rsc="cancelIcon" size="iconInlineSize"/>
 							</widget>
 						</widget>
-						<widget pos="93,0" size="89x36" type="*container.tabButton">
-							<text bold pos="4,8" size="81x19">Test2</text>
-							<widget pos="65,8" size="20x20" type="*container.tabCloseButton">
+						<widget pos="80,0" size="76x36" type="*container.tabButton">
+							<text bold pos="8,8" size="60x20">Test2</text>
+							<widget pos="52,8" size="20x20" type="*container.tabCloseButton">
 								<image rsc="cancelIcon" size="iconInlineSize"/>
 							</widget>
 						</widget>
-						<widget pos="186,0" size="89x36" type="*container.tabButton">
-							<text bold pos="4,8" size="81x19">Test3</text>
-							<widget pos="65,8" size="20x20" type="*container.tabCloseButton">
+						<widget pos="160,0" size="76x36" type="*container.tabButton">
+							<text bold pos="8,8" size="60x20">Test3</text>
+							<widget pos="52,8" size="20x20" type="*container.tabCloseButton">
 								<image rsc="cancelIcon" size="iconInlineSize"/>
 							</widget>
 						</widget>
-						<widget pos="280,0" size="89x36" type="*container.tabButton">
-							<text bold color="primary" pos="4,8" size="81x19">Another</text>
-							<widget pos="65,8" size="20x20" type="*container.tabCloseButton">
+						<widget pos="241,0" size="97x36" type="*container.tabButton">
+							<text bold color="primary" pos="8,8" size="81x20">Another</text>
+							<widget pos="73,8" size="20x20" type="*container.tabCloseButton">
 								<image rsc="cancelIcon" size="iconInlineSize" themed="primary"/>
 							</widget>
 						</widget>
@@ -33,8 +33,8 @@
 						<linearGradient angle="270" size="8x36" startColor="shadow"/>
 					</widget>
 					<widget pos="0,30" size="300x6" type="*widget.scrollBarArea">
-						<widget pos="56,3" size="243x3" type="*widget.scrollBar">
-							<rectangle fillColor="scrollbar" size="243x3"/>
+						<widget pos="34,3" size="265x3" type="*widget.scrollBar">
+							<rectangle fillColor="scrollbar" size="265x3"/>
 						</widget>
 					</widget>
 				</widget>
@@ -52,7 +52,7 @@
 				</container>
 			</container>
 			<rectangle fillColor="shadow" pos="0,36" size="380x4"/>
-			<rectangle fillColor="primary" pos="210,36" radius="4" size="89x4"/>
+			<rectangle fillColor="primary" pos="202,36" radius="4" size="97x4"/>
 			<widget pos="0,40" size="380x60" type="*widget.Label">
 				<text pos="8,8" size="80x19">Another Tab</text>
 			</widget>
diff --git a/container/testdata/doctabs/mobile/tapped_create_tab.xml b/container/testdata/doctabs/mobile/tapped_create_tab.xml
index 00e6cb6711..f18434b537 100644
--- a/container/testdata/doctabs/mobile/tapped_create_tab.xml
+++ b/container/testdata/doctabs/mobile/tapped_create_tab.xml
@@ -3,28 +3,28 @@
 		<widget size="380x100" type="*container.DocTabs">
 			<container size="380x36">
 				<widget size="300x36" type="*widget.Scroll">
-					<container pos="-69,0" size="369x36">
-						<widget size="89x36" type="*container.tabButton">
-							<text bold pos="4,8" size="81x19">Test1</text>
-							<widget pos="65,8" size="20x20" type="*container.tabCloseButton">
+					<container pos="-38,0" size="338x36">
+						<widget size="76x36" type="*container.tabButton">
+							<text bold pos="8,8" size="60x20">Test1</text>
+							<widget pos="52,8" size="20x20" type="*container.tabCloseButton">
 								<image rsc="cancelIcon" size="iconInlineSize"/>
 							</widget>
 						</widget>
-						<widget pos="93,0" size="89x36" type="*container.tabButton">
-							<text bold pos="4,8" size="81x19">Test2</text>
-							<widget pos="65,8" size="20x20" type="*container.tabCloseButton">
+						<widget pos="80,0" size="76x36" type="*container.tabButton">
+							<text bold pos="8,8" size="60x20">Test2</text>
+							<widget pos="52,8" size="20x20" type="*container.tabCloseButton">
 								<image rsc="cancelIcon" size="iconInlineSize"/>
 							</widget>
 						</widget>
-						<widget pos="186,0" size="89x36" type="*container.tabButton">
-							<text bold pos="4,8" size="81x19">Test3</text>
-							<widget pos="65,8" size="20x20" type="*container.tabCloseButton">
+						<widget pos="160,0" size="76x36" type="*container.tabButton">
+							<text bold pos="8,8" size="60x20">Test3</text>
+							<widget pos="52,8" size="20x20" type="*container.tabCloseButton">
 								<image rsc="cancelIcon" size="iconInlineSize"/>
 							</widget>
 						</widget>
-						<widget pos="280,0" size="89x36" type="*container.tabButton">
-							<text bold color="primary" pos="4,8" size="81x19">Another</text>
-							<widget pos="65,8" size="20x20" type="*container.tabCloseButton">
+						<widget pos="241,0" size="97x36" type="*container.tabButton">
+							<text bold color="primary" pos="8,8" size="81x20">Another</text>
+							<widget pos="73,8" size="20x20" type="*container.tabCloseButton">
 								<image rsc="cancelIcon" size="iconInlineSize" themed="primary"/>
 							</widget>
 						</widget>
@@ -33,8 +33,8 @@
 						<linearGradient angle="270" size="8x36" startColor="shadow"/>
 					</widget>
 					<widget pos="0,30" size="300x6" type="*widget.scrollBarArea">
-						<widget pos="56,3" size="243x3" type="*widget.scrollBar">
-							<rectangle fillColor="scrollbar" size="243x3"/>
+						<widget pos="34,3" size="265x3" type="*widget.scrollBar">
+							<rectangle fillColor="scrollbar" size="265x3"/>
 						</widget>
 					</widget>
 				</widget>
@@ -52,7 +52,7 @@
 				</container>
 			</container>
 			<rectangle fillColor="shadow" pos="0,36" size="380x4"/>
-			<rectangle fillColor="primary" pos="210,36" radius="4" size="89x4"/>
+			<rectangle fillColor="primary" pos="202,36" radius="4" size="97x4"/>
 			<widget pos="0,40" size="380x60" type="*widget.Label">
 				<text pos="8,8" size="80x19">Another Tab</text>
 			</widget>
diff --git a/container/testdata/doctabs/mobile/tapped_first_selected.xml b/container/testdata/doctabs/mobile/tapped_first_selected.xml
index 8299dcc854..ce23b17ae3 100644
--- a/container/testdata/doctabs/mobile/tapped_first_selected.xml
+++ b/container/testdata/doctabs/mobile/tapped_first_selected.xml
@@ -4,21 +4,21 @@
 			<container size="380x36">
 				<widget size="300x36" type="*widget.Scroll">
 					<container size="300x36">
-						<widget size="97x36" type="*container.tabButton">
-							<text bold color="primary" pos="4,8" size="89x19">Test1</text>
-							<widget pos="73,8" size="20x20" type="*container.tabCloseButton">
+						<widget size="76x36" type="*container.tabButton">
+							<text bold color="primary" pos="8,8" size="60x20">Test1</text>
+							<widget pos="52,8" size="20x20" type="*container.tabCloseButton">
 								<image rsc="cancelIcon" size="iconInlineSize" themed="primary"/>
 							</widget>
 						</widget>
-						<widget pos="101,0" size="97x36" type="*container.tabButton">
-							<text bold pos="4,8" size="89x19">Test2</text>
-							<widget pos="73,8" size="20x20" type="*container.tabCloseButton">
+						<widget pos="80,0" size="76x36" type="*container.tabButton">
+							<text bold pos="8,8" size="60x20">Test2</text>
+							<widget pos="52,8" size="20x20" type="*container.tabCloseButton">
 								<image rsc="cancelIcon" size="iconInlineSize"/>
 							</widget>
 						</widget>
-						<widget pos="202,0" size="97x36" type="*container.tabButton">
-							<text bold pos="4,8" size="89x19">Test3</text>
-							<widget pos="73,8" size="20x20" type="*container.tabCloseButton">
+						<widget pos="160,0" size="76x36" type="*container.tabButton">
+							<text bold pos="8,8" size="60x20">Test3</text>
+							<widget pos="52,8" size="20x20" type="*container.tabCloseButton">
 								<image rsc="cancelIcon" size="iconInlineSize"/>
 							</widget>
 						</widget>
@@ -38,7 +38,7 @@
 				</container>
 			</container>
 			<rectangle fillColor="shadow" pos="0,36" size="380x4"/>
-			<rectangle fillColor="primary" pos="0,36" radius="4" size="97x4"/>
+			<rectangle fillColor="primary" pos="0,36" radius="4" size="76x4"/>
 			<widget pos="0,40" size="380x60" type="*widget.Label">
 				<text pos="8,8" size="38x19">Text 1</text>
 			</widget>
diff --git a/container/testdata/doctabs/mobile/tapped_second_selected.xml b/container/testdata/doctabs/mobile/tapped_second_selected.xml
index dd421a8a68..6eb72bf8ef 100644
--- a/container/testdata/doctabs/mobile/tapped_second_selected.xml
+++ b/container/testdata/doctabs/mobile/tapped_second_selected.xml
@@ -4,21 +4,21 @@
 			<container size="380x36">
 				<widget size="300x36" type="*widget.Scroll">
 					<container size="300x36">
-						<widget size="97x36" type="*container.tabButton">
-							<text bold pos="4,8" size="89x19">Test1</text>
-							<widget pos="73,8" size="20x20" type="*container.tabCloseButton">
+						<widget size="76x36" type="*container.tabButton">
+							<text bold pos="8,8" size="60x20">Test1</text>
+							<widget pos="52,8" size="20x20" type="*container.tabCloseButton">
 								<image rsc="cancelIcon" size="iconInlineSize"/>
 							</widget>
 						</widget>
-						<widget pos="101,0" size="97x36" type="*container.tabButton">
-							<text bold color="primary" pos="4,8" size="89x19">Test2</text>
-							<widget pos="73,8" size="20x20" type="*container.tabCloseButton">
+						<widget pos="80,0" size="76x36" type="*container.tabButton">
+							<text bold color="primary" pos="8,8" size="60x20">Test2</text>
+							<widget pos="52,8" size="20x20" type="*container.tabCloseButton">
 								<image rsc="cancelIcon" size="iconInlineSize" themed="primary"/>
 							</widget>
 						</widget>
-						<widget pos="202,0" size="97x36" type="*container.tabButton">
-							<text bold pos="4,8" size="89x19">Test3</text>
-							<widget pos="73,8" size="20x20" type="*container.tabCloseButton">
+						<widget pos="160,0" size="76x36" type="*container.tabButton">
+							<text bold pos="8,8" size="60x20">Test3</text>
+							<widget pos="52,8" size="20x20" type="*container.tabCloseButton">
 								<image rsc="cancelIcon" size="iconInlineSize"/>
 							</widget>
 						</widget>
@@ -38,7 +38,7 @@
 				</container>
 			</container>
 			<rectangle fillColor="shadow" pos="0,36" size="380x4"/>
-			<rectangle fillColor="primary" pos="101,36" radius="4" size="97x4"/>
+			<rectangle fillColor="primary" pos="80,36" radius="4" size="76x4"/>
 			<widget pos="0,40" size="380x60" type="*widget.Label">
 				<text pos="8,8" size="38x19">Text 2</text>
 			</widget>
diff --git a/container/testdata/doctabs/mobile/tapped_third_selected.xml b/container/testdata/doctabs/mobile/tapped_third_selected.xml
index eb3338ff1e..71ea3ea207 100644
--- a/container/testdata/doctabs/mobile/tapped_third_selected.xml
+++ b/container/testdata/doctabs/mobile/tapped_third_selected.xml
@@ -4,21 +4,21 @@
 			<container size="380x36">
 				<widget size="300x36" type="*widget.Scroll">
 					<container size="300x36">
-						<widget size="97x36" type="*container.tabButton">
-							<text bold pos="4,8" size="89x19">Test1</text>
-							<widget pos="73,8" size="20x20" type="*container.tabCloseButton">
+						<widget size="76x36" type="*container.tabButton">
+							<text bold pos="8,8" size="60x20">Test1</text>
+							<widget pos="52,8" size="20x20" type="*container.tabCloseButton">
 								<image rsc="cancelIcon" size="iconInlineSize"/>
 							</widget>
 						</widget>
-						<widget pos="101,0" size="97x36" type="*container.tabButton">
-							<text bold pos="4,8" size="89x19">Test2</text>
-							<widget pos="73,8" size="20x20" type="*container.tabCloseButton">
+						<widget pos="80,0" size="76x36" type="*container.tabButton">
+							<text bold pos="8,8" size="60x20">Test2</text>
+							<widget pos="52,8" size="20x20" type="*container.tabCloseButton">
 								<image rsc="cancelIcon" size="iconInlineSize"/>
 							</widget>
 						</widget>
-						<widget pos="202,0" size="97x36" type="*container.tabButton">
-							<text bold color="primary" pos="4,8" size="89x19">Test3</text>
-							<widget pos="73,8" size="20x20" type="*container.tabCloseButton">
+						<widget pos="160,0" size="76x36" type="*container.tabButton">
+							<text bold color="primary" pos="8,8" size="60x20">Test3</text>
+							<widget pos="52,8" size="20x20" type="*container.tabCloseButton">
 								<image rsc="cancelIcon" size="iconInlineSize" themed="primary"/>
 							</widget>
 						</widget>
@@ -38,7 +38,7 @@
 				</container>
 			</container>
 			<rectangle fillColor="shadow" pos="0,36" size="380x4"/>
-			<rectangle fillColor="primary" pos="202,36" radius="4" size="97x4"/>
+			<rectangle fillColor="primary" pos="160,36" radius="4" size="76x4"/>
 			<widget pos="0,40" size="380x60" type="*widget.Label">
 				<text pos="8,8" size="38x19">Text 3</text>
 			</widget>
diff --git a/container/testdata/doctabs/mobile/theme_default.png b/container/testdata/doctabs/mobile/theme_default.png
index f742f4ea0a..939c4a293a 100644
Binary files a/container/testdata/doctabs/mobile/theme_default.png and b/container/testdata/doctabs/mobile/theme_default.png differ
diff --git a/container/testdata/doctabs/mobile/theme_ugly.png b/container/testdata/doctabs/mobile/theme_ugly.png
index 0704d5d9d5..1ab9a5491c 100644
Binary files a/container/testdata/doctabs/mobile/theme_ugly.png and b/container/testdata/doctabs/mobile/theme_ugly.png differ