diff --git a/app/images/markitup/bold.png b/app/images/markitup/bold.png
old mode 100755
new mode 100644
index 889ae80e..714fd12b
Binary files a/app/images/markitup/bold.png and b/app/images/markitup/bold.png differ
diff --git a/app/images/markitup/code.png b/app/images/markitup/code.png
index 63fe6cef..a4156e2b 100644
Binary files a/app/images/markitup/code.png and b/app/images/markitup/code.png differ
diff --git a/app/images/markitup/italic.png b/app/images/markitup/italic.png
old mode 100755
new mode 100644
index 8482ac8c..3793aa56
Binary files a/app/images/markitup/italic.png and b/app/images/markitup/italic.png differ
diff --git a/app/images/markitup/link.png b/app/images/markitup/link.png
index 25eacb7c..9a610fb5 100755
Binary files a/app/images/markitup/link.png and b/app/images/markitup/link.png differ
diff --git a/app/images/markitup/list-bullet.png b/app/images/markitup/list-bullet.png
old mode 100755
new mode 100644
index 4a8672bd..1b45081e
Binary files a/app/images/markitup/list-bullet.png and b/app/images/markitup/list-bullet.png differ
diff --git a/app/images/markitup/list-numeric.png b/app/images/markitup/list-numeric.png
index 33b0b8df..e01ac608 100755
Binary files a/app/images/markitup/list-numeric.png and b/app/images/markitup/list-numeric.png differ
diff --git a/app/images/markitup/picture.png b/app/images/markitup/picture.png
old mode 100755
new mode 100644
index 4a158fef..5e638e1d
Binary files a/app/images/markitup/picture.png and b/app/images/markitup/picture.png differ
diff --git a/app/images/markitup/quotes.png b/app/images/markitup/quotes.png
index e54ebeba..55620b63 100644
Binary files a/app/images/markitup/quotes.png and b/app/images/markitup/quotes.png differ
diff --git a/app/images/markitup/stroke.png b/app/images/markitup/stroke.png
old mode 100755
new mode 100644
index 612058a7..1b3971f1
Binary files a/app/images/markitup/stroke.png and b/app/images/markitup/stroke.png differ
diff --git a/app/styles/main.scss b/app/styles/main.scss
new file mode 100755
index 00000000..f16173d8
--- /dev/null
+++ b/app/styles/main.scss
@@ -0,0 +1,150 @@
+// THIS IS THE MAIN INCLUDES SASS FILE
+
+// Bourbon
+$prefix-for-webkit:    true;
+$prefix-for-mozilla:   true;
+$prefix-for-microsoft: true;
+$prefix-for-opera:     true;
+$prefix-for-spec:      true;
+@import 'bourbon/bourbon';
+
+// Codehilite
+@import 'vendor/codehilite.github';
+
+//#################################################
+//             dependencies
+//#################################################
+
+@import 'dependencies/helpers';
+@import 'dependencies/colors';
+@import 'dependencies/typography';
+@import 'dependencies/elements';
+@import 'dependencies/mixins';
+@import 'dependencies/responsive';
+@import 'dependencies/forms';
+@import 'dependencies/animation';
+
+//#################################################
+//             components
+//#################################################
+
+@import 'components/buttons';
+@import 'components/avatar';
+@import 'components/summary';
+@import 'components/popover';
+@import 'components/tag';
+@import 'components/filter';
+@import 'components/taskboard-task';
+@import 'components/kanban-task';
+@import 'components/notification-message';
+@import 'components/basic-table';
+@import 'components/paginator';
+@import 'components/watchers';
+@import 'components/level';
+@import 'components/created-by';
+@import 'components/wysiwyg';
+@import 'components/select-color';
+@import 'components/loader';
+@import 'components/spinner';
+@import 'components/help-notion-button';
+@import 'components/beta';
+@import 'components/markitup';
+
+//#################################################
+//             Modules
+//#################################################
+
+//Common modules
+@import 'modules/common/assigned-to';
+@import 'modules/common/nav';
+@import 'modules/common/projects-nav';
+@import 'modules/common/lightbox';
+@import 'modules/common/colors-table';
+@import 'modules/common/category-config';
+@import 'modules/common/attachments';
+@import 'modules/common/related-tasks';
+@import 'modules/common/history';
+@import 'modules/common/wizard';
+
+//Project modules
+@import 'modules/home-projects-list';
+@import 'modules/home-project';
+@import 'modules/create-project';
+
+//Issues modules
+@import 'modules/issues/issues-table';
+
+//Kanban modules
+@import 'modules/kanban/kanban-table';
+
+//Search modules
+@import 'modules/search/search-filter';
+@import 'modules/search/search-result-table';
+@import 'modules/search/search-in';
+
+//Filters modules
+@import 'modules/filters/filters';
+@import 'modules/filters/list-filters';
+@import 'modules/filters/filter-tags';
+
+//Backlog modules
+@import 'modules/backlog/sprints';
+@import 'modules/backlog/burndown';
+@import 'modules/backlog/backlog-table';
+@import 'modules/backlog/taskboard-table';
+
+//Login modules
+@import 'modules/auth/login-form';
+@import 'modules/auth/register-form';
+@import 'modules/auth/forgot-form';
+@import 'modules/auth/change-password-from-recovery';
+
+//Wiki modules
+@import 'modules/wiki/wiki-nav';
+@import 'modules/wiki/wiki-summary';
+
+//modules admin
+@import 'modules/admin/admin-menu';
+@import 'modules/admin/admin-submenu';
+@import 'modules/admin/admin-submenu-roles';
+@import 'modules/admin/admin-roles';
+@import 'modules/admin/admin-functionalities';
+@import 'modules/admin/admin-membership-table';
+@import 'modules/admin/admin-project-profile';
+@import 'modules/admin/default-values';
+@import 'modules/admin/project-values';
+
+//Modules user Settings
+@import 'modules/user-settings/user-profile';
+@import 'modules/user-settings/user-change-password';
+@import 'modules/user-settings/mail-notifications-table';
+
+//#################################################
+//             Layout
+//#################################################
+
+@import 'layout/base';
+@import 'layout/login';
+@import 'layout/invitation';
+@import 'layout/not-found';
+@import 'layout/backlog';
+@import 'layout/taskboard';
+@import 'layout/us-detail';
+@import 'layout/admin-memberships';
+@import 'layout/admin-project-values';
+@import 'layout/project-colors';
+@import 'layout/kanban';
+@import 'layout/issues';
+@import 'layout/wiki';
+@import 'layout/wiki-edit';
+
+//#################################################
+//             Help
+//#################################################
+@import 'modules/help/lightbox-generic-notion';
+
+//#################################################
+//             Shame
+//#################################################
+
+@import 'shame/shame';
diff --git a/app/styles/modules/common/assigned-to.scss b/app/styles/modules/common/assigned-to.scss
index a5afcaba..a55f8589 100644
--- a/app/styles/modules/common/assigned-to.scss
+++ b/app/styles/modules/common/assigned-to.scss
@@ -2,6 +2,14 @@
     @include table-flex();
     margin-top: 1rem;
     position: relative;
+    &:hover {
+        .assigned-to {
+            .icon-delete {
+                @include transition (opacity .3s linear);
+                opacity: 1;
+            }
+        }
+    }
     &.loading {
         width: 100%;
         span {
@@ -43,7 +51,7 @@
         }
         .icon-delete {
             color: $gray-light;
-            opacity: 1;
+            opacity: 0;
             position: absolute;
             right: 0;
             top: 0;