diff --git a/lib/Alchemy/Phrasea/Core/CLIProvider/LessBuilderServiceProvider.php b/lib/Alchemy/Phrasea/Core/CLIProvider/LessBuilderServiceProvider.php
index c8b7dbe46a..50dfb22149 100644
--- a/lib/Alchemy/Phrasea/Core/CLIProvider/LessBuilderServiceProvider.php
+++ b/lib/Alchemy/Phrasea/Core/CLIProvider/LessBuilderServiceProvider.php
@@ -34,7 +34,7 @@ class LessBuilderServiceProvider implements ServiceProviderInterface
         $app['phraseanet.less-mapping.customizable'] = $app->share(function ($app) {
             return [
                 $app['root.path'] . '/www/skins/login/less/login.less' => $app['root.path'] . '/www/assets/build/login.css',
-                $app['root.path'] . '/www/skins/account/account.less' => $app['root.path'] . '/www/assets/build/account.css',
+                $app['root.path'] . '/www/skins/account/less/account.less' => $app['root.path'] . '/www/assets/build/account.css',
             ];
         });
 
diff --git a/www/skins/account/account.less b/www/skins/account/less/account.less
similarity index 86%
rename from www/skins/account/account.less
rename to www/skins/account/less/account.less
index 1e45359942..9252dd99c9 100644
--- a/www/skins/account/account.less
+++ b/www/skins/account/less/account.less
@@ -1,48 +1,50 @@
 // CSS Reset
 @import "../../../assets/bootstrap/less/reset.less";
 
-// Core variables and mixins
+  // Core variables and mixins
 @import "../../../assets/bootstrap/less/variables.less";
+
 @import "variables.less";
-@import "../../../plugins/account.less";
+@import "../../../../plugins/account.less";
+
 @import "../../../assets/bootstrap/less/mixins.less";
 
-// Grid system and page structure
+  // Grid system and page structure
 @import "../../../assets/bootstrap/less/scaffolding.less";
 @import "../../../assets/bootstrap/less/grid.less";
 @import "../../../assets/bootstrap/less/layouts.less";
 
-// Base CSS
+  // Base CSS
 @import "../../../assets/bootstrap/less/type.less";
 @import "../../../assets/bootstrap/less/code.less";
 @import "../../../assets/bootstrap/less/forms.less";
 @import "../../../assets/bootstrap/less/tables.less";
 
-// Components: common
+  // Components: common
 @import "../../../assets/bootstrap/less/sprites.less";
 @import "../../../assets/bootstrap/less/dropdowns.less";
 @import "../../../assets/bootstrap/less/wells.less";
 @import "../../../assets/bootstrap/less/component-animations.less";
 @import "../../../assets/bootstrap/less/close.less";
 
-// Components: Buttons & Alerts
+  // Components: Buttons & Alerts
 @import "../../../assets/bootstrap/less/buttons.less";
 @import "../../../assets/bootstrap/less/button-groups.less";
 @import "../../../assets/bootstrap/less/alerts.less"; // Note: alerts share common CSS with buttons and thus have styles in buttons.less
 
-// Components: Nav
+  // Components: Nav
 @import "../../../assets/bootstrap/less/navs.less";
 @import "../../../assets/bootstrap/less/navbar.less";
 @import "../../../assets/bootstrap/less/breadcrumbs.less";
 @import "../../../assets/bootstrap/less/pagination.less";
 @import "../../../assets/bootstrap/less/pager.less";
 
-// Components: Popovers
+  // Components: Popovers
 @import "../../../assets/bootstrap/less/modals.less";
 @import "../../../assets/bootstrap/less/tooltip.less";
 @import "../../../assets/bootstrap/less/popovers.less";
 
-// Components: Misc
+  // Components: Misc
 @import "../../../assets/bootstrap/less/thumbnails.less";
 @import "../../../assets/bootstrap/less/media.less";
 @import "../../../assets/bootstrap/less/labels-badges.less";
@@ -51,12 +53,13 @@
 @import "../../../assets/bootstrap/less/carousel.less";
 @import "../../../assets/bootstrap/less/hero-unit.less";
 
-// Utility classes
+  // Utility classes
 @import "../../../assets/bootstrap/less/utilities.less"; // Has to be last to override when necessary
 
-// Responsive
+  // Responsive
 @import "../../../assets/bootstrap/less/responsive.less";
+
 @import "variables.less";
-@import "../../../plugins/account.less";
+@import "../../../../plugins/account.less";
 
 @import "skin.less";
diff --git a/www/skins/account/skin.less b/www/skins/account/less/skin.less
similarity index 100%
rename from www/skins/account/skin.less
rename to www/skins/account/less/skin.less
diff --git a/www/skins/account/variables.less b/www/skins/account/less/variables.less
similarity index 100%
rename from www/skins/account/variables.less
rename to www/skins/account/less/variables.less