diff --git a/Habitica/res/layout/class_spinner_dropdown_item.xml b/Habitica/res/layout/class_spinner_dropdown_item.xml
index 402616780..b3cf67212 100644
--- a/Habitica/res/layout/class_spinner_dropdown_item.xml
+++ b/Habitica/res/layout/class_spinner_dropdown_item.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
               android:layout_width="match_parent"
               android:layout_height="match_parent"
-              android:minWidth="100dp"
+              android:minWidth="120dp"
               android:paddingLeft="12dp"
               android:paddingRight="12dp"
               android:paddingTop="4dp"
@@ -16,5 +16,6 @@
     <TextView
         android:id="@+id/textView"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"/>
+        android:layout_height="wrap_content"
+        android:lines="1"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/class_spinner_dropdown_item_selected.xml b/Habitica/res/layout/class_spinner_dropdown_item_selected.xml
new file mode 100644
index 000000000..c340c0f57
--- /dev/null
+++ b/Habitica/res/layout/class_spinner_dropdown_item_selected.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:paddingTop="4dp"
+              android:paddingBottom="4dp"
+              android:gravity="center_vertical|right">
+    <ImageView
+        android:id="@+id/classIconView"
+        android:layout_width="32dp"
+        android:layout_height="32dp"
+        android:layout_marginRight="8dp"/>
+    <TextView
+        android:id="@+id/textView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textSize="16sp"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/HabiticaClassArrayAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/HabiticaClassArrayAdapter.kt
index 3eef63aeb..ba96c7176 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/HabiticaClassArrayAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/HabiticaClassArrayAdapter.kt
@@ -16,11 +16,12 @@ import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 class HabiticaClassArrayAdapter(context: Context?, resource: Int, objects: List<CharSequence>?) : ArrayAdapter<CharSequence>(context, resource, R.id.textView, objects) {
 
     override fun getDropDownView(position: Int, convertView: View?, parent: ViewGroup?): View =
-            getView(position, convertView, parent)
+            createView(position, convertView ?: parent?.inflate(R.layout.class_spinner_dropdown_item, false))
 
-    override fun getView(position: Int, convertView: View?, parent: ViewGroup?): View {
-        val row = convertView ?: parent?.inflate(R.layout.class_spinner_dropdown_item, false)
+    override fun getView(position: Int, convertView: View?, parent: ViewGroup?): View =
+            createView(position, convertView ?: parent?.inflate(R.layout.class_spinner_dropdown_item_selected, false))
 
+    private fun createView(position: Int, row: View?): View {
         val textView: TextView? = row?.findViewById(R.id.textView)
         val imageView: ImageView? = row?.findViewById(R.id.classIconView)
 
@@ -51,8 +52,6 @@ class HabiticaClassArrayAdapter(context: Context?, resource: Int, objects: List<
                 imageView?.setImageBitmap(null)
             }
         }
-
-
         return row ?: View(context)
     }