diff --git a/core/js/dist/main.js b/core/js/dist/main.js
index 41bfa87009..471fb01138 100644
Binary files a/core/js/dist/main.js and b/core/js/dist/main.js differ
diff --git a/core/js/dist/main.js.map b/core/js/dist/main.js.map
index 51f26ab294..bfbbeac1ce 100644
Binary files a/core/js/dist/main.js.map and b/core/js/dist/main.js.map differ
diff --git a/core/css/images/ui-bg_diagonals-thick_20_666666_40x40.png b/core/src/jquery/css/images/ui-bg_diagonals-thick_20_666666_40x40.png
similarity index 100%
rename from core/css/images/ui-bg_diagonals-thick_20_666666_40x40.png
rename to core/src/jquery/css/images/ui-bg_diagonals-thick_20_666666_40x40.png
diff --git a/core/css/images/ui-bg_flat_10_000000_40x100.png b/core/src/jquery/css/images/ui-bg_flat_10_000000_40x100.png
similarity index 100%
rename from core/css/images/ui-bg_flat_10_000000_40x100.png
rename to core/src/jquery/css/images/ui-bg_flat_10_000000_40x100.png
diff --git a/core/css/images/ui-bg_flat_35_1d2d44_40x100.png b/core/src/jquery/css/images/ui-bg_flat_35_1d2d44_40x100.png
similarity index 100%
rename from core/css/images/ui-bg_flat_35_1d2d44_40x100.png
rename to core/src/jquery/css/images/ui-bg_flat_35_1d2d44_40x100.png
diff --git a/core/css/images/ui-icons_1d2d44_256x240.png b/core/src/jquery/css/images/ui-icons_1d2d44_256x240.png
similarity index 100%
rename from core/css/images/ui-icons_1d2d44_256x240.png
rename to core/src/jquery/css/images/ui-icons_1d2d44_256x240.png
diff --git a/core/css/images/ui-icons_ffd27a_256x240.png b/core/src/jquery/css/images/ui-icons_ffd27a_256x240.png
similarity index 100%
rename from core/css/images/ui-icons_ffd27a_256x240.png
rename to core/src/jquery/css/images/ui-icons_ffd27a_256x240.png
diff --git a/core/css/images/ui-icons_ffffff_256x240.png b/core/src/jquery/css/images/ui-icons_ffffff_256x240.png
similarity index 100%
rename from core/css/images/ui-icons_ffffff_256x240.png
rename to core/src/jquery/css/images/ui-icons_ffffff_256x240.png
diff --git a/core/css/jquery-ui-fixes.scss b/core/src/jquery/css/jquery-ui-fixes.scss
similarity index 100%
rename from core/css/jquery-ui-fixes.scss
rename to core/src/jquery/css/jquery-ui-fixes.scss
diff --git a/core/src/jquery/index.js b/core/src/jquery/index.js
index 8e2feb2b65..cb7c6e705e 100644
--- a/core/src/jquery/index.js
+++ b/core/src/jquery/index.js
@@ -30,3 +30,5 @@ import './selectrange'
 import './showpassword'
 import './tipsy'
 import './ui-fixes'
+
+import './css/jquery-ui-fixes.scss'
diff --git a/core/webpack.js b/core/webpack.js
index 651bffaad9..bd40e30122 100644
--- a/core/webpack.js
+++ b/core/webpack.js
@@ -16,6 +16,10 @@ module.exports = [
 					test: /\.css$/,
 					use: ['style-loader', 'css-loader']
 				},
+				{
+					test: /\.scss$/,
+					use: ['style-loader', 'css-loader', 'sass-loader']
+				},
 				{
 					test: /davclient/,
 					use: 'exports-loader?dav'
diff --git a/lib/private/legacy/template.php b/lib/private/legacy/template.php
index 5c49dc960d..61601952e8 100644
--- a/lib/private/legacy/template.php
+++ b/lib/private/legacy/template.php
@@ -111,7 +111,6 @@ class OC_Template extends \OC\Template\Base {
 
 			OC_Util::addStyle('css-variables', null, true);
 			OC_Util::addStyle('server', null, true);
-			OC_Util::addStyle('jquery-ui-fixes',null,true);
 			OC_Util::addStyle('jquery.ocdialog');
 			OC_Util::addTranslations("core", null, true);
 			OC_Util::addStyle('search', 'results');