diff --git a/app/assets/stylesheets/_application.scss b/app/assets/stylesheets/_application.scss
index ab54a70bea06d14430d1d9aeb02776e627cd09bc..98ee7cc9b8aaa6ad659a3ed64da1528c4ecf6e34 100644
--- a/app/assets/stylesheets/_application.scss
+++ b/app/assets/stylesheets/_application.scss
@@ -14,7 +14,7 @@
 @import 'flash_messages';
 @import 'sprites';
 @import 'hovercard';
-@import 'new_styles/base';
+@import 'base';
 @import 'new_styles/interactions';
 @import 'spinner';
 @import 'timeago';
diff --git a/app/assets/stylesheets/new_styles/_base.scss b/app/assets/stylesheets/base.scss
similarity index 57%
rename from app/assets/stylesheets/new_styles/_base.scss
rename to app/assets/stylesheets/base.scss
index 31a5aabfdd5c0366b216aabebbc0b5896cea3095..b701adb49a2372aba95eb6674b52442d56ee1fc9 100644
--- a/app/assets/stylesheets/new_styles/_base.scss
+++ b/app/assets/stylesheets/base.scss
@@ -1,19 +1,21 @@
 body {
   margin-top: $navbar-height;
-  padding : none;
-
-  &.lock {
-    overflow: hidden;
-  }
+  padding: none;
 }
 
-/* Overflow */
-h1, h2, h3, h4, h5, h6,
+// Overflow
+h1,
+h2,
+h3,
+h4,
+h5,
+h6,
 p,
 blockquote,
 code,
 pre { word-wrap: break-word; }
-a.tag { word-break: break-all; }
+
+.tag { word-break: break-all; }
 
 .avatar {
   border-radius: 4px;
@@ -30,8 +32,8 @@ a.tag { word-break: break-all; }
 
   &.medium {
     height: auto;
-    width: auto;
     max-width: 75px;
+    width: auto;
   }
 }
 
@@ -39,41 +41,36 @@ a.tag { word-break: break-all; }
   color: inherit;
 }
 
-#back-to-top {
-  display: block;
-  color: white;
-  position: fixed;
-  z-index: 49;
-  right: 54px;
+.back-to-top {
+  background-color: $border-dark-grey;
+  border-radius: 10px;
   bottom: 20px;
-  opacity: 0;
+  color: $white;
+  display: block;
   font-size: 2.9em;
-  padding: 0 12px 0 12px;
-  border-radius: 10px;
-  background-color: #aaa;
-  &:hover { opacity: 0.85 !important; }
-  &.visible { opacity: 0.5; }
   line-height: 1.5;
-}
+  opacity: 0;
+  padding: 0 12px;
+  position: fixed;
+  right: 54px;
+  z-index: 49;
 
-/* general purpose classes */
+  &:hover,
+  &.visible:hover {
+    color: $white;
+    opacity: .85;
+  }
 
-.small-horizontal-spacer {
-  min-height: 20px;
+  &.visible { opacity: .5; }
 }
 
-.big-horizontal-spacer {
-  height: 50px;
-}
+// general purpose classes
 
-/* responsive */
-@media (max-width: 767px) {
-  body {
-    padding : 0;
-  }
+.small-horizontal-spacer {
+  min-height: 20px;
 }
 
-/* badge color */
+// badge color
 .badge-important {
   background-color: $red;
 }
diff --git a/app/views/people/contacts.haml b/app/views/people/contacts.haml
index b1f416448d63c6a73ee475e539a4cfe32e410da5..b1e993f790ea14e090f0ef14abb5251ca1e1a8dd 100644
--- a/app/views/people/contacts.haml
+++ b/app/views/people/contacts.haml
@@ -23,7 +23,7 @@
             = render partial: 'people/person', locals: hash
         = will_paginate @contacts_of_contact, renderer: WillPaginate::ActionView::BootstrapLinkRenderer
 
-      %a{id:"back-to-top", title:"#{t('layouts.application.back_to_top')}", href:"#"}
+      %a.back-to-top#back-to-top{title: "#{t('layouts.application.back_to_top')}", href: "#"}
         ⇧
 
 -if user_signed_in? && @person
diff --git a/app/views/people/index.html.haml b/app/views/people/index.html.haml
index a2076c3b2fba3b9d1b72d77efb7744a649030f21..79a2f6595fd1ba35847118541f6f9c2d9488ba22 100644
--- a/app/views/people/index.html.haml
+++ b/app/views/people/index.html.haml
@@ -37,7 +37,7 @@
 
           = will_paginate(@people)
 
-        %a{id:"back-to-top", title:"#{t('layouts.application.back_to_top')}", href:"#"}
+        %a.back-to-top#back-to-top{title: "#{t('layouts.application.back_to_top')}", href: "#"}
           ⇧
 
     .col-md-4
diff --git a/app/views/people/show.html.haml b/app/views/people/show.html.haml
index 56b51eb53c6d054f26eb28937d716bfa8b4bc5c5..618b6616d5e3f45d74ed805aef72686287d56ccf 100644
--- a/app/views/people/show.html.haml
+++ b/app/views/people/show.html.haml
@@ -33,7 +33,7 @@
           %span.loader.hidden
             .spinner
 
-      %a{id:"back-to-top", title:"#{t('layouts.application.back_to_top')}", href:"#"}
+      %a.back-to-top#back-to-top{title: "#{t('layouts.application.back_to_top')}", href: "#"}
         ⇧
 
 -if user_signed_in? && @person
diff --git a/app/views/streams/main_stream.html.haml b/app/views/streams/main_stream.html.haml
index 6c9479bd2643dd9c07c56ab74cb410080eec025d..3b40e59df28ac58efb844a118903f78256c831c4 100644
--- a/app/views/streams/main_stream.html.haml
+++ b/app/views/streams/main_stream.html.haml
@@ -57,5 +57,5 @@
 
       = render 'shared/right_sections'
 
-      %a{id:"back-to-top", title:"#{t('layouts.application.back_to_top')}", href:"#"}
+      %a.back-to-top#back-to-top{title: "#{t('layouts.application.back_to_top')}", href: "#"}
         ⇧
diff --git a/app/views/tags/show.haml b/app/views/tags/show.haml
index 8a29d2ca199f66fe31515fbdb838486f0d30781f..67ce267129f2fc838bde01a23ebf7b3c1a9d81c3 100644
--- a/app/views/tags/show.haml
+++ b/app/views/tags/show.haml
@@ -36,5 +36,5 @@
 
     .col-lg-1.visible-lg#right-sidebar-fixed-sub-background
 
-      %a{id:"back-to-top", title:"#{t('layouts.application.back_to_top')}", href:"#"}
+      %a.back-to-top#back-to-top{title: "#{t('layouts.application.back_to_top')}", href: "#"}
         ⇧