diff --git a/changelog/unreleased/bugfix-tiles-view-whitespace b/changelog/unreleased/bugfix-tiles-view-whitespace
new file mode 100644
index 00000000000..75b7300dfd3
--- /dev/null
+++ b/changelog/unreleased/bugfix-tiles-view-whitespace
@@ -0,0 +1,8 @@
+Bugfix: Tilesview has whitespace
+
+We've fixed a bug that caused the tiles-view to have whitespace
+on the right side of the screen which is not optimal for efficiant
+space management.
+
+https://github.com/owncloud/web/pull/10118
+https://github.com/owncloud/web/issues/10040
diff --git a/docs/theming/_index.md b/docs/theming/_index.md
index 0fdf291fcb5..bf9e1ed6c47 100644
--- a/docs/theming/_index.md
+++ b/docs/theming/_index.md
@@ -307,7 +307,9 @@ Size variables get prepended with `--oc-size-`, so e.g. _"icon-default"_ creates
     "icon-default": "",
     "max-height-logo": "",
     "max-width-logo": "",
-    "width-medium": ""
+    "width-medium": "",
+    "tiles-default": "",
+    "tiles-resize-step": ""
   }
 }
 ```
@@ -426,7 +428,9 @@ A full template for your custom theme is provided below, and you can use the ins
             "icon-default": "",
             "max-height-logo": "",
             "max-width-logo": "",
-            "width-medium": ""
+            "width-medium": "",
+            "tiles-default": "",
+            "tiles-resize-step": ""
           },
           "spacing": {
             "xsmall": "",
diff --git a/packages/design-system/src/tokens/ods/size.yaml b/packages/design-system/src/tokens/ods/size.yaml
index 1ac18295e8a..b49008e5b00 100644
--- a/packages/design-system/src/tokens/ods/size.yaml
+++ b/packages/design-system/src/tokens/ods/size.yaml
@@ -24,6 +24,6 @@ size:
     value: 14px
   tiles:
     resize-step:
-      value: 12rem
+      value: 9rem
     default:
-      value: 14rem
+      value: 9rem
diff --git a/packages/web-app-files/src/components/FilesList/ResourceTiles.vue b/packages/web-app-files/src/components/FilesList/ResourceTiles.vue
index 32c5fb00c20..f5c281c7ee6 100644
--- a/packages/web-app-files/src/components/FilesList/ResourceTiles.vue
+++ b/packages/web-app-files/src/components/FilesList/ResourceTiles.vue
@@ -34,7 +34,7 @@
         </oc-list>
       </oc-drop>
     </div>
-    <oc-list class="oc-tiles oc-flex" :class="resizable ? 'resizableTiles' : ''">
+    <oc-list class="oc-tiles oc-flex">
       <li v-for="resource in data" :key="resource.id" class="oc-tiles-item has-item-context-menu">
         <oc-tile
           :ref="(el) => (tileRefs.tiles[resource.id] = el)"
@@ -85,6 +85,16 @@
           </template>
         </oc-tile>
       </li>
+      <li
+        v-for="index in ghostTilesCount"
+        :key="`ghost-tile-${index}`"
+        class="ghost-tile"
+        :aria-hidden="true"
+      >
+        <div>
+          {{ viewSize }}
+        </div>
+      </li>
     </oc-list>
     <Teleport v-if="dragItem" to="body">
       <oc-ghost-element ref="ghostElementRef" :preview-items="[dragItem, ...dragSelection]" />
@@ -96,21 +106,37 @@
 </template>
 
 <script lang="ts">
-import { onBeforeUpdate, defineComponent, nextTick, PropType, computed, ref, unref } from 'vue'
+import {
+  computed,
+  defineComponent,
+  nextTick,
+  onBeforeUnmount,
+  onBeforeUpdate,
+  onMounted,
+  PropType,
+  ref,
+  unref,
+  watch
+} from 'vue'
 import { useGettext } from 'vue3-gettext'
 import { Resource, SpaceResource } from '@ownclouders/web-client'
-import { useStore, SortDir, SortField, ViewModeConstants } from '@ownclouders/web-pkg'
-import { ImageDimension } from '@ownclouders/web-pkg'
-import { createFileRouteOptions } from '@ownclouders/web-pkg'
-import { displayPositionedDropdown } from '@ownclouders/web-pkg'
-import { createLocationSpaces } from '@ownclouders/web-pkg'
-import { ContextMenuQuickAction } from '@ownclouders/web-pkg'
-
 // Constants should match what is being used in OcTable/ResourceTable
 // Alignment regarding naming would be an API-breaking change and can
 // Be done at a later point in time?
-import { useResourceRouteResolver } from '@ownclouders/web-pkg'
-import { eventBus } from '@ownclouders/web-pkg'
+import {
+  ContextMenuQuickAction,
+  createFileRouteOptions,
+  createLocationSpaces,
+  displayPositionedDropdown,
+  eventBus,
+  ImageDimension,
+  SortDir,
+  SortField,
+  useResourceRouteResolver,
+  useStore,
+  useTileSize,
+  ViewModeConstants
+} from '@ownclouders/web-pkg'
 
 export default defineComponent({
   name: 'ResourceTiles',
@@ -123,10 +149,6 @@ export default defineComponent({
       type: Array as PropType<Resource[]>,
       default: () => []
     },
-    resizable: {
-      type: Boolean,
-      default: false
-    },
     selectedIds: {
       type: Array,
       default: () => []
@@ -179,6 +201,7 @@ export default defineComponent({
 
     const dragItem = ref()
     const ghostElementRef = ref()
+
     const tileRefs = ref({
       tiles: [],
       dropBtns: []
@@ -308,7 +331,6 @@ export default defineComponent({
       }
       return sizeMap[props.viewSize] ?? 'xlarge'
     })
-
     onBeforeUpdate(() => {
       tileRefs.value = {
         tiles: [],
@@ -363,6 +385,50 @@ export default defineComponent({
       context.emit('fileDropped', resource.id)
     }
 
+    const viewWidth = ref(0)
+    const updateViewWidth = () => {
+      const element = document.getElementById('tiles-view')
+      const style = getComputedStyle(element)
+      const paddingLeft = parseInt(style.getPropertyValue('padding-left'), 10) | 0
+      const paddingRight = parseInt(style.getPropertyValue('padding-right'), 10) | 0
+      viewWidth.value = element.clientWidth - paddingLeft - paddingRight
+    }
+    const { tileSizePixels: tileSizePixelsBase } = useTileSize()
+    const gapSizePixels = computed(() => {
+      return parseFloat(getComputedStyle(document.documentElement).fontSize)
+    })
+    const maxTiles = computed(() => {
+      return unref(tileSizePixelsBase)
+        ? Math.floor(unref(viewWidth) / (unref(tileSizePixelsBase) + unref(gapSizePixels)))
+        : 0
+    })
+    const ghostTilesCount = computed(() => {
+      const remainder = unref(maxTiles) ? props.data.length % unref(maxTiles) : 0
+      if (!remainder) {
+        return 0
+      }
+      return unref(maxTiles) - remainder
+    })
+
+    const tileSizePixels = computed(() => {
+      return unref(viewWidth) / unref(maxTiles) - unref(gapSizePixels)
+    })
+    watch(
+      tileSizePixels,
+      (px: number) => {
+        document.documentElement.style.setProperty(`--oc-size-tiles-actual`, `${px}px`)
+      },
+      { immediate: true }
+    )
+
+    onMounted(() => {
+      window.addEventListener('resize', updateViewWidth)
+      updateViewWidth()
+    })
+    onBeforeUnmount(() => {
+      window.removeEventListener('resize', updateViewWidth)
+    })
+
     return {
       areFileExtensionsShown,
       emitTileClick,
@@ -383,7 +449,8 @@ export default defineComponent({
       dragStart,
       dragSelection,
       fileDropped,
-      setDropStyling
+      setDropStyling,
+      ghostTilesCount
     }
   },
   data() {
@@ -398,24 +465,10 @@ export default defineComponent({
 .oc-tiles {
   column-gap: 1rem;
   display: grid;
-  grid-template-columns: repeat(auto-fill, minmax(auto, var(--oc-size-tiles-default)));
+  grid-template-columns: repeat(auto-fit, minmax(var(--oc-size-tiles-actual), 1fr));
   justify-content: flex-start;
   row-gap: 1rem;
 
-  &.resizableTiles {
-    grid-template-columns: repeat(auto-fill, minmax(auto, var(--oc-size-tiles-resize-step)));
-  }
-
-  @media only screen and (max-width: 640px) {
-    grid-template-columns: 80%;
-    justify-content: center;
-    padding: var(--oc-space-medium) 0;
-
-    &.resizableTiles {
-      grid-template-columns: 80%;
-    }
-  }
-
   &-item-drop-highlight {
     background-color: var(--oc-color-input-border) !important;
   }
@@ -441,4 +494,17 @@ export default defineComponent({
     }
   }
 }
+
+.ghost-tile {
+  display: list-item;
+
+  div {
+    opacity: 0;
+    box-shadow: none;
+    height: 100%;
+    display: flex;
+    flex-flow: column;
+    outline: 1px solid var(--oc-color-border);
+  }
+}
 </style>
diff --git a/packages/web-app-files/src/views/spaces/GenericSpace.vue b/packages/web-app-files/src/views/spaces/GenericSpace.vue
index 73bef05c018..8600b7edea4 100644
--- a/packages/web-app-files/src/views/spaces/GenericSpace.vue
+++ b/packages/web-app-files/src/views/spaces/GenericSpace.vue
@@ -69,7 +69,6 @@
             v-model:selectedIds="selectedResourcesIds"
             :data="paginatedResources"
             class="oc-px-m oc-pt-l"
-            :resizable="true"
             :target-route-callback="resourceTargetRouteCallback"
             :space="space"
             :drag-drop="true"
diff --git a/packages/web-app-files/src/views/spaces/Projects.vue b/packages/web-app-files/src/views/spaces/Projects.vue
index 09f312e3475..fe7a9e9a977 100644
--- a/packages/web-app-files/src/views/spaces/Projects.vue
+++ b/packages/web-app-files/src/views/spaces/Projects.vue
@@ -49,7 +49,6 @@
             v-model:selectedIds="selectedResourcesIds"
             class="oc-px-m"
             :data="paginatedItems"
-            :resizable="true"
             :sort-fields="sortFields"
             :sort-by="sortBy"
             :sort-dir="sortDir"
diff --git a/packages/web-app-files/tests/unit/components/FilesList/ResourceTiles.spec.ts b/packages/web-app-files/tests/unit/components/FilesList/ResourceTiles.spec.ts
index d90f30ad85f..f06bd3fb660 100644
--- a/packages/web-app-files/tests/unit/components/FilesList/ResourceTiles.spec.ts
+++ b/packages/web-app-files/tests/unit/components/FilesList/ResourceTiles.spec.ts
@@ -3,6 +3,12 @@ import ResourceTiles from 'web-app-files/src/components/FilesList/ResourceTiles.
 import { sortFields } from 'web-app-files/src/helpers/ui/resourceTiles'
 import { Resource } from '@ownclouders/web-client'
 import { mock } from 'jest-mock-extended'
+jest.mock('@ownclouders/web-pkg', () => ({
+  ...jest.requireActual('@ownclouders/web-pkg'),
+  useTileSize: jest.fn().mockReturnValue({
+    tileSizePixels: 100
+  })
+}))
 
 const spacesResources = [
   {
@@ -24,8 +30,37 @@ const spacesResources = [
 ]
 
 describe('ResourceTiles component', () => {
-  it('renders an array of spaces correctly', () => {
+  const originalGetElementById = document.getElementById
+  const originalGetComputedStyle = window.getComputedStyle
+  beforeEach(() => {
+    const mockElement = {
+      clientWidth: 800
+    }
+    ;(document as any).getElementById = jest.fn((id) => {
+      if (id === 'tiles-view') {
+        return mockElement
+      }
+      return originalGetElementById.call(document, id)
+    })
+    window.getComputedStyle = jest.fn().mockImplementation(() => {
+      return {
+        getPropertyValue: (propName) => {
+          switch (propName) {
+            case '--oc-size-tiles-default':
+              return '9rem'
+            case '--oc-size-tiles-resize-step':
+              return '9rem'
+            default:
+              return originalGetComputedStyle(document.documentElement).getPropertyValue(propName)
+          }
+        },
+        fontSize: '14px'
+      }
+    })
+  })
+  it('renders an array of spaces correctly', async () => {
     const { wrapper } = getWrapper({ data: spacesResources })
+    await wrapper.vm.$nextTick()
     expect(wrapper.html()).toMatchSnapshot()
   })
 
diff --git a/packages/web-app-files/tests/unit/components/FilesList/__snapshots__/ResourceTiles.spec.ts.snap b/packages/web-app-files/tests/unit/components/FilesList/__snapshots__/ResourceTiles.spec.ts.snap
index 1a7026cbfe1..f8e51986365 100644
--- a/packages/web-app-files/tests/unit/components/FilesList/__snapshots__/ResourceTiles.spec.ts.snap
+++ b/packages/web-app-files/tests/unit/components/FilesList/__snapshots__/ResourceTiles.spec.ts.snap
@@ -3,7 +3,7 @@
 exports[`ResourceTiles component renders a footer slot 1`] = `
 <div>
   <!--v-if-->
