diff --git a/app/src/main/java/app/fedilab/android/activities/MastodonRegisterActivity.java b/app/src/main/java/app/fedilab/android/activities/MastodonRegisterActivity.java
index 5b6b95e70..2fed8c7cb 100644
--- a/app/src/main/java/app/fedilab/android/activities/MastodonRegisterActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/MastodonRegisterActivity.java
@@ -32,12 +32,14 @@ import android.text.style.UnderlineSpan;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
+import android.widget.Spinner;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -91,9 +93,6 @@ public class MastodonRegisterActivity extends BaseActivity implements OnRetrieve
             case Helper.THEME_LIGHT:
                 setTheme(R.style.AppTheme_Fedilab);
                 break;
-            case Helper.THEME_DARK:
-                setTheme(R.style.AppThemeDark);
-                break;
             case Helper.THEME_BLACK:
                 setTheme(R.style.AppThemeBlack);
                 break;
@@ -122,7 +121,7 @@ public class MastodonRegisterActivity extends BaseActivity implements OnRetrieve
         }
 
 
-        MaterialSpinner reg_category = findViewById(R.id.reg_category);
+        Spinner reg_category = findViewById(R.id.reg_category);
         String[] categoriesA = {
                 getString(R.string.category_general),
                 getString(R.string.category_regional),
@@ -155,12 +154,16 @@ public class MastodonRegisterActivity extends BaseActivity implements OnRetrieve
 
         reg_category.setAdapter(adcategories);
 
-        reg_category.setSelectedIndex(0);
+        reg_category.setSelection(0);
         //Manage privacies
-        reg_category.setOnItemSelectedListener(new MaterialSpinner.OnItemSelectedListener<String>() {
+        reg_category.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
             @Override
-            public void onItemSelected(MaterialSpinner view, int position, long id, String item) {
+            public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
                 new RetrieveInstanceRegAsyncTask(MastodonRegisterActivity.this, RetrieveInstanceRegAsyncTask.instanceType.MASTODON, itemA[position], MastodonRegisterActivity.this).executeOnExecutor(THREAD_POOL_EXECUTOR);
+            }
+
+            @Override
+            public void onNothingSelected(AdapterView<?> parent) {
 
             }
         });
diff --git a/app/src/main/res/layout/activity_register.xml b/app/src/main/res/layout/activity_register.xml
index ea2f6404a..a43402196 100644
--- a/app/src/main/res/layout/activity_register.xml
+++ b/app/src/main/res/layout/activity_register.xml
@@ -35,12 +35,13 @@
             android:text="@string/pickup_instance_category"
             android:textSize="16sp" />
 
-        <com.jaredrummler.materialspinner.MaterialSpinner
+        <Spinner
             android:id="@+id/reg_category"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textSize="16sp"
-            app:ms_background_color="?colorPrimaryDark" />
+            android:layout_gravity="end"
+           />
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/reg_category_view"