diff --git a/res/values/styles.xml b/res/values/styles.xml
index a0ba5c3..92d1f4a 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -135,7 +135,8 @@
         <item name="android:displayOptions"></item>
         <item name="android:height">@dimen/action_bar_height_large</item>
         <!-- Override ActionBar title offset to keep search box aligned left -->
-        <item name="android:contentInsetStart">0px</item>
+        <item name="android:contentInsetStart">0dp</item>
+        <item name="android:contentInsetEnd">0dp</item>
     </style>
 
     <!-- Text in the action bar at the top of the screen -->
diff --git a/src/com/android/dialer/calllog/PhoneAccountUtils.java b/src/com/android/dialer/calllog/PhoneAccountUtils.java
index 3979a3e..adeec0f 100644
--- a/src/com/android/dialer/calllog/PhoneAccountUtils.java
+++ b/src/com/android/dialer/calllog/PhoneAccountUtils.java
@@ -18,7 +18,6 @@
 
 import android.content.ComponentName;
 import android.content.Context;
-import android.graphics.drawable.Drawable;
 import android.telecom.PhoneAccount;
 import android.telecom.PhoneAccountHandle;
 import android.telecom.TelecomManager;
@@ -65,7 +64,10 @@
      */
     public static String getAccountLabel(Context context, PhoneAccountHandle accountHandle) {
         PhoneAccount account = getAccountOrNull(context, accountHandle);
-        return account == null ? null : account.getLabel().toString();
+        if (account != null && account.getLabel() != null) {
+            return account.getLabel().toString();
+        }
+        return null;
     }
 
     /**
diff --git a/src/com/android/dialer/settings/GeneralSettingsFragment.java b/src/com/android/dialer/settings/GeneralSettingsFragment.java
index d04fae3..578ff33 100644
--- a/src/com/android/dialer/settings/GeneralSettingsFragment.java
+++ b/src/com/android/dialer/settings/GeneralSettingsFragment.java
@@ -107,7 +107,7 @@
                             mContext,
                             mRingtoneLookupComplete,
                             RingtoneManager.TYPE_RINGTONE,
-                            mRingtonePreference,
+                            mRingtonePreference.getKey(),
                             MSG_UPDATE_RINGTONE_SUMMARY);
                 }
             }