-  <oc-list class="oc-tiles oc-flex"></oc-list>
+  <oc-list class="oc-tiles oc-flex"> </oc-list>
   <!--v-if-->
   <div class="oc-tiles-footer">Hello, ResourceTiles footer!</div>
 </div>
@@ -19,6 +19,21 @@ exports[`ResourceTiles component renders an array of spaces correctly 1`] = `
     <li class="oc-tiles-item has-item-context-menu">
       <oc-tile draggable="false" is-resource-selected="false" resource="[object Object]" resource-icon-size="xlarge" resource-route="[object Object]"></oc-tile>
     </li>
+    <li aria-hidden="true" class="ghost-tile">
+      <div>1</div>
+    </li>
+    <li aria-hidden="true" class="ghost-tile">
+      <div>1</div>
+    </li>
+    <li aria-hidden="true" class="ghost-tile">
+      <div>1</div>
+    </li>
+    <li aria-hidden="true" class="ghost-tile">
+      <div>1</div>
+    </li>
+    <li aria-hidden="true" class="ghost-tile">
+      <div>1</div>
+    </li>
   </oc-list>
   <!--v-if-->
   <div class="oc-tiles-footer"></div>
diff --git a/packages/web-pkg/src/components/ViewOptions.vue b/packages/web-pkg/src/components/ViewOptions.vue
index 9f564008a6b..7ebf545fb8e 100644
--- a/packages/web-pkg/src/components/ViewOptions.vue
+++ b/packages/web-pkg/src/components/ViewOptions.vue
@@ -80,7 +80,6 @@
             max="6"
             class="oc-range"
             data-testid="files-tiles-size-slider"
-            @input="setTilesViewSize"
           />
         </li>
       </oc-list>
@@ -166,15 +165,6 @@ export default defineComponent({
       defaultValue: ViewModeConstants.tilesSizeDefault.toString()
     })
 
-    const setTilesViewSize = () => {
-      const rootStyle = (document.querySelector(':root') as HTMLElement).style
-      const currentSize = rootStyle.getPropertyValue('--oc-size-tiles-resize-step')
-      const newSize = `${(unref(viewSizeQuery) as any) * 12}rem`
-      if (!currentSize || currentSize !== newSize) {
-        rootStyle.setProperty(`--oc-size-tiles-resize-step`, newSize)
-      }
-    }
-
     const setItemsPerPage = (itemsPerPage: string) => {
       return router.replace({
         query: {
@@ -197,16 +187,6 @@ export default defineComponent({
       { immediate: true, deep: true }
     )
 
-    watch(
-      viewSizeQuery,
-      (size) => {
-        if (size) {
-          setTilesViewSize()
-        }
-      },
-      { immediate: true }
-    )
-
     return {
       ViewModeConstants,
       viewModeCurrent: viewModeQuery,
@@ -214,7 +194,6 @@ export default defineComponent({
       itemsPerPageCurrent: itemsPerPageQuery,
       queryParamsLoading,
       queryItemAsString,
-      setTilesViewSize,
       setItemsPerPage,
       setViewMode,
       viewOptionsButtonLabel: $gettext('Display customization options of the files list')
diff --git a/packages/web-pkg/src/composables/viewMode/index.ts b/packages/web-pkg/src/composables/viewMode/index.ts
index b8c1a614979..f9e19722d6a 100644
--- a/packages/web-pkg/src/composables/viewMode/index.ts
+++ b/packages/web-pkg/src/composables/viewMode/index.ts
@@ -1,2 +1,3 @@
 export * from './constants'
+export * from './useTileSize'
 export * from './useViewMode'
diff --git a/packages/web-pkg/src/composables/viewMode/useTileSize.ts b/packages/web-pkg/src/composables/viewMode/useTileSize.ts
new file mode 100644
index 00000000000..fb67a1ab403
--- /dev/null
+++ b/packages/web-pkg/src/composables/viewMode/useTileSize.ts
@@ -0,0 +1,38 @@
+import { useViewSize } from './useViewMode'
+import { computed, onMounted, ref, unref } from 'vue'
+
+export const useTileSize = () => {
+  const viewSize = useViewSize(null)
+
+  const themeVarToPixels = (value: string) => {
+    if (!value.endsWith('rem') && !value.endsWith('px')) {
+      return 0
+    }
+    if (value.endsWith('rem')) {
+      const rem = parseInt(value.replace('rem', '').trim())
+      const fontSize = parseFloat(getComputedStyle(document.documentElement).fontSize)
+      return rem * fontSize
+    }
+    return parseInt(value.replace('px', '').trim())
+  }
+
+  const baseSizePixels = ref(0)
+  const stepSizePixels = ref(0)
+  onMounted(() => {
+    const styles = getComputedStyle(document.documentElement)
+    baseSizePixels.value = themeVarToPixels(styles.getPropertyValue('--oc-size-tiles-default'))
+    stepSizePixels.value = themeVarToPixels(styles.getPropertyValue('--oc-size-tiles-resize-step'))
+  })
+  const tileSizePixels = computed(() => {
+    return unref(baseSizePixels) + (unref(viewSize) - 1) * unref(stepSizePixels)
+  })
+  const tileSizeRem = computed(() => {
+    const fontSize = parseFloat(getComputedStyle(document.documentElement).fontSize)
+    return unref(tileSizePixels) / fontSize
+  })
+
+  return {
+    tileSizePixels,
+    tileSizeRem
+  }
+}
diff --git a/packages/web-pkg/tests/unit/components/ViewOptions.spec.ts b/packages/web-pkg/tests/unit/components/ViewOptions.spec.ts
index f07f3eeba68..4faf27658e6 100644
--- a/packages/web-pkg/tests/unit/components/ViewOptions.spec.ts
+++ b/packages/web-pkg/tests/unit/components/ViewOptions.spec.ts
@@ -1,4 +1,4 @@
-import { ref } from 'vue'
+import { ref, unref } from 'vue'
 import {
   createStore,
   defaultPlugins,
@@ -110,15 +110,12 @@ describe('ViewOptions component', () => {
       })
       expect(wrapper.find(selectors.tileSizeSlider).exists()).toBeTruthy()
     })
-    it.each([1, 2, 3, 4, 5, 6])('applies the correct rem size via css', (tileSize) => {
-      getWrapper({
+    it.each([1, 2, 3, 4, 5, 6])('applies the correct size step', (tileSize) => {
+      const { mocks } = getWrapper({
         tileSize: tileSize.toString(),
         props: { viewModes: [ViewModeConstants.tilesView] }
       })
-      const rootStyle = (document.querySelector(':root') as HTMLElement).style
-      expect(rootStyle.getPropertyValue('--oc-size-tiles-resize-step')).toEqual(
-        `${tileSize * 12}rem`
-      )
+      expect(unref(mocks.tileSizeQueryMock)).toBe(tileSize.toString())
     })
   })
 })
@@ -132,13 +129,15 @@ function getWrapper({
 } = {}) {
   jest.mocked(useRouteQueryPersisted).mockImplementationOnce(() => ref(perPage))
   jest.mocked(useRouteQueryPersisted).mockImplementationOnce(() => ref(viewMode))
-  jest.mocked(useRouteQueryPersisted).mockImplementationOnce(() => ref(tileSize))
+  const tileSizeQueryMock = ref(tileSize)
+  jest.mocked(useRouteQueryPersisted).mockImplementationOnce(() => tileSizeQueryMock)
   jest.mocked(useRouteQuery).mockImplementationOnce(() => ref(currentPage))
 
   const storeOptions = { ...defaultStoreMockOptions }
   const store = createStore(storeOptions)
   const mocks = {
-    ...defaultComponentMocks({ currentRoute: mock<RouteLocation>({ path: '/files' }) })
+    ...defaultComponentMocks({ currentRoute: mock<RouteLocation>({ path: '/files' }) }),
+    tileSizeQueryMock
   }
   return {
     storeOptions,
diff --git a/packages/web-runtime/themes/owncloud/theme.json b/packages/web-runtime/themes/owncloud/theme.json
index cdb137feb20..2482a8162be 100644
--- a/packages/web-runtime/themes/owncloud/theme.json
+++ b/packages/web-runtime/themes/owncloud/theme.json
@@ -48,7 +48,9 @@
             "icon-default": "",
             "max-height-logo": "",
             "max-width-logo": "",
-            "width-medium": ""
+            "width-medium": "",
+            "tiles-default": "",
+            "tiles-resize-step": ""
           },
           "spacing": {
             "xsmall": "",