diff --git a/UI/WebServerResources/scss/components/button/button.scss b/UI/WebServerResources/scss/components/button/button.scss
index a3a6fe8c1..43a24c289 100644
--- a/UI/WebServerResources/scss/components/button/button.scss
+++ b/UI/WebServerResources/scss/components/button/button.scss
@@ -57,7 +57,7 @@ a.md-button.sg-icon-button,
 .md-button.sg-icon-button,
 md-list md-list-item button.md-button.sg-icon-button {
   @extend .md-button.md-icon-button;
-  transition: $iconButton-transition;
+  //transition: $iconButton-transition;
   &:hover:not([disabled]),
   &:active {
     //background-color: transparent;
diff --git a/UI/WebServerResources/scss/components/icon/icon.scss b/UI/WebServerResources/scss/components/icon/icon.scss
index 7fea8b1ac..171e9db3d 100644
--- a/UI/WebServerResources/scss/components/icon/icon.scss
+++ b/UI/WebServerResources/scss/components/icon/icon.scss
@@ -44,7 +44,7 @@
 
 // Define CSS styles to use ng-class with md-icon
 md-icon {
-  transition: 240ms;
+  transition: transform 240ms;
   &.sg-icon-toolbar-bg {
     font-size: 84px;
     opacity: 0.2;
diff --git a/UI/WebServerResources/scss/components/sidenav/sidenav.scss b/UI/WebServerResources/scss/components/sidenav/sidenav.scss
index bffbc882c..98f175049 100644
--- a/UI/WebServerResources/scss/components/sidenav/sidenav.scss
+++ b/UI/WebServerResources/scss/components/sidenav/sidenav.scss
@@ -42,18 +42,3 @@ $i: 1;
     max-width: 24px;
   }
 }
-
-// This hack is so BAD I am ashame putting it in the shame file
-// -----------------------------------------------------------
-// Folder tree's controler function are very intricate, the way
-// elements are marked as 'active reminds me of good old time JQuery
-// There must be a more straigthforward, angular-way to swap classes
-// selection, but I don't wan't to mess in that script.
-// Here's the hack : on selection I use the parent > child selector to
-// change the definition of the icon's class. Yes, this means that
-// md-icon-folder:before as the value of md-icon-folder-open:before,
-// and this is wrong !
-
-.sg-active i.md-icon-folder:before {
-  @extend .md-icon-folder-open:before;
-}