diff --git a/app/build.gradle b/app/build.gradle
index 63d338d2..04eccee4 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -13,8 +13,8 @@ android {
     defaultConfig {
         minSdk 21
         targetSdk 31
-        versionCode 405
-        versionName "3.2.0"
+        versionCode 406
+        versionName "3.2.1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     flavorDimensions "default"
diff --git a/app/src/main/assets/release_notes/notes.json b/app/src/main/assets/release_notes/notes.json
index 5c3e7d8d..d36fbc80 100644
--- a/app/src/main/assets/release_notes/notes.json
+++ b/app/src/main/assets/release_notes/notes.json
@@ -1,4 +1,9 @@
 [
+  {
+    "version": "3.2.1",
+    "code": "406",
+    "note": "Added:\n- Settings to set all timelines at the top\n- Settings to display timelines in a list\n\nFixed:\n- Visibility issue when replying\n- Some theme issues when composing"
+  },
   {
     "version": "3.2.0",
     "code": "405",
diff --git a/app/src/main/java/app/fedilab/android/ui/drawer/ComposeAdapter.java b/app/src/main/java/app/fedilab/android/ui/drawer/ComposeAdapter.java
index d5cfb6c4..b4aa1ad1 100644
--- a/app/src/main/java/app/fedilab/android/ui/drawer/ComposeAdapter.java
+++ b/app/src/main/java/app/fedilab/android/ui/drawer/ComposeAdapter.java
@@ -1119,6 +1119,8 @@ public class ComposeAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
             } else {
                 holder.binding.buttonEmojiOne.setVisibility(View.GONE);
             }
+            holder.binding.visibilityPanel.setBackgroundColor(ContextCompat.getColor(context, R.color.cyanea_primary_dark_reference));
+            holder.binding.attachmentChoicesPanel.setBackgroundColor(ContextCompat.getColor(context, R.color.cyanea_primary_dark_reference));
 
             int newInputType = holder.binding.content.getInputType() & (holder.binding.content.getInputType() ^ InputType.TYPE_TEXT_FLAG_AUTO_COMPLETE);
             holder.binding.content.setInputType(newInputType);
@@ -1429,6 +1431,7 @@ public class ComposeAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
 
         });
 
+
         ArrayAdapter<CharSequence> pollduration = ArrayAdapter.createFromResource(context,
                 R.array.poll_duration, android.R.layout.simple_spinner_dropdown_item);
 
diff --git a/app/src/main/res/layout/compose_poll.xml b/app/src/main/res/layout/compose_poll.xml
index 6cc1a04e..d6ed9479 100644
--- a/app/src/main/res/layout/compose_poll.xml
+++ b/app/src/main/res/layout/compose_poll.xml
@@ -19,6 +19,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_margin="6dp"
+    android:backgroundTint="@color/cyanea_primary_dark_reference"
     app:cardElevation="2dp">
 
     <ScrollView
diff --git a/app/src/main/res/layout/drawer_status_compose.xml b/app/src/main/res/layout/drawer_status_compose.xml
index 802ec5c6..deefe961 100644
--- a/app/src/main/res/layout/drawer_status_compose.xml
+++ b/app/src/main/res/layout/drawer_status_compose.xml
@@ -200,7 +200,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="6dp"
-            android:background="?backgroundColorLight"
             android:elevation="2dp"
             android:visibility="gone"
             app:constraint_referenced_ids="button_attach_image,button_attach_audio,button_attach_video,button_close_attachment_panel,button_poll,button_attach_manual"
@@ -257,7 +256,6 @@
             android:layout_height="wrap_content"
             android:layout_marginHorizontal="6dp"
             android:layout_marginTop="6dp"
-            android:background="?backgroundColorLight"
             android:elevation="2dp"
             android:orientation="vertical"
             android:padding="6dp"