diff --git a/app/javascript/skins/cybrespace/cybrespace/common.scss b/app/javascript/skins/cybrespace/cybrespace/common.scss
index 1991d2f..6b2b909 100644
--- a/app/javascript/skins/cybrespace/cybrespace/common.scss
+++ b/app/javascript/skins/cybrespace/cybrespace/common.scss
@@ -14,12 +14,3 @@
 .fa-star::before {
   content: "\f0c7";
 }
-
-.status__content .status__content__text,
-.reply-indicator__content .status__content__text {
-  display: block;
-}
-
-.status__avatar {
-  position: initial;
-}
diff --git a/app/javascript/skins/cybrespace/cybrespace/components.scss b/app/javascript/skins/cybrespace/cybrespace/components.scss
index a884fd9..ee51189 100644
--- a/app/javascript/skins/cybrespace/cybrespace/components.scss
+++ b/app/javascript/skins/cybrespace/cybrespace/components.scss
@@ -1,27 +1,4 @@
-.no-reduce-motion .icon-button.star-icon {
-  &.activate {
-    & > .fa-floppy-o {
-      animation: spring-rotate-in 1s linear;
-    }
-  }
-
-  &.deactivate {
-    & > .fa-floppy-o {
-      animation: spring-rotate-out 1s linear;
-    }
-  }
+.account__avatar {
+  border-radius: 0 !important;
 }
 
-.status-card__image-image {
-  border-radius: 0;
-}
-
-.public-layout .container {
-  max-width: initial;
-}
-
-h2 {
-  font-size: 1rem;
-  align-items: center;
-  display: flex;
-}
diff --git a/app/javascript/skins/cybrespace/cybrespace/cybre-base.scss b/app/javascript/skins/cybrespace/cybrespace/cybre-base.scss
index a8887a8..fd0d2cb 100644
--- a/app/javascript/skins/cybrespace/cybrespace/cybre-base.scss
+++ b/app/javascript/skins/cybrespace/cybrespace/cybre-base.scss
@@ -1,4 +1,4 @@
-@import 'styles/application';
+@import 'flavours/glitch/styles/variables';
 
 /* Wider compose area */
 @media screen and (min-width: 1300px) {
@@ -50,8 +50,8 @@
 /* Let the compose area/drawer be short, but
  * expand if necessary */
 .drawer .drawer__inner {
-  overflow: visible;
   height:inherit;
+  max-height: 100%;
   background-image: none;
 }
 .drawer__pager {