diff --git a/app/src/main/res/color/toggle_text_color.xml b/app/src/main/res/color/toggle_text_color.xml
new file mode 100644
index 0000000000..3f993e5998
--- /dev/null
+++ b/app/src/main/res/color/toggle_text_color.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_checked="true" android:color="@color/md_white_1000" />
+    <item android:color="@color/daynight_textColor" />
+</selector>
diff --git a/app/src/main/res/drawable/bg_submission_toggle_button.xml b/app/src/main/res/drawable/bg_submission_toggle_button.xml
new file mode 100644
index 0000000000..fbb8fd0f73
--- /dev/null
+++ b/app/src/main/res/drawable/bg_submission_toggle_button.xml
@@ -0,0 +1,14 @@
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_checked="true">
+        <shape android:shape="rectangle">
+            <solid android:color="@color/mainColor" /> <!-- Active background color -->
+            <corners android:radius="8dp" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="@color/card_bg" /> <!-- Inactive background color -->
+            <corners android:radius="8dp" />
+        </shape>
+    </item>
+</selector>
diff --git a/app/src/main/res/drawable/submission_toggle.xml b/app/src/main/res/drawable/submission_toggle.xml
new file mode 100644
index 0000000000..8ae1811f43
--- /dev/null
+++ b/app/src/main/res/drawable/submission_toggle.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@color/card_bg" />
+    <corners android:radius="10dp" />
+    <stroke
+        android:width="2dp"
+        android:color="@color/mainColor" />
+</shape>
diff --git a/app/src/main/res/layout/fragment_my_submission.xml b/app/src/main/res/layout/fragment_my_submission.xml
index 4cc2afc56a..41262304f5 100644
--- a/app/src/main/res/layout/fragment_my_submission.xml
+++ b/app/src/main/res/layout/fragment_my_submission.xml
@@ -2,6 +2,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:background="@color/secondary_bg"
     tools:context=".ui.submission.MySubmissionFragment">
 
@@ -9,67 +10,74 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical">
-
         <LinearLayout
             android:id="@+id/llSearch"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="right"
-            android:gravity="right">
-
-            <RadioGroup
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_gravity="right"
-                android:layout_weight="1"
-                android:gravity="right"
-                android:orientation="horizontal"
-                android:padding="@dimen/padding_normal">
+            android:gravity="center_horizontal"
+            android:orientation="vertical"
+            android:padding="10dp">
 
-                <RadioButton
-                    android:id="@+id/rb_exam"
+                <RadioGroup
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:background="@drawable/bg_green"
-                    android:button="@android:color/transparent"
-                    android:padding="@dimen/padding_normal"
-                    android:text="@string/exams"
-                    android:textSize="20sp" />
-                <RadioButton
-                    android:id="@+id/rb_survey"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:background="@drawable/bg_green"
-                    android:button="@android:color/transparent"
-                    android:padding="@dimen/padding_normal"
-                    android:text="@string/survey"
-                    android:textSize="20sp" />
-            </RadioGroup>
+                    android:orientation="horizontal"
+                    android:gravity="center"
+                    android:background="@drawable/submission_toggle"
+                    android:padding="10dp">
 
-            <com.google.android.material.textfield.TextInputLayout
-                android:id="@+id/tl_search"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_weight="1"
-                android:textColorHint="@color/hint_color">
+                    <RadioButton
+                        android:id="@+id/rb_exam"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:button="@null"
+                        android:background="@drawable/bg_submission_toggle_button"
+                        android:gravity="center"
+                        android:text="@string/exams"
+                        android:textColor="@color/toggle_text_color"
+                        android:textSize="18sp"
+                        android:paddingVertical="3dp"
+                        android:paddingHorizontal="30dp"
+                        android:layout_marginEnd="5dp" />
+
+                    <RadioButton
+                        android:id="@+id/rb_survey"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:button="@null"
+                        android:background="@drawable/bg_submission_toggle_button"
+                        android:gravity="center"
+                        android:text="@string/survey"
+                        android:textColor="@color/toggle_text_color"
+                        android:textSize="18sp"
+                        android:paddingVertical="3dp"
+                        android:paddingHorizontal="30dp"
+                        android:layout_marginStart="5dp" />
+                </RadioGroup>
 
-                <EditText
-                    android:id="@+id/et_search"
+                <com.google.android.material.textfield.TextInputLayout
+                    android:id="@+id/tl_search"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:drawableLeft="@drawable/ic_search"
-                    android:drawableTint="@color/daynight_textColor"
-                    android:hint="@string/search"
-                    android:inputType="text"
-                    android:maxLines="1"
-                    android:backgroundTint="@color/hint_color"
-                    android:textColor="@color/daynight_textColor" />
-            </com.google.android.material.textfield.TextInputLayout>
-        </LinearLayout>
+                    android:layout_marginTop="16dp"
+                    android:textColorHint="@color/hint_color">
 
-        <LinearLayout
+                    <EditText
+                        android:id="@+id/et_search"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:drawableLeft="@drawable/ic_search"
+                        android:drawableTint="@color/daynight_textColor"
+                        android:hint="@string/search"
+                        android:inputType="text"
+                        android:maxLines="1"
+                        android:backgroundTint="@color/hint_color"
+                        android:textColor="@color/daynight_textColor" />
+                </com.google.android.material.textfield.TextInputLayout>
+    </LinearLayout>
+
+
+    <LinearLayout
             android:id="@+id/title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"