diff --git a/res/layout/redaction_interstitial.xml b/res/layout/redaction_interstitial.xml
index 1d30b6dae18..e7678ce004d 100644
--- a/res/layout/redaction_interstitial.xml
+++ b/res/layout/redaction_interstitial.xml
@@ -44,21 +44,21 @@
 
         <com.android.settings.RestrictedRadioButton
                 android:id="@+id/show_all"
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/redaction_vertical_margins"
                 android:text="@string/lock_screen_notifications_summary_show" />
 
         <com.android.settings.RestrictedRadioButton
                 android:id="@+id/redact_sensitive"
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/redaction_vertical_margins"
                 android:text="@string/lock_screen_notifications_summary_hide" />
 
         <RadioButton
                 android:id="@+id/hide_all"
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/redaction_vertical_margins"
                 android:text="@string/lock_screen_notifications_summary_disable" />
diff --git a/res/layout/restricted_dialog_singlechoice.xml b/res/layout/restricted_dialog_singlechoice.xml
index f75493e962f..3daedc7a9e2 100644
--- a/res/layout/restricted_dialog_singlechoice.xml
+++ b/res/layout/restricted_dialog_singlechoice.xml
@@ -21,12 +21,14 @@
         android:layout_height="wrap_content"
         android:orientation="horizontal"
         android:paddingStart="20dp"
+        android:gravity="center"
         android:paddingEnd="?android:attr/dialogPreferredPadding"
         android:minHeight="?android:attr/listPreferredItemHeightSmall">
     <CheckedTextView
             android:id="@+id/text1"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_weight="1"
             android:textAppearance="?android:attr/textAppearanceMedium"
             android:textColor="?android:attr/textColorAlertDialogListItem"
             android:gravity="center_vertical"
diff --git a/res/layout/restricted_radio_with_summary.xml b/res/layout/restricted_radio_with_summary.xml
new file mode 100644
index 00000000000..399d11d39e0
--- /dev/null
+++ b/res/layout/restricted_radio_with_summary.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<com.android.settings.CheckableLinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:background="?android:attr/selectableItemBackground"
+    android:minHeight="?android:attr/listPreferredItemHeightSmall">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:paddingStart="20dp"
+        android:paddingEnd="?android:attr/dialogPreferredPadding">
+        <CheckedTextView
+            android:id="@android:id/title"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textColor="?android:attr/textColorAlertDialogListItem"
+            android:gravity="center_vertical"
+            android:drawableStart="?android:attr/listChoiceIndicatorSingle"
+            android:ellipsize="marquee" />
+        <ImageView
+            android:id="@+id/restricted_icon"
+            android:layout_width="@dimen/restricted_icon_size"
+            android:layout_height="match_parent"
+            android:scaleType="centerInside"
+            android:src="@drawable/ic_info"
+            android:layout_marginLeft="@dimen/restricted_icon_padding"
+            android:visibility="gone" />
+    </LinearLayout>
+
+
+    <TextView android:id="@android:id/summary"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingBottom="8dp"
+        android:paddingStart="52dp"
+        android:textAppearance="?android:attr/textAppearanceListItemSecondary"
+        android:textColor="?android:attr/textColorSecondary"
+        android:maxLines="10" />
+
+</com.android.settings.CheckableLinearLayout>
\ No newline at end of file
diff --git a/res/layout/switch_bar.xml b/res/layout/switch_bar.xml
index 7136624f237..a31bd3e721f 100644
--- a/res/layout/switch_bar.xml
+++ b/res/layout/switch_bar.xml
@@ -30,6 +30,15 @@
               android:textColor="?android:attr/textColorPrimary"
               android:textAlignment="viewStart" />
 
+    <ImageView android:id="@+id/restricted_icon"
+            android:layout_width="@dimen/restricted_icon_size"
+            android:layout_height="@dimen/restricted_icon_size"
+            android:src="@drawable/ic_info"
+            android:theme="@android:style/Theme.Material"
+            android:layout_gravity="center_vertical"
+            android:layout_marginEnd="@dimen/restricted_icon_margin_end"
+            android:visibility="gone" />
+
     <com.android.settings.widget.ToggleSwitch android:id="@+id/switch_widget"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 53dd515d324..c84129a91d0 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -285,4 +285,7 @@
     <dimen name="screen_magnification_video_height">311dp</dimen>
     <dimen name="screen_magnification_video_margin_top">40dp</dimen>
 
