diff --git a/.github/workflows/hidrive-next-build.yml b/.github/workflows/hidrive-next-build.yml
index 4003a91762670..ed09dd411f362 100644
--- a/.github/workflows/hidrive-next-build.yml
+++ b/.github/workflows/hidrive-next-build.yml
@@ -13,7 +13,6 @@ on:
     paths:
       - '.github/workflows/**'
       - 'src/**'
-      - 'custom-npms/**'
       - 'apps/**'
       - 'apps/**/appinfo/info.xml'
       - 'apps-custom/**'
@@ -82,7 +81,7 @@ jobs:
         run: php -i && php -m
 
       - name: Build Nextcloud
-        run: make -f IONOS/Makefile build_nextcloud FONTAWESOME_PACKAGE_TOKEN=${{ secrets.FONTAWESOME_PACKAGE_TOKEN }}
+        run: make -f IONOS/Makefile build_nextcloud
 
       - name: Install dependencies & build simplesettings app
         env:
diff --git a/.github/workflows/sbom-matrix.yaml b/.github/workflows/sbom-matrix.yaml
index b4ed7f24462b5..365aedde5f9d7 100644
--- a/.github/workflows/sbom-matrix.yaml
+++ b/.github/workflows/sbom-matrix.yaml
@@ -16,7 +16,6 @@ name: SBOM generation (matrix)
 # - Repository secrets:
 #   * DEPENDENCY_TRACK_API_KEY: API key for Dependency Track instance
 #   * IONOS_CA: CA certificate for secure communication
-#   * FONTAWESOME_PACKAGE_TOKEN: Token for FontAwesome packages
 # - Repository variables:
 #   * DEPENDENCY_TRACK_BASE_URL: Base URL of Dependency Track instance
 #   * DT_OBJECT_*: Project IDs for each component in Dependency Track
@@ -259,14 +258,7 @@ jobs:
       - name: Install NPM dependencies
         if: matrix.component.npm_output
         working-directory: ${{ matrix.component.path }}
-        env:
-          FONTAWESOME_PACKAGE_TOKEN: ${{ secrets.FONTAWESOME_PACKAGE_TOKEN }}
         run: |
-          if [ "${{ matrix.component.name }}" == "nextcloud" ]; then
-            cd custom-npms/nc-mdi-js && npm ci && cd ../..
-            cd custom-npms/nc-vue-material-design-icons && npm ci && cd ../..
-            cd custom-npms/nc-nextcloud-vue && npm ci && cd ../..
-          fi
           npm ci
 
       - name: Generate SBOM (NPM)
diff --git a/.gitmodules b/.gitmodules
index 7c6cea0fd7c32..6e47005fa3f6a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,18 +4,6 @@
 [submodule "3rdparty"]
 	path = 3rdparty
 	url = https://github.com/nextcloud/3rdparty.git
-[submodule "custom-npms/nc-vue-material-design-icons"]
-	path = custom-npms/nc-vue-material-design-icons
-	url = git@github.com:IONOS-Productivity/nc-vue-material-design-icons.git
-[submodule "custom-npms/nc-mdi-svg"]
-	path = custom-npms/nc-mdi-svg
-	url = git@github.com:IONOS-Productivity/nc-MaterialDesign-SVG.git
-[submodule "custom-npms/nc-mdi-js"]
-	path = custom-npms/nc-mdi-js
-	url = git@github.com:IONOS-Productivity/nc-MaterialDesign-JS.git
-[submodule "custom-npms/nc-nextcloud-vue"]
-	path = custom-npms/nc-nextcloud-vue
-	url = git@github.com:IONOS-Productivity/nc-nextcloud-vue.git
 [submodule "apps-custom/simplesettings"]
 	path = apps-custom/simplesettings
 	url = git@github.com:IONOS-Productivity/nc-simplesettings.git
diff --git a/apps/files/src/components/FilesListVirtual.vue b/apps/files/src/components/FilesListVirtual.vue
index d085667551858..5fc5d71cac87d 100644
--- a/apps/files/src/components/FilesListVirtual.vue
+++ b/apps/files/src/components/FilesListVirtual.vue
@@ -723,11 +723,15 @@ export default defineComponent({
 					width: var(--icon-preview-size);
 					height: var(--icon-preview-size);
 				}
-				// Slightly decrease the size of the folder icon
+
+				// Slightly increase the size of the folder icon
 				&.folder-icon,
-				&.folder-open-icon svg {
-					width: calc(var(--icon-preview-size) - 6px);
-					height: calc(var(--icon-preview-size) - 6px);
+				&.folder-open-icon {
+					margin: -3px;
+					svg {
+						width: calc(var(--icon-preview-size) + 6px);
+						height: calc(var(--icon-preview-size) + 6px);
+					}
 				}
 			}
 
diff --git a/custom-npms/nc-mdi-js b/custom-npms/nc-mdi-js
deleted file mode 160000
index 8d88d020adff2..0000000000000
--- a/custom-npms/nc-mdi-js
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 8d88d020adff2215b7d87707b63fec6fd7215e9d
diff --git a/custom-npms/nc-mdi-svg b/custom-npms/nc-mdi-svg
deleted file mode 160000
index f5ce243caa55b..0000000000000
--- a/custom-npms/nc-mdi-svg
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit f5ce243caa55b4bc42b37ca037814b7af74144ba
diff --git a/custom-npms/nc-nextcloud-vue b/custom-npms/nc-nextcloud-vue
deleted file mode 160000
index 4b74a2074c8d6..0000000000000
--- a/custom-npms/nc-nextcloud-vue
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 4b74a2074c8d6dbd2c9e33228973b19189fcf6c3
diff --git a/custom-npms/nc-vue-material-design-icons b/custom-npms/nc-vue-material-design-icons
deleted file mode 160000
index 0f588c162bb05..0000000000000
--- a/custom-npms/nc-vue-material-design-icons
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 0f588c162bb05e6676f4b56035dff17eae8d15cf
diff --git a/lib/private/Template/Template.php b/lib/private/Template/Template.php
index 1eb731659b181..040c1daf19ed5 100644
--- a/lib/private/Template/Template.php
+++ b/lib/private/Template/Template.php
@@ -73,7 +73,7 @@ public function __construct(
 	 */
 	protected function findTemplate(string $theme, string $app, string $name): array {
 		// Check if it is a app template or not.
-		if ($app !== '') {
+		if ($app !== '' && $app !== 'core') {
 			try {
 				$appDir = Server::get(IAppManager::class)->getAppPath($app);
 			} catch (AppPathNotFoundException) {