diff --git a/android/phoenix/src/com/retroarch/browser/IconAdapter.java b/android/phoenix/src/com/retroarch/browser/IconAdapter.java
index 8468c2e9d0..d95ab5582e 100644
--- a/android/phoenix/src/com/retroarch/browser/IconAdapter.java
+++ b/android/phoenix/src/com/retroarch/browser/IconAdapter.java
@@ -37,27 +37,27 @@ public final class IconAdapter<T extends IconAdapterItem> extends ArrayAdapter<T
 		IconAdapterItem item = getItem(position);
 		final boolean enabled = item.isEnabled();
 
-		TextView textView = (TextView) convertView.findViewById(R.id.name);
-		if (null != textView) {
-			textView.setText(item.getText());
-			textView.setEnabled(enabled);
+		TextView title = (TextView) convertView.findViewById(R.id.name);
+		if (title != null) {
+			title.setText(item.getText());
+			title.setEnabled(enabled);
 		}
 		
-		textView = (TextView) convertView.findViewById(R.id.sub_name);
-		if (null != textView) {
+		TextView subtitle  = (TextView) convertView.findViewById(R.id.sub_name);
+		if (subtitle != null) {
 			String subText = item.getSubText();
-			if (null != subText) {
-				textView.setVisibility(View.VISIBLE);
-				textView.setEnabled(item.isEnabled());
-				textView.setText(subText);
+			if (subText != null) {
+				subtitle.setVisibility(View.VISIBLE);
+				subtitle.setEnabled(item.isEnabled());
+				subtitle.setText(subText);
 			}
 		}
 
 		ImageView imageView = (ImageView) convertView.findViewById(R.id.icon);
-		if (null != imageView) {
+		if (imageView != null) {
 			if (enabled) {
 				final int id = item.getIconResourceId();
-				if (0 != id) {
+				if (id != 0) {
 					imageView.setImageResource(id);
 				} else {
 					imageView.setImageDrawable(item.getIconDrawable());