diff --git a/res/layout/templateentry.xml b/res/layout/templateentry.xml
index 9e8d78128..a79f40bd4 100644
--- a/res/layout/templateentry.xml
+++ b/res/layout/templateentry.xml
@@ -33,6 +33,15 @@
         android:paddingLeft="3dip"
         android:textAppearance="?android:attr/textAppearanceSmall" />
 
+    <ImageView
+        android:id="@+id/imgUnsafe"
+        android:layout_width="32dip"
+        android:layout_height="32dip"
+        android:contentDescription="@string/title_unsafe"
+        android:paddingLeft="3dip"
+        android:src="?attr/icon_unsafe"
+        android:visibility="gone" />
+
     <ImageView
         android:id="@+id/imgCbRestrict"
         android:layout_width="32dip"
diff --git a/src/biz/bokhorst/xprivacy/ActivityApp.java b/src/biz/bokhorst/xprivacy/ActivityApp.java
index a1a7082e8..577b4dfc8 100644
--- a/src/biz/bokhorst/xprivacy/ActivityApp.java
+++ b/src/biz/bokhorst/xprivacy/ActivityApp.java
@@ -302,9 +302,6 @@ public void onClick(View view) {
 			else if (extras.getInt(cAction) == cActionSettings)
 				optionSettings();
 		}
-
-		// Annotate
-		Meta.annotate(this.getResources());
 	}
 
 	@Override
diff --git a/src/biz/bokhorst/xprivacy/ActivityMain.java b/src/biz/bokhorst/xprivacy/ActivityMain.java
index ed57fb264..4b244509e 100644
--- a/src/biz/bokhorst/xprivacy/ActivityMain.java
+++ b/src/biz/bokhorst/xprivacy/ActivityMain.java
@@ -180,6 +180,9 @@ protected void onCreate(Bundle savedInstanceState) {
 		if (Util.hasProLicense(this) != null)
 			setTitle(String.format("%s - %s", getString(R.string.app_name), getString(R.string.menu_pro)));
 
+		// Annotate
+		Meta.annotate(this.getResources());
+
 		// Get localized restriction name
 		List<String> listRestrictionName = new ArrayList<String>(PrivacyManager.getRestrictions(this).navigableKeySet());
 		listRestrictionName.add(0, getString(R.string.menu_all));
@@ -1212,6 +1215,7 @@ private class ViewHolder {
 			public ImageView imgIndicator;
 			public ImageView imgInfo;
 			public TextView tvRestriction;
+			public ImageView imgUnsafe;
 			public ImageView imgCbRestrict;
 			public ImageView imgCbAsk;
 			public boolean restricted;
@@ -1222,6 +1226,7 @@ public ViewHolder(View theRow) {
 				imgIndicator = (ImageView) row.findViewById(R.id.imgIndicator);
 				imgInfo = (ImageView) row.findViewById(R.id.imgInfo);
 				tvRestriction = (TextView) row.findViewById(R.id.tvRestriction);
+				imgUnsafe = (ImageView) row.findViewById(R.id.imgUnsafe);
 				imgCbRestrict = (ImageView) row.findViewById(R.id.imgCbRestrict);
 				imgCbAsk = (ImageView) row.findViewById(R.id.imgCbAsk);
 			}
@@ -1288,6 +1293,7 @@ public View getGroupView(int groupPosition, boolean isExpanded, View convertView
 					: R.attr.icon_expander_minimized));
 			holder.imgIndicator.setVisibility(View.VISIBLE);
 			holder.imgInfo.setVisibility(View.GONE);
+			holder.imgUnsafe.setVisibility(View.GONE);
 
 			// Set data
 			holder.tvRestriction.setTypeface(null, Typeface.BOLD);
@@ -1392,6 +1398,7 @@ public void onClick(View view) {
 					}
 				});
 			}
+			holder.imgUnsafe.setVisibility(hook.isUnsafe() ? View.VISIBLE : View.GONE);
 
 			// Set data
 			if (hook.isDangerous())