diff --git a/app/examples/nested-tables-with-async-data-loading-and-sorting/NestedTablesAsyncSortingExample.module.css b/app/examples/nested-tables-with-async-data-loading-and-sorting/NestedTablesAsyncSortingExample.module.css
index 707ebdb3f..d942ba560 100644
--- a/app/examples/nested-tables-with-async-data-loading-and-sorting/NestedTablesAsyncSortingExample.module.css
+++ b/app/examples/nested-tables-with-async-data-loading-and-sorting/NestedTablesAsyncSortingExample.module.css
@@ -1,7 +1,8 @@
 .icon {
-  margin-top: rem(-2px);
-  width: rem(14px);
+  width: rem(13px);
   height: auto;
+  vertical-align: rem(-1px);
+  margin-right: rem(8px);
 }
 
 .expandIcon {
@@ -11,7 +12,3 @@
 .expandIconRotated {
   transform: rotate(90deg);
 }
-
-.employeeName {
-  margin-left: calc(var(--mantine-spacing-xl) * 2);
-}
diff --git a/app/examples/nested-tables-with-async-data-loading-and-sorting/NestedTablesAsyncSortingExample.tsx b/app/examples/nested-tables-with-async-data-loading-and-sorting/NestedTablesAsyncSortingExample.tsx
index efae7028b..304feabe4 100644
--- a/app/examples/nested-tables-with-async-data-loading-and-sorting/NestedTablesAsyncSortingExample.tsx
+++ b/app/examples/nested-tables-with-async-data-loading-and-sorting/NestedTablesAsyncSortingExample.tsx
@@ -1,6 +1,6 @@
 'use client';
 
-import { Group } from '@mantine/core';
+import { Box } from '@mantine/core';
 import { IconBuilding, IconChevronRight, IconUser, IconUsers } from '@tabler/icons-react';
 import { DataTable, DataTableSortStatus } from '__PACKAGE__';
 import clsx from 'clsx';
@@ -25,13 +25,14 @@ function EmployeesTable({ departmentId, sortStatus }: { departmentId: string; so
       columns={[
         {
           accessor: 'name',
+          noWrap: true,
           render: ({ firstName, lastName }) => (
-            <Group gap="xs" wrap="nowrap" className={classes.employeeName}>
+            <Box component="span" ml={40}>
               <IconUser className={classes.icon} />
-              <div>
+              <span>
                 {firstName} {lastName}
-              </div>
-            </Group>
+              </span>
+            </Box>
           ),
         },
         {
@@ -59,16 +60,17 @@ function DepartmentsTable({ companyId, sortStatus }: { companyId: string; sortSt
       columns={[
         {
           accessor: 'name',
+          noWrap: true,
           render: ({ id, name }) => (
-            <Group ml="lg" gap="xs" wrap="nowrap">
+            <Box component="span" ml={20}>
               <IconChevronRight
                 className={clsx(classes.icon, classes.expandIcon, {
                   [classes.expandIconRotated]: expandedRecordIds.includes(id),
                 })}
               />
               <IconUsers className={classes.icon} />
-              <div>{name}</div>
-            </Group>
+              <span>{name}</span>
+            </Box>
           ),
         },
         { accessor: 'employees', textAlign: 'right', width: 200 },
@@ -104,16 +106,17 @@ export function NestedTablesAsyncSortingExample() {
           accessor: 'name',
           sortable: true,
           title: 'Company / Department / Employee',
+          noWrap: true,
           render: ({ id, name }) => (
-            <Group gap="xs">
+            <>
               <IconChevronRight
                 className={clsx(classes.icon, classes.expandIcon, {
                   [classes.expandIconRotated]: expandedRecordIds.includes(id),
                 })}
               />
               <IconBuilding className={classes.icon} />
-              <div>{name}</div>
-            </Group>
+              <span>{name}</span>
+            </>
           ),
         },
         {
diff --git a/app/examples/nested-tables-with-async-data-loading/NestedTablesAsyncExample.module.css b/app/examples/nested-tables-with-async-data-loading/NestedTablesAsyncExample.module.css
index 707ebdb3f..d942ba560 100644
--- a/app/examples/nested-tables-with-async-data-loading/NestedTablesAsyncExample.module.css
+++ b/app/examples/nested-tables-with-async-data-loading/NestedTablesAsyncExample.module.css
@@ -1,7 +1,8 @@
 .icon {
-  margin-top: rem(-2px);
-  width: rem(14px);
+  width: rem(13px);
   height: auto;
+  vertical-align: rem(-1px);
+  margin-right: rem(8px);
 }
 
 .expandIcon {
@@ -11,7 +12,3 @@
 .expandIconRotated {
   transform: rotate(90deg);
 }
-
-.employeeName {
-  margin-left: calc(var(--mantine-spacing-xl) * 2);
-}
diff --git a/app/examples/nested-tables-with-async-data-loading/NestedTablesAsyncExample.tsx b/app/examples/nested-tables-with-async-data-loading/NestedTablesAsyncExample.tsx
index a0a3021ab..2a3e52b60 100644
--- a/app/examples/nested-tables-with-async-data-loading/NestedTablesAsyncExample.tsx
+++ b/app/examples/nested-tables-with-async-data-loading/NestedTablesAsyncExample.tsx
@@ -1,6 +1,6 @@
 'use client';
 
-import { Group } from '@mantine/core';
+import { Box } from '@mantine/core';
 import { IconBuilding, IconChevronRight, IconUser, IconUsers } from '@tabler/icons-react';
 import { DataTable } from '__PACKAGE__';
 import clsx from 'clsx';
@@ -21,13 +21,14 @@ function EmployeesTable({ departmentId }: { departmentId: string }) {
       columns={[
         {
           accessor: 'name',
+          noWrap: true,
           render: ({ firstName, lastName }) => (
-            <Group gap="xs" wrap="nowrap" className={classes.employeeName}>
+            <Box component="span" ml={40}>
               <IconUser className={classes.icon} />
-              <div>
+              <span>
                 {firstName} {lastName}
-              </div>
-            </Group>
+              </span>
+            </Box>
           ),
         },
         {
@@ -55,16 +56,17 @@ function DepartmentsTable({ companyId }: { companyId: string }) {
       columns={[
         {
           accessor: 'name',
+          noWrap: true,
           render: ({ id, name }) => (
-            <Group ml="lg" gap="xs" wrap="nowrap">
+            <Box component="span" ml={20}>
               <IconChevronRight
                 className={clsx(classes.icon, classes.expandIcon, {
                   [classes.expandIconRotated]: expandedRecordIds.includes(id),
                 })}
               />
               <IconUsers className={classes.icon} />
-              <div>{name}</div>
-            </Group>
+              <span>{name}</span>
+            </Box>
           ),
         },
         { accessor: 'employees', textAlign: 'right', width: 200 },
@@ -92,16 +94,17 @@ export function NestedTablesAsyncExample() {
         {
           accessor: 'name',
           title: 'Company / Department / Employee',
+          noWrap: true,
           render: ({ id, name }) => (
-            <Group gap="xs">
+            <>
               <IconChevronRight
                 className={clsx(classes.icon, classes.expandIcon, {
                   [classes.expandIconRotated]: expandedRecordIds.includes(id),
                 })}
               />
               <IconBuilding className={classes.icon} />
-              <div>{name}</div>
-            </Group>
+              <span>{name}</span>
+            </>
           ),
         },
         { accessor: 'employees', title: 'Employees / Birth date', textAlign: 'right', width: 200 },
diff --git a/app/examples/nested-tables/NestedTablesExample.module.css b/app/examples/nested-tables/NestedTablesExample.module.css
index 707ebdb3f..d942ba560 100644
--- a/app/examples/nested-tables/NestedTablesExample.module.css
+++ b/app/examples/nested-tables/NestedTablesExample.module.css
@@ -1,7 +1,8 @@
 .icon {
-  margin-top: rem(-2px);
-  width: rem(14px);
+  width: rem(13px);
   height: auto;
+  vertical-align: rem(-1px);
+  margin-right: rem(8px);
 }
 
 .expandIcon {
@@ -11,7 +12,3 @@
 .expandIconRotated {
   transform: rotate(90deg);
 }
-
-.employeeName {
-  margin-left: calc(var(--mantine-spacing-xl) * 2);
-}
diff --git a/app/examples/nested-tables/NestedTablesExample.tsx b/app/examples/nested-tables/NestedTablesExample.tsx
index e1b5e558d..8f393fd12 100644
--- a/app/examples/nested-tables/NestedTablesExample.tsx
+++ b/app/examples/nested-tables/NestedTablesExample.tsx
@@ -1,6 +1,6 @@
 'use client';
 
-import { Group } from '@mantine/core';
+import { Box } from '@mantine/core';
 import { IconBuilding, IconChevronRight, IconUser, IconUsers } from '@tabler/icons-react';
 import { DataTable } from '__PACKAGE__';
 import clsx from 'clsx';
@@ -23,16 +23,17 @@ export function NestedTablesExample() {
         {
           accessor: 'name',
           title: 'Company / Department / Employee',
+          noWrap: true,
           render: ({ id, name }) => (
-            <Group gap="xs">
+            <>
               <IconChevronRight
                 className={clsx(classes.icon, classes.expandIcon, {
                   [classes.expandIconRotated]: expandedCompanyIds.includes(id),
                 })}
               />
               <IconBuilding className={classes.icon} />
-              <div>{name}</div>
-            </Group>
+              <span>{name}</span>
+            </>
           ),
         },
         { accessor: 'employees', title: 'Employees / Birth date', textAlign: 'right', width: 200 },
@@ -48,16 +49,17 @@ export function NestedTablesExample() {
             columns={[
               {
                 accessor: 'name',
+                noWrap: true,
                 render: ({ id, name }) => (
-                  <Group ml="lg" gap="xs" wrap="nowrap">
+                  <Box component="span" ml={20}>
                     <IconChevronRight
                       className={clsx(classes.icon, classes.expandIcon, {
                         [classes.expandIconRotated]: expandedDepartmentIds.includes(id),
                       })}
                     />
-                    <IconUsers size="0.9em" />
-                    <div>{name}</div>
-                  </Group>
+                    <IconUsers className={classes.icon} />
+                    <span>{name}</span>
+                  </Box>
                 ),
               },
               { accessor: 'employees', textAlign: 'right', width: 200 },
@@ -74,12 +76,12 @@ export function NestedTablesExample() {
                     {
                       accessor: 'name',
                       render: ({ firstName, lastName }) => (
-                        <Group gap="xs" wrap="nowrap" className={classes.employeeName}>
+                        <Box component="span" ml={40}>
                           <IconUser className={classes.icon} />
-                          <div>
+                          <span>
                             {firstName} {lastName}
-                          </div>
-                        </Group>
+                          </span>
+                        </Box>
                       ),
                     },
                     {
diff --git a/app/manifest.webmanifest/route.ts b/app/manifest.webmanifest/route.ts
index 3486a545a..0d2e31fa9 100644
--- a/app/manifest.webmanifest/route.ts
+++ b/app/manifest.webmanifest/route.ts
@@ -25,24 +25,12 @@ const data: MetadataRoute.Manifest = {
       sizes: 'any',
       purpose: 'any',
     },
-    {
-      src: `${urlPrefix}/icon.svg`,
-      type: 'image/svg+xml',
-      sizes: 'any',
-      purpose: 'maskable',
-    },
     {
       src: `${urlPrefix}/icon-192.png`,
       type: 'image/png',
       sizes: '192x192',
       purpose: 'any',
     },
-    {
-      src: `${urlPrefix}/icon-192.png`,
-      type: 'image/png',
-      sizes: '192x192',
-      purpose: 'maskable',
-    },
     {
       src: `${urlPrefix}/icon-512.png`,
       type: 'image/png',
@@ -50,7 +38,13 @@ const data: MetadataRoute.Manifest = {
       purpose: 'any',
     },
     {
-      src: `${urlPrefix}/icon-512.png`,
+      src: `${urlPrefix}/icon-maskable-192.png`,
+      type: 'image/png',
+      sizes: '192x192',
+      purpose: 'maskable',
+    },
+    {
+      src: `${urlPrefix}/icon-maskable-512.png`,
       type: 'image/png',
       sizes: '512x512',
       purpose: 'maskable',
diff --git a/public/icon-maskable-192.png b/public/icon-maskable-192.png
new file mode 100644
index 000000000..a7046c2fa
Binary files /dev/null and b/public/icon-maskable-192.png differ
diff --git a/public/icon-maskable-512.png b/public/icon-maskable-512.png
new file mode 100644
index 000000000..466ecf49d
Binary files /dev/null and b/public/icon-maskable-512.png differ