diff --git a/core/js/dist/main.js b/core/js/dist/main.js
index 41bfa870099a57f406772255236fb5cb2afd0c8b..471fb011386b7555531d3947e31b86453033417a 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 51f26ab294bf9f3d22bcf4cf75ff768f6770bee6..bfbbeac1ce59eb5d06ec72be2015776e51824508 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 8e2feb2b65eb22f128e7a6664925d6373c4f8b1d..cb7c6e705ed4a6003a16d6cb886ad359a3591d55 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 651bffaad9f814d5e1e3c53ab7ab102e5fff614a..bd40e3012292ce10b0151f187b1101dad86e8563 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 5c49dc960d5ba4c9d04fa79572fc30b7920170fd..61601952e871491e3d17177ed56e15e973cc91ae 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');