diff --git a/twidere/src/main/java/org/mariotaku/twidere/fragment/support/UserFragment.java b/twidere/src/main/java/org/mariotaku/twidere/fragment/support/UserFragment.java
index 50b6d8d49..2e4416460 100644
--- a/twidere/src/main/java/org/mariotaku/twidere/fragment/support/UserFragment.java
+++ b/twidere/src/main/java/org/mariotaku/twidere/fragment/support/UserFragment.java
@@ -88,6 +88,7 @@ import com.squareup.otto.Subscribe;
 
 import org.mariotaku.querybuilder.Expression;
 import org.mariotaku.twidere.R;
+import org.mariotaku.twidere.activity.iface.IControlBarActivity;
 import org.mariotaku.twidere.activity.iface.IThemedActivity;
 import org.mariotaku.twidere.activity.support.AccountSelectorActivity;
 import org.mariotaku.twidere.activity.support.ColorPickerDialogActivity;
@@ -1180,7 +1181,8 @@ public class UserFragment extends BaseSupportFragment implements OnClickListener
     @Override
     protected void fitSystemWindows(Rect insets) {
         final ThemedAppCompatActivity activity = (ThemedAppCompatActivity) getActivity();
-        mHeaderDrawerLayout.setPadding(insets.left, insets.top, insets.right, insets.bottom);
+        mHeaderDrawerLayout.setPadding(insets.left, Utils.getInsetsTopWithoutActionBarHeight(activity, insets.top),
+                insets.right, insets.bottom);
         final String backgroundOption = activity.getCurrentThemeBackgroundOption();
         final boolean isTransparentBackground = ThemeUtils.isTransparentBackground(backgroundOption);
         mHeaderDrawerLayout.setClipToPadding(isTransparentBackground);
@@ -1495,6 +1497,8 @@ public class UserFragment extends BaseSupportFragment implements OnClickListener
         profileBannerContainer.setTranslationY(-offset);
         profileBannerView.setTranslationY(offset / 2);
 
+        final ThemedAppCompatActivity activity = (ThemedAppCompatActivity) getActivity();
+
         if (mActionBarBackground != null && mTintedStatusContent != null) {
             mActionBarBackground.setFactor(factor);
             mTintedStatusContent.setFactor(factor);
@@ -1508,8 +1512,6 @@ public class UserFragment extends BaseSupportFragment implements OnClickListener
             }
             mActionBarBackground.setOutlineAlphaFactor(tabOutlineAlphaFactor);
 
-            final ThemedAppCompatActivity activity = (ThemedAppCompatActivity) getActivity();
-
             if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
                 setCompatToolbarOverlayAlpha(activity, factor * tabOutlineAlphaFactor);
             }
diff --git a/twidere/src/main/res/layout/activity_compose_bottombar.xml b/twidere/src/main/res/layout/activity_compose_bottombar.xml
index 3cc54c067..8e4cf7b74 100644
--- a/twidere/src/main/res/layout/activity_compose_bottombar.xml
+++ b/twidere/src/main/res/layout/activity_compose_bottombar.xml
@@ -35,6 +35,10 @@
         android:layout_alignParentStart="true"
         android:clickable="true"
         android:paddingBottom="@dimen/element_spacing_msmall"
+        android:paddingEnd="@dimen/element_spacing_msmall"
+        android:paddingLeft="@dimen/element_spacing_msmall"
+        android:paddingRight="@dimen/element_spacing_msmall"
+        android:paddingStart="@dimen/element_spacing_msmall"
         android:paddingTop="@dimen/element_spacing_msmall">
 
         <org.mariotaku.twidere.view.SquareShapedImageView
diff --git a/twidere/src/main/res/layout/dialog_status_quote_retweet.xml b/twidere/src/main/res/layout/dialog_status_quote_retweet.xml
index 95b85ccaa..ebac090bc 100644
--- a/twidere/src/main/res/layout/dialog_status_quote_retweet.xml
+++ b/twidere/src/main/res/layout/dialog_status_quote_retweet.xml
@@ -33,6 +33,7 @@
         android:orientation="vertical">
 
         <LinearLayout
+            android:id="@+id/comment_container"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="horizontal">
diff --git a/twidere/src/main/res/xml/preferences_account_refresh.xml b/twidere/src/main/res/xml/preferences_account_refresh.xml
index 820014226..5e4c999cb 100644
--- a/twidere/src/main/res/xml/preferences_account_refresh.xml
+++ b/twidere/src/main/res/xml/preferences_account_refresh.xml
@@ -30,15 +30,15 @@
             android:title="@string/trends"/>
     </PreferenceCategory>
 
-    <PreferenceCategory
-        android:enabled="false"
-        android:key="cat_streaming"
-        android:title="@string/streaming">
+    <!--<PreferenceCategory-->
+        <!--android:enabled="false"-->
+        <!--android:key="cat_streaming"-->
+        <!--android:title="@string/streaming">-->
 
-        <org.mariotaku.twidere.preference.AutoFixSwitchPreference
-            android:key="enable_streaming"
-            android:title="@string/enable_streaming"/>
+        <!--<org.mariotaku.twidere.preference.AutoFixSwitchPreference-->
+            <!--android:key="enable_streaming"-->
+            <!--android:title="@string/enable_streaming"/>-->
 
-    </PreferenceCategory>
+    <!--</PreferenceCategory>-->
 
 </PreferenceScreen>
\ No newline at end of file