diff --git a/data/elementary/themes/edc/elm/icon_fdo.edc b/data/elementary/themes/edc/elm/icon_fdo.edc
index e52feb6857..875d3de585 100644
--- a/data/elementary/themes/edc/elm/icon_fdo.edc
+++ b/data/elementary/themes/edc/elm/icon_fdo.edc
@@ -118,9 +118,6 @@ ICO1(CTX, "network-wireless-signal-weak", 128) /* */
ICO1(CTX, "printer-error", 128)
ICO1(CTX, "printer-printing", 128)
ICO1(CTX, "printer-warning", 128) /* */
-ICO1(CTX, "security-high", 128)
-ICO1(CTX, "security-medium", 128)
-ICO1(CTX, "security-low", 128)
ICO1(CTX, "software-update-available", 128)
ICO1(CTX, "software-update-urgent", 128)
ICO1(CTX, "task-due", 128)
diff --git a/data/elementary/themes/edc/icons.edc b/data/elementary/themes/edc/icons.edc
index df82c497df..d4b21e722f 100644
--- a/data/elementary/themes/edc/icons.edc
+++ b/data/elementary/themes/edc/icons.edc
@@ -680,6 +680,10 @@ ICON("battery-full-charging", "i-battery-full-charging")
ICON("bluetooth-active", "i-bluetooth-active")
ICON("bluetooth-disabled", "i-bluetooth-disabled")
+ICON("security-high", "i-shield-gold")
+ICON("security-medium", "i-shield-silver")
+ICON("security-low", "i-shield-empty")
+
ICON("address-book-new", "i-addressbook")
ICON("contact-new", "i-person-plus")
diff --git a/data/elementary/themes/ic.edc b/data/elementary/themes/ic.edc
index 2892059156..9f7985ab0b 100644
--- a/data/elementary/themes/ic.edc
+++ b/data/elementary/themes/ic.edc
@@ -375,6 +375,10 @@ I160("i-battery-full-charging", "battery-full-charging")
I160("i-bluetooth-active", "bluetooth-active")
I160("i-bluetooth-disabled", "bluetooth-disabled")
+I160("i-shield-gold", "shield-gold")
+I160("i-shield-silver", "shield-silver")
+I160("i-shield-empty", "shield-empty")
+
I160("i-addressbook", "addressbook")
I160("i-person-plus", "person-plus")
diff --git a/data/elementary/themes/img/ic/shield-empty-040.png b/data/elementary/themes/img/ic/shield-empty-040.png
new file mode 100644
index 0000000000..d3047a25a3
Binary files /dev/null and b/data/elementary/themes/img/ic/shield-empty-040.png differ
diff --git a/data/elementary/themes/img/ic/shield-empty-080.png b/data/elementary/themes/img/ic/shield-empty-080.png
new file mode 100644
index 0000000000..1413f5256b
Binary files /dev/null and b/data/elementary/themes/img/ic/shield-empty-080.png differ
diff --git a/data/elementary/themes/img/ic/shield-empty-160.png b/data/elementary/themes/img/ic/shield-empty-160.png
new file mode 100644
index 0000000000..b990951143
Binary files /dev/null and b/data/elementary/themes/img/ic/shield-empty-160.png differ
diff --git a/data/elementary/themes/img/ic/shield-gold-040.png b/data/elementary/themes/img/ic/shield-gold-040.png
new file mode 100644
index 0000000000..572284ac38
Binary files /dev/null and b/data/elementary/themes/img/ic/shield-gold-040.png differ
diff --git a/data/elementary/themes/img/ic/shield-gold-080.png b/data/elementary/themes/img/ic/shield-gold-080.png
new file mode 100644
index 0000000000..4855089fc2
Binary files /dev/null and b/data/elementary/themes/img/ic/shield-gold-080.png differ
diff --git a/data/elementary/themes/img/ic/shield-gold-160.png b/data/elementary/themes/img/ic/shield-gold-160.png
new file mode 100644
index 0000000000..e5cba94006
Binary files /dev/null and b/data/elementary/themes/img/ic/shield-gold-160.png differ
diff --git a/data/elementary/themes/img/ic/shield-silver-040.png b/data/elementary/themes/img/ic/shield-silver-040.png
new file mode 100644
index 0000000000..4013da08cf
Binary files /dev/null and b/data/elementary/themes/img/ic/shield-silver-040.png differ
diff --git a/data/elementary/themes/img/ic/shield-silver-080.png b/data/elementary/themes/img/ic/shield-silver-080.png
new file mode 100644
index 0000000000..4aadaaa235
Binary files /dev/null and b/data/elementary/themes/img/ic/shield-silver-080.png differ
diff --git a/data/elementary/themes/img/ic/shield-silver-160.png b/data/elementary/themes/img/ic/shield-silver-160.png
new file mode 100644
index 0000000000..8e7d1436b5
Binary files /dev/null and b/data/elementary/themes/img/ic/shield-silver-160.png differ
diff --git a/data/elementary/themes/img/shield-empty.svg b/data/elementary/themes/img/shield-empty.svg
new file mode 100644
index 0000000000..576592f1c7
--- /dev/null
+++ b/data/elementary/themes/img/shield-empty.svg
@@ -0,0 +1,79 @@
+
+
diff --git a/data/elementary/themes/img/shield-gold.svg b/data/elementary/themes/img/shield-gold.svg
new file mode 100644
index 0000000000..4bf36285d3
--- /dev/null
+++ b/data/elementary/themes/img/shield-gold.svg
@@ -0,0 +1,79 @@
+
+
diff --git a/data/elementary/themes/img/shield-silver.svg b/data/elementary/themes/img/shield-silver.svg
new file mode 100644
index 0000000000..5f84ee858e
--- /dev/null
+++ b/data/elementary/themes/img/shield-silver.svg
@@ -0,0 +1,79 @@
+
+