diff --git a/src/components/style_switcher/style_switcher.vue b/src/components/style_switcher/style_switcher.vue
index 30dfdf8d..f92f7299 100644
--- a/src/components/style_switcher/style_switcher.vue
+++ b/src/components/style_switcher/style_switcher.vue
@@ -49,16 +49,17 @@
 
  .color-container {
    display: flex;
+   flex-wrap: wrap;
  }
 
  .color-item {
-   max-width: 7em;
+   max-width: 9em;
    display:flex;
    flex-wrap:wrap;
  }
 
  .theme-color-in {
-   max-width: 6em;
+   max-width: 8em;
    border-radius: 2px;
    border: 0;
    padding: 5px;
diff --git a/src/components/timeline/timeline.vue b/src/components/timeline/timeline.vue
index ad741e3b..0e2ed92c 100644
--- a/src/components/timeline/timeline.vue
+++ b/src/components/timeline/timeline.vue
@@ -14,7 +14,7 @@
         {{$t('timeline.up_to_date')}}
       </div>
     </div>
-    <div class="panel-body base02-background">
+    <div class="panel-body base01-background">
       <div class="timeline">
         <status-or-conversation v-for="status in timeline.visibleStatuses" :key="status.id" v-bind:statusoid="status"></status-or-conversation>
         <a href="#" v-on:click.prevent='fetchOlderStatuses()' v-if="!timeline.loading">
@@ -30,7 +30,7 @@
         {{$t('user_card.followers')}}
       </div>
     </div>
-    <div class="panel-body base02-background">
+    <div class="panel-body base01-background">
       <div class="timeline">
         <user-card v-for="follower in followers" :user="follower" :showFollows="false"></user-card>
       </div>
@@ -42,7 +42,7 @@
         {{$t('user_card.followees')}}
       </div>
     </div>
-    <div class="panel-body base02-background">
+    <div class="panel-body base01-background">
       <div class="timeline">
         <user-card v-for="friend in friends" :user="friend" :showFollows="true"></user-card>
       </div>