+    <!-- Restricted icon in switch bar -->
+    <dimen name="restricted_icon_margin_end">16dp</dimen>
+
 </resources>
diff --git a/src/com/android/settings/deviceinfo/UsbModeChooserActivity.java b/src/com/android/settings/deviceinfo/UsbModeChooserActivity.java
index e1f89500e4c..bb8ffc17d60 100644
--- a/src/com/android/settings/deviceinfo/UsbModeChooserActivity.java
+++ b/src/com/android/settings/deviceinfo/UsbModeChooserActivity.java
@@ -130,7 +130,7 @@ public class UsbModeChooserActivity extends Activity {
 
     private void inflateOption(final int mode, boolean selected, LinearLayout container,
             final boolean disallowedByAdmin) {
-        View v = mLayoutInflater.inflate(R.layout.radio_with_summary, container, false);
+        View v = mLayoutInflater.inflate(R.layout.restricted_radio_with_summary, container, false);
 
         TextView titleView = (TextView) v.findViewById(android.R.id.title);
         titleView.setText(getTitle(mode));
@@ -139,7 +139,7 @@ public class UsbModeChooserActivity extends Activity {
 
         if (disallowedByAdmin) {
             if (mEnforcedAdmin != null) {
-                setDisabledByAdmin(titleView, summaryView);
+                setDisabledByAdmin(v, titleView, summaryView);
             } else {
                 return;
             }
@@ -164,12 +164,11 @@ public class UsbModeChooserActivity extends Activity {
         container.addView(v);
     }
 
-    private void setDisabledByAdmin(TextView titleView, TextView summaryView) {
+    private void setDisabledByAdmin(View rootView, TextView titleView, TextView summaryView) {
         if (mEnforcedAdmin != null) {
             titleView.setEnabled(false);
             summaryView.setEnabled(false);
-            RestrictedLockUtils.setTextViewPadlock(this,
-                    titleView, true /* showPadlock */);
+            rootView.findViewById(R.id.restricted_icon).setVisibility(View.VISIBLE);
             Drawable[] compoundDrawables = titleView.getCompoundDrawablesRelative();
             compoundDrawables[0 /* start */].mutate().setColorFilter(
                     getColor(R.color.disabled_text_color), PorterDuff.Mode.MULTIPLY);
diff --git a/src/com/android/settings/widget/SwitchBar.java b/src/com/android/settings/widget/SwitchBar.java
index adf1ce016e2..3d8a5a6a5cb 100644
--- a/src/com/android/settings/widget/SwitchBar.java
+++ b/src/com/android/settings/widget/SwitchBar.java
@@ -58,6 +58,7 @@ public class SwitchBar extends LinearLayout implements CompoundButton.OnCheckedC
     private final TextAppearanceSpan mSummarySpan;
 
     private ToggleSwitch mSwitch;
+    private View mRestrictedIcon;
     private TextView mTextView;
     private String mLabel;
     private String mSummary;
@@ -122,6 +123,8 @@ public class SwitchBar extends LinearLayout implements CompoundButton.OnCheckedC
             }
         });
 
+        mRestrictedIcon = findViewById(R.id.restricted_icon);
+
         setOnClickListener(this);
 
         // Default is hide
@@ -189,12 +192,14 @@ public class SwitchBar extends LinearLayout implements CompoundButton.OnCheckedC
         if (admin != null) {
             super.setEnabled(true);
             mDisabledByAdmin = true;
-            RestrictedLockUtils.setTextViewPadlock(mContext, mTextView, true);
             mTextView.setEnabled(false);
             mSwitch.setEnabled(false);
+            mSwitch.setVisibility(View.GONE);
+            mRestrictedIcon.setVisibility(View.VISIBLE);
         } else {
             mDisabledByAdmin = false;
-            RestrictedLockUtils.setTextViewPadlock(mContext, mTextView, false);
+            mSwitch.setVisibility(View.VISIBLE);
+            mRestrictedIcon.setVisibility(View.GONE);
             setEnabled(true);
         }
     }