diff --git a/src/android/app/src/main/java/org/citra/citra_android/ui/settings/viewholder/CheckBoxSettingViewHolder.java b/src/android/app/src/main/java/org/citra/citra_android/ui/settings/viewholder/CheckBoxSettingViewHolder.java
index 0059f9458..4ee07031d 100644
--- a/src/android/app/src/main/java/org/citra/citra_android/ui/settings/viewholder/CheckBoxSettingViewHolder.java
+++ b/src/android/app/src/main/java/org/citra/citra_android/ui/settings/viewholder/CheckBoxSettingViewHolder.java
@@ -36,6 +36,9 @@ public final class CheckBoxSettingViewHolder extends SettingViewHolder {
 
         if (item.getDescriptionId() > 0) {
             mTextSettingDescription.setText(item.getDescriptionId());
+            mTextSettingDescription.setVisibility(View.VISIBLE);
+        } else {
+            mTextSettingDescription.setVisibility(View.GONE);
         }
 
         mCheckbox.setChecked(mItem.isChecked());
diff --git a/src/android/app/src/main/java/org/citra/citra_android/ui/settings/viewholder/DateTimeViewHolder.java b/src/android/app/src/main/java/org/citra/citra_android/ui/settings/viewholder/DateTimeViewHolder.java
index c9f117770..75295a6ca 100644
--- a/src/android/app/src/main/java/org/citra/citra_android/ui/settings/viewholder/DateTimeViewHolder.java
+++ b/src/android/app/src/main/java/org/citra/citra_android/ui/settings/viewholder/DateTimeViewHolder.java
@@ -31,8 +31,12 @@ public final class DateTimeViewHolder extends SettingViewHolder {
     public void bind(SettingsItem item) {
         mItem = (DateTimeSetting) item;
         mTextSettingName.setText(item.getNameId());
+
         if (item.getDescriptionId() > 0) {
             mTextSettingDescription.setText(item.getDescriptionId());
+            mTextSettingDescription.setVisibility(View.VISIBLE);
+        } else {
+            mTextSettingDescription.setVisibility(View.GONE);
         }
     }
 
diff --git a/src/android/app/src/main/java/org/citra/citra_android/ui/settings/viewholder/InputBindingSettingViewHolder.java b/src/android/app/src/main/java/org/citra/citra_android/ui/settings/viewholder/InputBindingSettingViewHolder.java
index a9fb87824..46e106b9d 100644
--- a/src/android/app/src/main/java/org/citra/citra_android/ui/settings/viewholder/InputBindingSettingViewHolder.java
+++ b/src/android/app/src/main/java/org/citra/citra_android/ui/settings/viewholder/InputBindingSettingViewHolder.java
@@ -38,7 +38,14 @@ public final class InputBindingSettingViewHolder extends SettingViewHolder {
         mItem = (InputBindingSetting) item;
 
         mTextSettingName.setText(item.getNameId());
-        mTextSettingDescription.setText(sharedPreferences.getString(mItem.getKey(), ""));
+
+        String key = sharedPreferences.getString(mItem.getKey(), "");
+        if (key != null && !key.isEmpty()) {
+            mTextSettingDescription.setText(key);
+            mTextSettingDescription.setVisibility(View.VISIBLE);
+        } else {
+            mTextSettingDescription.setVisibility(View.GONE);
+        }
     }
 
     @Override
diff --git a/src/android/app/src/main/java/org/citra/citra_android/ui/settings/viewholder/SingleChoiceViewHolder.java b/src/android/app/src/main/java/org/citra/citra_android/ui/settings/viewholder/SingleChoiceViewHolder.java
index 78928b3d3..222b24663 100644
--- a/src/android/app/src/main/java/org/citra/citra_android/ui/settings/viewholder/SingleChoiceViewHolder.java
+++ b/src/android/app/src/main/java/org/citra/citra_android/ui/settings/viewholder/SingleChoiceViewHolder.java
@@ -30,7 +30,7 @@ public final class SingleChoiceViewHolder extends SettingViewHolder {
         mItem = item;
 
         mTextSettingName.setText(item.getNameId());
-
+        mTextSettingDescription.setVisibility(View.VISIBLE);
         if (item.getDescriptionId() > 0) {
             mTextSettingDescription.setText(item.getDescriptionId());
         } else if (item instanceof SingleChoiceSetting) {
@@ -44,6 +44,8 @@ public final class SingleChoiceViewHolder extends SettingViewHolder {
                     mTextSettingDescription.setText(choices[i]);
                 }
             }
+        } else {
+            mTextSettingDescription.setVisibility(View.GONE);
         }
     }
 
diff --git a/src/android/app/src/main/java/org/citra/citra_android/ui/settings/viewholder/SliderViewHolder.java b/src/android/app/src/main/java/org/citra/citra_android/ui/settings/viewholder/SliderViewHolder.java
index c52c99055..d5ebb5370 100644
--- a/src/android/app/src/main/java/org/citra/citra_android/ui/settings/viewholder/SliderViewHolder.java
+++ b/src/android/app/src/main/java/org/citra/citra_android/ui/settings/viewholder/SliderViewHolder.java
@@ -32,6 +32,9 @@ public final class SliderViewHolder extends SettingViewHolder {
 
         if (item.getDescriptionId() > 0) {
             mTextSettingDescription.setText(item.getDescriptionId());
+            mTextSettingDescription.setVisibility(View.VISIBLE);
+        } else {
+            mTextSettingDescription.setVisibility(View.GONE);
         }
     }
 
diff --git a/src/android/app/src/main/java/org/citra/citra_android/ui/settings/viewholder/SubmenuViewHolder.java b/src/android/app/src/main/java/org/citra/citra_android/ui/settings/viewholder/SubmenuViewHolder.java
index fde19b01f..0469fb957 100644
--- a/src/android/app/src/main/java/org/citra/citra_android/ui/settings/viewholder/SubmenuViewHolder.java
+++ b/src/android/app/src/main/java/org/citra/citra_android/ui/settings/viewholder/SubmenuViewHolder.java
@@ -32,6 +32,9 @@ public final class SubmenuViewHolder extends SettingViewHolder {
 
         if (item.getDescriptionId() > 0) {
             mTextSettingDescription.setText(item.getDescriptionId());
+            mTextSettingDescription.setVisibility(View.VISIBLE);
+        } else {
+            mTextSettingDescription.setVisibility(View.GONE);
         }
     }
 
diff --git a/src/android/app/src/main/res/layout/list_item_setting.xml b/src/android/app/src/main/res/layout/list_item_setting.xml
index d150d5326..f4d7b59f3 100644
--- a/src/android/app/src/main/res/layout/list_item_setting.xml
+++ b/src/android/app/src/main/res/layout/list_item_setting.xml
@@ -3,37 +3,39 @@
                 xmlns:tools="http://schemas.android.com/tools"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:minHeight="72dp"
                 android:background="?android:attr/selectableItemBackground"
+                android:clickable="true"
                 android:focusable="true"
-                android:clickable="true">
+                android:gravity="center_vertical"
+                android:minHeight="72dp"
+                android:paddingTop="@dimen/spacing_large"
+                android:paddingBottom="@dimen/spacing_large">
 
     <TextView
+        android:id="@+id/text_setting_name"
+        style="@style/TextAppearance.AppCompat.Headline"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        style="@style/TextAppearance.AppCompat.Headline"
-        tools:text="Setting Name"
-        android:layout_alignParentEnd="true"
         android:layout_alignParentStart="true"
         android:layout_alignParentTop="true"
+        android:layout_alignParentEnd="true"
         android:layout_marginStart="@dimen/spacing_large"
         android:layout_marginEnd="@dimen/spacing_large"
-        android:layout_marginTop="@dimen/spacing_large"
-        android:id="@+id/text_setting_name"
-        android:textSize="16sp"/>
+        android:textSize="16sp"
+        tools:text="Setting Name" />
 
     <TextView
+        android:id="@+id/text_setting_description"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        tools:text="@string/overclock_enable_description"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentStart="true"
-        android:layout_marginStart="@dimen/spacing_large"
-        android:layout_marginEnd="@dimen/spacing_large"
-        android:layout_marginBottom="@dimen/spacing_large"
-        android:layout_marginTop="@dimen/spacing_small"
-        android:id="@+id/text_setting_description"
         android:layout_below="@+id/text_setting_name"
-        android:layout_alignStart="@+id/text_setting_name"/>
+        android:layout_alignStart="@+id/text_setting_name"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentEnd="true"
+        android:layout_marginStart="@dimen/spacing_large"
+        android:layout_marginTop="@dimen/spacing_small"
+        android:layout_marginEnd="@dimen/spacing_large"
+        android:visibility="visible"
+        tools:text="@string/app_disclaimer" />
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/src/android/app/src/main/res/layout/list_item_settings_header.xml b/src/android/app/src/main/res/layout/list_item_settings_header.xml
index 3c72913c9..7a7d02cbc 100644
--- a/src/android/app/src/main/res/layout/list_item_settings_header.xml
+++ b/src/android/app/src/main/res/layout/list_item_settings_header.xml
@@ -5,14 +5,15 @@
              android:layout_height="48dp">
 
     <TextView
+        android:id="@+id/text_header_name"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:id="@+id/text_header_name"
-        tools:text="CPU Settings"
+        android:layout_gravity="center_vertical"
         android:layout_marginStart="@dimen/spacing_large"
         android:layout_marginBottom="@dimen/spacing_small"
+        android:layout_marginTop="@dimen/spacing_small"
         android:textColor="?android:colorAccent"
         android:textStyle="bold"
-        android:layout_gravity="left|bottom"/>
+        tools:text="CPU Settings" />
 
 </FrameLayout>
\ No newline at end of file