diff --git a/res/layout/notification_sbn_log_row.xml b/res/layout/notification_sbn_log_row.xml
index 91d6600e53e..23bc110da8b 100644
--- a/res/layout/notification_sbn_log_row.xml
+++ b/res/layout/notification_sbn_log_row.xml
@@ -74,8 +74,8 @@
 
             <ImageView
                 android:id="@+id/profile_badge"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_width="16dp"
+                android:layout_height="16dp"
                 android:layout_marginEnd="6dp"
                 android:scaleType="fitCenter"
                 android:contentDescription="@*android:string/notification_work_profile_content_description"
diff --git a/src/com/android/settings/notification/history/NotificationHistoryActivity.java b/src/com/android/settings/notification/history/NotificationHistoryActivity.java
index ec09a9fabba..4fecfc9b722 100644
--- a/src/com/android/settings/notification/history/NotificationHistoryActivity.java
+++ b/src/com/android/settings/notification/history/NotificationHistoryActivity.java
@@ -356,8 +356,10 @@ public class NotificationHistoryActivity extends CollapsingToolbarBaseActivity {
                 }
                 final int newState = isChecked ? 1 : 0;
                 if (oldState != newState) {
-                    Settings.Secure.putInt(getContentResolver(),
-                            NOTIFICATION_HISTORY_ENABLED, newState);
+                    for (int user : mUm.getProfileIds(ActivityManager.getCurrentUser(), false)) {
+                        Settings.Secure.putIntForUser(getContentResolver(),
+                                NOTIFICATION_HISTORY_ENABLED, newState, user);
+                    }
                     mUiEventLogger.log(isChecked ? NotificationHistoryEvent.NOTIFICATION_HISTORY_ON
                             : NotificationHistoryEvent.NOTIFICATION_HISTORY_OFF);
                     Log.d(TAG, "onSwitchChange history to " + isChecked);
diff --git a/src/com/android/settings/notification/history/NotificationSbnAdapter.java b/src/com/android/settings/notification/history/NotificationSbnAdapter.java
index 7eca3b7f8ab..1d61ae79cd0 100644
--- a/src/com/android/settings/notification/history/NotificationSbnAdapter.java
+++ b/src/com/android/settings/notification/history/NotificationSbnAdapter.java
@@ -121,7 +121,7 @@ public class NotificationSbnAdapter extends
             int userId = normalizeUserId(sbn);
             if (!mUserBadgeCache.containsKey(userId)) {
                 Drawable profile = mContext.getPackageManager().getUserBadgeForDensity(
-                        UserHandle.of(userId), -1);
+                        UserHandle.of(userId), 0);
                 mUserBadgeCache.put(userId, profile);
             }
             holder.setProfileBadge(mUserBadgeCache.get(userId));