Merge branch 'feature/themes/flat' into devs/hermet/lottie

358 files changed, 8783 insertions, 151 deletions

diff --git a/data/elementary/themes/edc/elm/icon_fdo.edc b/data/elementary/themes/edc/elm/icon_fdo.edc
index 875d3de585..aaa90f5b03 100644
--- a/data/elementary/themes/edc/elm/icon_fdo.edc
+++ b/data/elementary/themes/edc/elm/icon_fdo.edc
@@ -73,69 +73,11 @@
 
 ////  status  /////////////////////////////////////////////////////////////
 #define CTX "status"
-ICO1(CTX, "changes-allow", 128) /* */
-ICO1(CTX, "changes-prevent", 128)/* */
-ICO1(CTX, "dialog-error", 128)
-ICO1(CTX, "dialog-information", 128)
-ICO1(CTX, "dialog-password", 128)
-ICO1(CTX, "dialog-question", 128)
-ICO1(CTX, "dialog-warning", 128)
-ICO1(CTX, "media-playlist-repeat", 128)
-ICO1(CTX, "media-playlist-shuffle", 128)
-ICO1(CTX, "mail-attachment", 128)
-ICO1(CTX, "mail-unread", 128)
-ICO1(CTX, "mail-read", 128)
-ICO1(CTX, "mail-replied", 128)
-ICO1(CTX, "mail-signed", 128)
-ICO1(CTX, "mail-signed-verified", 128)
-ICO1(CTX, "network-cellular-3g", 128) /* */
-ICO1(CTX, "network-cellular-4g", 128) /* */
-ICO1(CTX, "network-cellular-edge", 128) /* */
-ICO1(CTX, "network-cellular-gprs", 128) /* */
-ICO1(CTX, "network-cellular-umts", 128) /* */
-ICO1(CTX, "network-cellular-connected", 128) /* */
-ICO1(CTX, "network-cellular-signal-excellent", 128) /* */
-ICO1(CTX, "network-cellular-signal-good", 128) /* */
-ICO1(CTX, "network-cellular-signal-none", 128) /* */
-ICO1(CTX, "network-cellular-signal-ok", 128) /* */
-ICO1(CTX, "network-cellular-signal-weak", 128) /* */
-ICO1(CTX, "network-cellular-signal-acquiring", 128) /* */
-ICO1(CTX, "network-error", 128)
-ICO1(CTX, "network-offline", 128)
-ICO1(CTX, "network-receive", 128)
-ICO1(CTX, "network-transmit-receive", 128)
-ICO1(CTX, "network-transmit", 128)
-ICO1(CTX, "network-idle", 128)
-ICO1(CTX, "network-vpn", 128) /* */
-ICO1(CTX, "network-vpn-acquiring", 128) /* */
-ICO1(CTX, "network-wireless-acquiring", 128) /* */
-ICO1(CTX, "network-wireless-encrypted", 128) /* */
-ICO1(CTX, "network-wireless-signal-excellent", 128) /* */
-ICO1(CTX, "network-wireless-signal-good", 128) /* */
-ICO1(CTX, "network-wireless-signal-none", 128) /* */
-ICO1(CTX, "network-wireless-signal-ok", 128) /* */
-ICO1(CTX, "network-wireless-signal-weak", 128) /* */
-ICO1(CTX, "printer-error", 128)
-ICO1(CTX, "printer-printing", 128)
-ICO1(CTX, "printer-warning", 128) /* */
-ICO1(CTX, "software-update-available", 128)
-ICO1(CTX, "software-update-urgent", 128)
-ICO1(CTX, "task-due", 128)
-ICO1(CTX, "task-past-due", 128)
-ICO1(CTX, "user-available", 128)
-ICO1(CTX, "user-away", 128)
-ICO1(CTX, "user-busy", 128) /* */
-ICO1(CTX, "user-invisible", 128) /* */
-ICO1(CTX, "user-idle", 128)
-ICO1(CTX, "user-offline", 128)
-ICO1(CTX, "user-trash-full", 128) /* */
 
 // TODO image-loading
 // TODO image-missing
 // TODO sync-error
 // TODO sync-synchronizing
-ICO1(CTX, "starred", 128) /* */
-ICO1(CTX, "non-starred", 128) /* */
 // folder-visiting  /* in the Places category */
 // folder-drag-accept /* in the Places category */
 #undef CTX
@@ -197,98 +139,6 @@ ICO1(CTX, "non-starred", 128) /* */
 ////  international  //////////////////////////////////////////////////////////
 // Country flags, ISO 3166-1 alpha-2 country code (flag-aa)
 #define CTX "intl"
-FLAG(CTX, "flag-ad")
-FLAG(CTX, "flag-af")
-FLAG(CTX, "flag-al")
-FLAG(CTX, "flag-am")
-FLAG(CTX, "flag-ar")
-FLAG(CTX, "flag-at")
-FLAG(CTX, "flag-au")
-FLAG(CTX, "flag-az")
-FLAG(CTX, "flag-ba")
-FLAG(CTX, "flag-bd")
-FLAG(CTX, "flag-be")
-FLAG(CTX, "flag-bg")
-FLAG(CTX, "flag-br")
-FLAG(CTX, "flag-bt")
-FLAG(CTX, "flag-bw")
-FLAG(CTX, "flag-by")
-FLAG(CTX, "flag-ca")
-FLAG(CTX, "flag-cd")
-FLAG(CTX, "flag-ch")
-FLAG(CTX, "flag-cm")
-FLAG(CTX, "flag-cn")
-FLAG(CTX, "flag-cz")
-FLAG(CTX, "flag-de")
-FLAG(CTX, "flag-dk")
-FLAG(CTX, "flag-ee")
-FLAG(CTX, "flag-es")
-FLAG(CTX, "flag-et")
-FLAG(CTX, "flag-fi")
-FLAG(CTX, "flag-fo")
-FLAG(CTX, "flag-fr")
-FLAG(CTX, "flag-gb")
-FLAG(CTX, "flag-ge")
-FLAG(CTX, "flag-gh")
-FLAG(CTX, "flag-gn")
-FLAG(CTX, "flag-gr")
-FLAG(CTX, "flag-hr")
-FLAG(CTX, "flag-hu")
-FLAG(CTX, "flag-ie")
-FLAG(CTX, "flag-il")
-FLAG(CTX, "flag-in")
-FLAG(CTX, "flag-iq")
-FLAG(CTX, "flag-ir")
-FLAG(CTX, "flag-is")
-FLAG(CTX, "flag-it")
-FLAG(CTX, "flag-jp")
-FLAG(CTX, "flag-ke")
-FLAG(CTX, "flag-kg")
-FLAG(CTX, "flag-kh")
-FLAG(CTX, "flag-kr")
-FLAG(CTX, "flag-ku")
-FLAG(CTX, "flag-kz")
-FLAG(CTX, "flag-la")
-FLAG(CTX, "flag-lk")
-FLAG(CTX, "flag-lt")
-FLAG(CTX, "flag-lv")
-FLAG(CTX, "flag-ma")
-FLAG(CTX, "flag-md")
-FLAG(CTX, "flag-me")
-FLAG(CTX, "flag-mk")
-FLAG(CTX, "flag-ml")
-FLAG(CTX, "flag-mm")
-FLAG(CTX, "flag-mn")
-FLAG(CTX, "flag-mt")
-FLAG(CTX, "flag-mv")
-FLAG(CTX, "flag-my")
-FLAG(CTX, "flag-ng")
-FLAG(CTX, "flag-nl")
-FLAG(CTX, "flag-no")
-FLAG(CTX, "flag-np")
-FLAG(CTX, "flag-ph")
-FLAG(CTX, "flag-pk")
-FLAG(CTX, "flag-pl")
-FLAG(CTX, "flag-pt")
-FLAG(CTX, "flag-ro")
-FLAG(CTX, "flag-rs")
-FLAG(CTX, "flag-ru")
-FLAG(CTX, "flag-se")
-FLAG(CTX, "flag-si")
-FLAG(CTX, "flag-sk")
-FLAG(CTX, "flag-sn")
-FLAG(CTX, "flag-sy")
-FLAG(CTX, "flag-th")
-FLAG(CTX, "flag-tj")
-FLAG(CTX, "flag-tm")
-FLAG(CTX, "flag-tr")
-FLAG(CTX, "flag-tw")
-FLAG(CTX, "flag-tz")
-FLAG(CTX, "flag-ua")
-FLAG(CTX, "flag-us")
-FLAG(CTX, "flag-uz")
-FLAG(CTX, "flag-vn")
-FLAG(CTX, "flag-za")
 #undef CTX
 
 #undef ICO1
diff --git a/data/elementary/themes/edc/gadman.edc b/data/elementary/themes/edc/gadman.edc
index 7c6e019ec2..55ed610e2f 100644
--- a/data/elementary/themes/edc/gadman.edc
+++ b/data/elementary/themes/edc/gadman.edc
@@ -1,6 +1,6 @@
 group { name: "e/gadman/popup";
    parts {
-      part { name: "bg"; type: RECT; mouse_events: 0;
+      part { name: "bg"; type: RECT;
          description { state: "default" 0.0;
             color: 64 64 64 255;
          }
diff --git a/data/elementary/themes/edc/icons.edc b/data/elementary/themes/edc/icons.edc
index d4b21e722f..5dfa606617 100644
--- a/data/elementary/themes/edc/icons.edc
+++ b/data/elementary/themes/edc/icons.edc
@@ -402,6 +402,8 @@ ICON("media-seek-backward", "i-media-rw")
 ICON("media-seek-forward", "i-media-ff")
 ICON("media-skip-backward", "i-media-prev")
 ICON("media-skip-forward", "i-media-next")
+ICON("media-playlist-repeat", "i-media-repeat")
+ICON("media-playlist-shuffle", "i-media-shuffle")
 
 ICON("zoom-in", "i-zoom-in")
 ICON("zoom-out", "i-zoom-out")
@@ -460,6 +462,37 @@ ICON("object-rotate-right", "i-redo")
 ICON("call-start", "i-call-start")
 ICON("call-stop", "i-call-stop")
 
+ICON("network-cellular-3g", "i-cell-4g")
+ICON("network-cellular-4g", "i-cell-3g")
+ICON("network-cellular-edge", "i-cell-edge")
+ICON("network-cellular-gprs", "i-cell-gprs")
+ICON("network-cellular-umts", "i-cell-umts")
+ICON("network-cellular-connected", "i-cell-antenna")
+ICON("network-cellular-signal-excellent", "i-cell-sig-4")
+ICON("network-cellular-signal-good", "i-cell-sig-3")
+ICON("network-cellular-signal-none", "i-cell-sig-2")
+ICON("network-cellular-signal-ok", "i-cell-sig-1")
+ICON("network-cellular-signal-weak", "i-cell-sig-0")
+ICON("network-cellular-signal-acquiring", "i-cell-sig-disconn")
+ICON("network-error", "i-net-error")
+ICON("network-offline", "i-net-offline")
+ICON("network-receive", "i-net-receive")
+ICON("network-transmit-receive", "i-net-send-receive")
+ICON("network-transmit", "i-net-send")
+ICON("network-idle", "i-net-idle")
+ICON("network-vpn", "i-net-vpn")
+ICON("network-vpn-acquiring", "i-net-vpn-connecting")
+ICON("network-wireless-acquiring", "i-net-wifi-connecting")
+ICON("network-wireless-encrypted", "i-net-wifi-encrypted")
+ICON("network-wireless-signal-excellent", "i-net-wifi-sig-4")
+ICON("network-wireless-signal-good", "i-net-wifi-sig-3")
+ICON("network-wireless-signal-ok", "i-net-wifi-sig-2")
+ICON("network-wireless-signal-weak", "i-net-wifi-sig-1")
+ICON("network-wireless-signal-none", "i-net-wifi-sig-0")
+
+ICON("starred", "i-star")
+ICON("non-starred", "i-star-off")
+
 #undef ICON
 
 // regular icons
@@ -507,6 +540,19 @@ ICON("user-bookmarks", "i-bookmark")
 
 ICON("start-here", "i-here")
 
+ICON("bt-lock-device-on", "i-bt-lock-device-on")
+ICON("bt-lock-device-off", "i-bt-lock-device-off")
+ICON("bt-force-connect-on", "i-bt-force-connect-on")
+ICON("bt-force-connect-off", "i-bt-force-connect-off")
+ICON("bt-connect-on", "i-bt-connect-on")
+ICON("bt-connect-off", "i-bt-connect-off")
+ICON("bt-pair-on", "i-bt-pair-on")
+ICON("bt-pair-off", "i-bt-pair-off")
+ICON("bt-expand-left", "i-bt-expand-left")
+ICON("bt-expand-right", "i-bt-expand-right")
+ICON("bt-pair-ok", "i-check")
+ICON("bt-pair-cancel", "i-close")
+
 ICON("network-server", "i-server")
 ICON("network-workgroup", "i-server-group")
 ICON("audio-card", "i-sound-card")
@@ -642,6 +688,12 @@ ICON("mail-reply-all", "i-mail-arrow-heads-l")
 ICON("mail-reply-sender", "i-mail-arrow-l")
 ICON("mail-send", "i-mail-arrow-u")
 ICON("mail-send-receive", "i-mail-arrow-in-d")
+ICON("mail-unread", "i-mail")
+ICON("mail-read", "i-mail-opened")
+ICON("mail-attachment", "i-mail-attach")
+ICON("mail-replied", "i-mail-reply")
+ICON("mail-signed", "i-mail-sign")
+ICON("mail-signed-verified", "i-mail-sign-verified")
 
 ICON("format-indent-less", "i-format-indent-less")
 ICON("format-indent-more", "i-format-indent-more")
@@ -684,9 +736,37 @@ ICON("security-high", "i-shield-gold")
 ICON("security-medium", "i-shield-silver")
 ICON("security-low", "i-shield-empty")
 
+ICON("printer-printing", "i-printer")
+ICON("printer-warning", "i-printer-warning")
+ICON("printer-error", "i-printer-error")
+
 ICON("address-book-new", "i-addressbook")
 ICON("contact-new", "i-person-plus")
 
+ICON("changes-allow", "i-pencil-check")
+ICON("changes-prevent", "i-pencil-cross")
+
+ICON("task-due", "i-task-due")
+ICON("task-past-due", "i-task-past-due")
+
+ICON("software-update-available", "i-badge-tick")
+ICON("software-update-urgent", "i-badge-exclamation")
+
+ICON("user-available", "i-person-smile")
+ICON("user-away", "i-person")
+ICON("user-busy", "i-person-call")
+ICON("user-invisible", "i-person-invisible")
+ICON("user-idle", "i-person-sleep")
+ICON("user-offline", "i-person-offline")
+
+ICON("user-trash-full", "i-efm-trash-full")
+
+ICON("dialog-error", "i-warn-sign-red")
+ICON("dialog-information", "i-warn-sign-orange")
+ICON("dialog-password", "i-password-sign-blue")
+ICON("dialog-question", "i-question-sign-green")
+ICON("dialog-warning", "i-warn-sign-orange-red")
+
 ICON("document-open", "i-doc-file-open")
 ICON("document-open-recent", "i-doc-file-open-clock")
 ICON("document-page-setup", "i-doc-file-page-setup")
@@ -718,3 +798,112 @@ ICON("emblem-synchronized", "i-emblem-synchronized")
 ICON("emblem-synchronizing", "i-emblem-synchronizing")
 
 #undef ICON
+
+// flags
+#define FLAG(_NAME) \
+   group { name: "elm/icon/"_NAME"/default"; \
+      images.image: "flags/"##_NAME##".png" COMP; \
+      parts { \
+         part { name: "icon"; mouse_events: 0; \
+            description { state: "default" 0.0; \
+               aspect_preference: SOURCE; \
+               image.normal: "flags/"##_NAME##".png"; \
+            } \
+         } \
+      } \
+   }
+
+FLAG("flag-ad")
+FLAG("flag-af")
+FLAG("flag-al")
+FLAG("flag-am")
+FLAG("flag-ar")
+FLAG("flag-at")
+FLAG("flag-au")
+FLAG("flag-az")
+FLAG("flag-ba")
+FLAG("flag-bd")
+FLAG("flag-be")
+FLAG("flag-bg")
+FLAG("flag-br")
+FLAG("flag-bt")
+FLAG("flag-bw")
+FLAG("flag-by")
+FLAG("flag-ca")
+FLAG("flag-cd")
+FLAG("flag-ch")
+FLAG("flag-cm")
+FLAG("flag-cn")
+FLAG("flag-cz")
+FLAG("flag-de")
+FLAG("flag-dk")
+FLAG("flag-ee")
+FLAG("flag-es")
+FLAG("flag-et")
+FLAG("flag-fi")
+FLAG("flag-fo")
+FLAG("flag-fr")
+FLAG("flag-gb")
+FLAG("flag-ge")
+FLAG("flag-gh")
+FLAG("flag-gn")
+FLAG("flag-gr")
+FLAG("flag-hr")
+FLAG("flag-hu")
+FLAG("flag-ie")
+FLAG("flag-il")
+FLAG("flag-in")
+FLAG("flag-iq")
+FLAG("flag-ir")
+FLAG("flag-is")
+FLAG("flag-it")
+FLAG("flag-jp")
+FLAG("flag-ke")
+FLAG("flag-kg")
+FLAG("flag-kh")
+FLAG("flag-kr")
+FLAG("flag-ku")
+FLAG("flag-kz")
+FLAG("flag-la")
+FLAG("flag-lk")
+FLAG("flag-lt")
+FLAG("flag-lv")
+FLAG("flag-ma")
+FLAG("flag-md")
+FLAG("flag-me")
+FLAG("flag-mk")
+FLAG("flag-ml")
+FLAG("flag-mm")
+FLAG("flag-mn")
+FLAG("flag-mt")
+FLAG("flag-mv")
+FLAG("flag-my")
+FLAG("flag-ng")
+FLAG("flag-nl")
+FLAG("flag-no")
+FLAG("flag-np")
+FLAG("flag-ph")
+FLAG("flag-pk")
+FLAG("flag-pl")
+FLAG("flag-pt")
+FLAG("flag-ro")
+FLAG("flag-rs")
+FLAG("flag-ru")
+FLAG("flag-se")
+FLAG("flag-si")
+FLAG("flag-sk")
+FLAG("flag-sn")
+FLAG("flag-sy")
+FLAG("flag-th")
+FLAG("flag-tj")
+FLAG("flag-tm")
+FLAG("flag-tr")
+FLAG("flag-tw")
+FLAG("flag-tz")
+FLAG("flag-ua")
+FLAG("flag-us")
+FLAG("flag-uz")
+FLAG("flag-vn")
+FLAG("flag-za")
+
+#undef FLAG
diff --git a/data/elementary/themes/ic.edc b/data/elementary/themes/ic.edc
index 9f7985ab0b..496fee1414 100644
--- a/data/elementary/themes/ic.edc
+++ b/data/elementary/themes/ic.edc
@@ -100,6 +100,8 @@ I060("i-media-mute", "media-mute")
 I060("i-media-next", "media-next")
 I060("i-media-prev", "media-prev")
 I060("i-media-record", "media-record")
+I060("i-media-repeat", "media-repeat")
+I060("i-media-shuffle", "media-shuffle")
 I060("i-zoom-in", "zoom-in")
 I060("i-zoom-out", "zoom-out")
 I060("i-zoom-reset", "zoom-reset")
@@ -119,6 +121,35 @@ I060("i-arrow-h2", "arrow-h2")
 I060("i-arrow-v2", "arrow-v2")
 I060("i-call-start", "call-start")
 I060("i-call-stop", "call-stop")
+I060("i-cell-sig-disconn", "cell-sig-disconn")
+I060("i-cell-sig-0", "cell-sig-0")
+I060("i-cell-sig-1", "cell-sig-1")
+I060("i-cell-sig-2", "cell-sig-2")
+I060("i-cell-sig-3", "cell-sig-3")
+I060("i-cell-sig-4", "cell-sig-4")
+I060("i-cell-antenna", "cell-antenna")
+I060("i-cell-umts", "cell-umts")
+I060("i-cell-gprs", "cell-gprs")
+I060("i-cell-edge", "cell-edge")
+I060("i-cell-3g", "cell-3g")
+I060("i-cell-4g", "cell-4g")
+I060("i-net-error", "net-error")
+I060("i-net-offline", "net-offline")
+I060("i-net-send-receive", "net-send-receive")
+I060("i-net-receive", "net-receive")
+I060("i-net-send", "net-send")
+I060("i-net-idle", "net-idle")
+I060("i-net-vpn", "net-vpn")
+I060("i-net-vpn-connecting", "net-vpn-connecting")
+I060("i-net-wifi-connecting", "net-wifi-connecting")
+I060("i-net-wifi-encrypted", "net-wifi-encrypted")
+I060("i-net-wifi-sig-0", "net-wifi-sig-0")
+I060("i-net-wifi-sig-1", "net-wifi-sig-1")
+I060("i-net-wifi-sig-2", "net-wifi-sig-2")
+I060("i-net-wifi-sig-3", "net-wifi-sig-3")
+I060("i-net-wifi-sig-4", "net-wifi-sig-4")
+I060("i-star", "star")
+I060("i-star-off", "star-off")
 
 ///////////////////////////////////////////////////////////////////////////////
 // larger color icons (mostly efm or settings)
@@ -153,6 +184,7 @@ I160("i-efm-sh", "efm-sh")
 I160("i-efm-zip", "efm-zip")
 I160("i-efm-exe", "efm-exe")
 I160("i-efm-trash", "efm-trash")
+I160("i-efm-trash-full", "efm-trash-full")
 
 I160("i-mobile", "mobile-phone")
 I160("i-pda", "pda")
@@ -306,6 +338,17 @@ I160("i-cloud-snow", "cloud-snow")
 I160("i-cloud-fog", "cloud-fog")
 I160("i-cloud-severe-warn", "cloud-severe-warn")
 
+I160("i-bt-lock-device-on", "bt-lock-device-on")
+I160("i-bt-lock-device-off", "bt-lock-device-off")
+I160("i-bt-force-connect-on", "bt-force-connect-on")
+I160("i-bt-force-connect-off", "bt-force-connect-off")
+I160("i-bt-connect-on", "bt-connect-on")
+I160("i-bt-connect-off", "bt-connect-off")
+I160("i-bt-pair-on", "bt-pair-on")
+I160("i-bt-pair-off", "bt-pair-off")
+I160("i-bt-expand-left", "bt-expand-left")
+I160("i-bt-expand-right", "bt-expand-right")
+
 I160("i-picture-landscape-plus", "picture-landscape-plus")
 I160("i-link-plus", "link-plus")
 I160("i-text-plus", "text-plus")
@@ -337,6 +380,10 @@ I160("i-mail-pencil", "mail-pencil")
 I160("i-mail-bug", "mail-bug")
 I160("i-mail-bug-no", "mail-bug-no")
 I160("i-mail-exclam", "mail-exclam")
+I160("i-mail-attach", "mail-attach")
+I160("i-mail-reply", "mail-reply")
+I160("i-mail-sign", "mail-sign")
+I160("i-mail-sign-verified", "mail-sign-verified")
 
 I160("i-format-indent-more", "format-indent-more")
 I160("i-format-indent-less", "format-indent-less")
@@ -379,8 +426,33 @@ I160("i-shield-gold", "shield-gold")
 I160("i-shield-silver", "shield-silver")
 I160("i-shield-empty", "shield-empty")
 
+I160("i-printer-warning", "printer-warning")
+I160("i-printer-error", "printer-error")
+
 I160("i-addressbook", "addressbook")
+
+I160("i-person", "person")
 I160("i-person-plus", "person-plus")
+I160("i-person-smile", "person-smile")
+I160("i-person-sleep", "person-sleep")
+I160("i-person-call", "person-call")
+I160("i-person-invisible", "person-invisible")
+I160("i-person-offline", "person-offline")
+
+I160("i-pencil-check", "pencil-check")
+I160("i-pencil-cross", "pencil-cross")
+
+I160("i-warn-sign-orange", "warn-sign-orange")
+I160("i-warn-sign-orange-red", "warn-sign-orange-red")
+I160("i-warn-sign-red", "warn-sign-red")
+I160("i-password-sign-blue", "password-sign-blue")
+I160("i-question-sign-green", "question-sign-green")
+
+I160("i-task-due", "task-due")
+I160("i-task-past-due", "task-past-due")
+
+I160("i-badge-tick", "badge-tick")
+I160("i-badge-exclamation", "badge-exclamation")
 
 I160("i-floppy-blank", "floppy-blank")
 I160("i-floppy-text", "floppy-text")
diff --git a/data/elementary/themes/img/badge-exclamation.svg b/data/elementary/themes/img/badge-exclamation.svg
new file mode 100644
index 0000000000..4006da72f6
--- /dev/null
+++ b/data/elementary/themes/img/badge-exclamation.svg
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="svg2"
+   width="80"
+   height="80"
+   viewBox="0 0 80 80"
+   sodipodi:docname="badge-exclamation.svg"
+   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)"
+   inkscape:export-filename="/home/raster/C/th-efl/th/img/ic/badge-exclamation-040.png"
+   inkscape:export-xdpi="48"
+   inkscape:export-ydpi="48">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6">
+    <rect
+       x="20"
+       y="20"
+       width="40"
+       height="30"
+       id="rect878" />
+    <rect
+       x="20"
+       y="50"
+       width="40"
+       height="30"
+       id="rect872" />
+    <rect
+       x="20"
+       y="20"
+       width="40"
+       height="30"
+       id="rect864" />
+    <rect
+       x="20"
+       y="20"
+       width="40"
+       height="30"
+       id="rect858" />
+    <rect
+       x="20"
+       y="20"
+       width="40"
+       height="30"
+       id="rect852" />
+  </defs>
+  <sodipodi:namedview
+     inkscape:document-rotation="0"
+     pagecolor="#404040"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1756"
+     inkscape:window-height="1372"
+     id="namedview4"
+     showgrid="true"
+     inkscape:zoom="13.1625"
+     inkscape:cx="40"
+     inkscape:cy="39.962013"
+     inkscape:window-x="804"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="g10"
+     showguides="false"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:snap-nodes="true"
+     borderlayer="true">
+    <inkscape:grid
+       empspacing="4"
+       type="xygrid"
+       id="grid837"
+       spacingx="1"
+       spacingy="1" />
+  </sodipodi:namedview>
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="Image"
+     id="g10">
+    <path
+       sodipodi:type="star"
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke-width:4"
+       id="path910"
+       sodipodi:sides="12"
+       sodipodi:cx="40"
+       sodipodi:cy="40"
+       sodipodi:r1="32"
+       sodipodi:r2="24.515301"
+       sodipodi:arg1="-1.5707963"
+       sodipodi:arg2="-1.3089969"
+       inkscape:flatsided="false"
+       inkscape:rounded="0"
+       inkscape:randomized="0"
+       d="m 40.000001,8 6.345026,8.320038 9.654974,-4.03285 1.334935,10.377877 10.377877,1.334936 -4.032851,9.654973 L 72,40.000001 63.679962,46.345027 67.712812,56.000001 57.334935,57.334936 55.999999,67.712813 46.345026,63.679962 39.999999,72 33.654973,63.679962 23.999999,67.712812 22.665064,57.334935 12.287187,55.999999 16.320038,46.345026 8,39.999999 l 8.320038,-6.345026 -4.03285,-9.654974 10.377877,-1.334935 1.334936,-10.377877 9.654973,4.032851 z" />
+    <circle
+       style="opacity:1;fill:#d3501f;fill-opacity:1;stroke-width:4"
+       id="path932"
+       cx="40"
+       cy="56"
+       r="4" />
+    <path
+       style="opacity:1;fill:#d3501f;fill-opacity:1;stroke-width:4"
+       d="m 40,48 c -4,-4 -8,-14 -8,-20 0,-6 4,-8 8,-8 4,0 8,2.524272 8,8 0,5.475728 -4,16 -8,20 z"
+       id="path934"
+       sodipodi:nodetypes="czzzc" />
+  </g>
+</svg>
diff --git a/data/elementary/themes/img/badge-tick.svg b/data/elementary/themes/img/badge-tick.svg
new file mode 100644
index 0000000000..b9d49054c2
--- /dev/null
+++ b/data/elementary/themes/img/badge-tick.svg
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="svg2"
+   width="80"
+   height="80"
+   viewBox="0 0 80 80"
+   sodipodi:docname="badge-tick.svg"
+   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)"
+   inkscape:export-filename="/home/raster/C/th-efl/th/img/ic/task-past-due-040.png"
+   inkscape:export-xdpi="48"
+   inkscape:export-ydpi="48">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6">
+    <rect
+       x="20"
+       y="20"
+       width="40"
+       height="30"
+       id="rect878" />
+    <rect
+       x="20"
+       y="50"
+       width="40"
+       height="30"
+       id="rect872" />
+    <rect
+       x="20"
+       y="20"
+       width="40"
+       height="30"
+       id="rect864" />
+    <rect
+       x="20"
+       y="20"
+       width="40"
+       height="30"
+       id="rect858" />
+    <rect
+       x="20"
+       y="20"
+       width="40"
+       height="30"
+       id="rect852" />
+  </defs>
+  <sodipodi:namedview
+     inkscape:document-rotation="0"
+     pagecolor="#404040"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1756"
+     inkscape:window-height="1372"
+     id="namedview4"
+     showgrid="true"
+     inkscape:zoom="13.1625"
+     inkscape:cx="40"
+     inkscape:cy="39.962013"
+     inkscape:window-x="804"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="g10"
+     showguides="false"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:snap-nodes="true"
+     borderlayer="true">
+    <inkscape:grid
+       empspacing="4"
+       type="xygrid"
+       id="grid837"
+       spacingx="1"
+       spacingy="1" />
+  </sodipodi:namedview>
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="Image"
+     id="g10">
+    <path
+       sodipodi:type="star"
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke-width:4"
+       id="path910"
+       sodipodi:sides="12"
+       sodipodi:cx="40"
+       sodipodi:cy="40"
+       sodipodi:r1="32"
+       sodipodi:r2="24.515301"
+       sodipodi:arg1="-1.5707963"
+       sodipodi:arg2="-1.3089969"
+       inkscape:flatsided="false"
+       inkscape:rounded="0"
+       inkscape:randomized="0"
+       d="m 40.000001,8 6.345026,8.320038 9.654974,-4.03285 1.334935,10.377877 10.377877,1.334936 -4.032851,9.654973 L 72,40.000001 63.679962,46.345027 67.712812,56.000001 57.334935,57.334936 55.999999,67.712813 46.345026,63.679962 39.999999,72 33.654973,63.679962 23.999999,67.712812 22.665064,57.334935 12.287187,55.999999 16.320038,46.345026 8,39.999999 l 8.320038,-6.345026 -4.03285,-9.654974 10.377877,-1.334935 1.334936,-10.377877 9.654973,4.032851 z" />
+    <path
+       style="opacity:1;fill:#639c56;fill-opacity:1;stroke-width:4"
+       d="m 36,58 -16,-16 8,-8 8,8 c 0,0 16,-16 16,-16 l 8,8 z"
+       id="path912" />
+  </g>
+</svg>
diff --git a/data/elementary/themes/img/bt-connect-off.svg b/data/elementary/themes/img/bt-connect-off.svg
new file mode 100644
index 0000000000..520cbfd4ad
--- /dev/null
+++ b/data/elementary/themes/img/bt-connect-off.svg
@@ -0,0 +1,183 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:export-ydpi="48"
+   inkscape:export-xdpi="48"
+   inkscape:export-filename="/home/raster/C/th-efl/th/img/ic/bt-connect-off-040.png"
+   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)"
+   sodipodi:docname="bt-connect-off.svg"
+   viewBox="0 0 80 80"
+   height="80"
+   width="80"
+   id="svg2"
+   version="1.1">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6">
+    <rect
+       id="rect878"
+       height="30"
+       width="40"
+       y="20"
+       x="20" />
+    <rect
+       id="rect872"
+       height="30"
+       width="40"
+       y="50"
+       x="20" />
+    <rect
+       id="rect864"
+       height="30"
+       width="40"
+       y="20"
+       x="20" />
+    <rect
+       id="rect858"
+       height="30"
+       width="40"
+       y="20"
+       x="20" />
+    <rect
+       id="rect852"
+       height="30"
+       width="40"
+       y="20"
+       x="20" />
+  </defs>
+  <sodipodi:namedview
+     inkscape:snap-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox="true"
+     showguides="false"
+     inkscape:current-layer="text876"
+     inkscape:window-maximized="0"
+     inkscape:window-y="0"
+     inkscape:window-x="804"
+     inkscape:cy="40.240385"
+     inkscape:cx="40"
+     inkscape:zoom="10.4"
+     showgrid="true"
+     id="namedview4"
+     inkscape:window-height="1372"
+     inkscape:window-width="1756"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#404040"
+     inkscape:document-rotation="0">
+    <inkscape:grid
+       id="grid837"
+       type="xygrid"
+       empspacing="4" />
+  </sodipodi:namedview>
+  <g
+     id="g10"
+     inkscape:label="Image"
+     inkscape:groupmode="layer">
+    <text
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;line-height:120px;font-family:Quicksand;-inkscape-font-specification:Quicksand;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect852);fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
+       id="text850"
+       xml:space="preserve" />
+    <text
+       style="font-style:normal;font-weight:normal;font-size:28px;line-height:140px;font-family:Sans;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect858);fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
+       id="text856"
+       xml:space="preserve"><tspan
+         style="visibility:hidden"
+         x="20"
+         y="127.27344"><tspan
+           dx="0 28 28 26.605469 17.814453 26.605469 23.460938 23.460938 23.460938 17.814453 17.814453 17.814453"
+           style="font-size:28px">@@%$%^^^4445</tspan></tspan></text>
+    <text
+       style="font-style:normal;font-weight:normal;font-size:24px;line-height:120px;font-family:Sans;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect864);fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
+       id="text862"
+       xml:space="preserve"><tspan
+         style="visibility:hidden"
+         x="20"
+         y="117.27344"><tspan
+           dx="0 17.814453 17.814453 28"
+           style="font-size:28px">22@!</tspan></tspan></text>
+    <text
+       style="fill:black;stroke:none;stroke-opacity:1;stroke-width:1px;stroke-linejoin:miter;stroke-linecap:butt;fill-opacity:1;font-family:Sans;font-style:normal;font-weight:normal;font-size:5px;line-height:25px;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect872);"
+       id="text870"
+       xml:space="preserve" />
+    <g
+       transform="translate(-0.280035,2.562039)"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:20.8333px;font-family:Syncopate;-inkscape-font-specification:Syncopate;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect878);fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="text876"
+       aria-label="!@#?">
+      <path
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:20.8333px;font-family:Syncopate;-inkscape-font-specification:Syncopate;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect878);fill:#a3a3a3;fill-opacity:1;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+         d="m 4.280035,61.437961 12,12 12,-12 -12,-12 z"
+         id="path7615"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:20.8333px;font-family:Syncopate;-inkscape-font-specification:Syncopate;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect878);fill:#ffea81;fill-opacity:1;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+         d="m 16.280035,41.437961 20,20 8,-8 -20,-20 z"
+         id="path7611"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:20.8333px;font-family:Syncopate;-inkscape-font-specification:Syncopate;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect878);fill:#d8b15d;fill-opacity:1;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+         d="m 16.280035,49.437961 12,12 h 8 l -20,-20 z"
+         id="path7613"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:20.8333px;font-family:Syncopate;-inkscape-font-specification:Syncopate;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect878);fill:#ffffff;fill-opacity:0.5;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+         d="m 6.280035,63.437961 2,2 12,-12 2,-6 8,-8 -3,-3 -8,8 -1,7 z"
+         id="path7617"
+         sodipodi:nodetypes="ccccccccc" />
+      <path
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:20.8333px;font-family:Syncopate;-inkscape-font-specification:Syncopate;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect878);fill:#000000;fill-opacity:0.25;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+         d="m 16.280035,73.437961 -3,-3 12,-12 5,-3 8,-8 6,6 -8,8 h -8 z"
+         id="path7619"
+         sodipodi:nodetypes="ccccccccc" />
+      <path
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:20.8333px;font-family:Syncopate;-inkscape-font-specification:Syncopate;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect878);fill:#a3a3a3;fill-opacity:1;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+         d="m 64.280035,1.4379612 12,11.9999998 -12,12 -12,-12 z"
+         id="path8978"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:20.8333px;font-family:Syncopate;-inkscape-font-specification:Syncopate;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect878);fill:#ffea81;fill-opacity:1;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+         d="m 44.280035,13.437961 20,20 -8,8 -20,-20 z"
+         id="path8980"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:20.8333px;font-family:Syncopate;-inkscape-font-specification:Syncopate;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect878);fill:#d8b15d;fill-opacity:1;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+         d="m 52.280035,13.437961 12,12 v 8 l -20,-20 z"
+         id="path8982"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:20.8333px;font-family:Syncopate;-inkscape-font-specification:Syncopate;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect878);fill:#ffffff;fill-opacity:0.5;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+         d="m 66.280035,3.4379611 2,1.9999999 -12,12 -6,2 -8,8 -3,-3 8,-8 7,-1 z"
+         id="path8984"
+         sodipodi:nodetypes="ccccccccc" />
+      <path
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:20.8333px;font-family:Syncopate;-inkscape-font-specification:Syncopate;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect878);fill:#000000;fill-opacity:0.25;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+         d="m 76.280035,13.437961 -3,-3 -12,12 -3,5 -8,8 6,6 8,-8 v -8 z"
+         id="path8986"
+         sodipodi:nodetypes="ccccccccc" />
+    </g>
+  </g>
+</svg>
diff --git a/data/elementary/themes/img/bt-connect-on.svg b/data/elementary/themes/img/bt-connect-on.svg
new file mode 100644
index 0000000000..856647ec98
--- /dev/null
+++ b/data/elementary/themes/img/bt-connect-on.svg
@@ -0,0 +1,187 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:export-ydpi="48"
+   inkscape:export-xdpi="48"
+   inkscape:export-filename="/home/raster/C/th-efl/th/img/ic/bt-connect-on-040.png"
+   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)"
+   sodipodi:docname="bt-connect-on.svg"
+   viewBox="0 0 80 80"
+   height="80"
+   width="80"
+   id="svg2"
+   version="1.1">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6">
+    <rect
+       id="rect878"
+       height="30"
+       width="40"
+       y="20"
+       x="20" />
+    <rect
+       id="rect872"
+       height="30"
+       width="40"
+       y="50"
+       x="20" />
+    <rect
+       id="rect864"
+       height="30"
+       width="40"
+       y="20"
+       x="20" />
+    <rect
+       id="rect858"
+       height="30"
+       width="40"
+       y="20"
+       x="20" />
+    <rect
+       id="rect852"
+       height="30"
+       width="40"
+       y="20"
+       x="20" />
+  </defs>
+  <sodipodi:namedview
+     inkscape:snap-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox="true"
+     showguides="false"
+     inkscape:current-layer="text876"
+     inkscape:window-maximized="0"
+     inkscape:window-y="0"
+     inkscape:window-x="804"
+     inkscape:cy="40.240385"
+     inkscape:cx="40"
+     inkscape:zoom="10.4"
+     showgrid="true"
+     id="namedview4"
+     inkscape:window-height="1372"
+     inkscape:window-width="1756"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#404040"
+     inkscape:document-rotation="0">
+    <inkscape:grid
+       id="grid837"
+       type="xygrid"
+       empspacing="4" />
+  </sodipodi:namedview>
+  <g
+     id="g10"
+     inkscape:label="Image"
+     inkscape:groupmode="layer">
+    <text
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;line-height:120px;font-family:Quicksand;-inkscape-font-specification:Quicksand;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect852);fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
+       id="text850"
+       xml:space="preserve" />
+    <text
+       style="font-style:normal;font-weight:normal;font-size:28px;line-height:140px;font-family:Sans;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect858);fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
+       id="text856"
+       xml:space="preserve"><tspan
+         style="visibility:hidden"
+         x="20"
+         y="127.27344"><tspan
+           dx="0 28 28 26.605469 17.814453 26.605469 23.460938 23.460938 23.460938 17.814453 17.814453 17.814453"
+           style="font-size:28px">@@%$%^^^4445</tspan></tspan></text>
+    <text
+       style="font-style:normal;font-weight:normal;font-size:24px;line-height:120px;font-family:Sans;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect864);fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
+       id="text862"
+       xml:space="preserve"><tspan
+         style="visibility:hidden"
+         x="20"
+         y="117.27344"><tspan
+           dx="0 17.814453 17.814453 28"
+           style="font-size:28px">22@!</tspan></tspan></text>
+    <text
+       style="fill:black;stroke:none;stroke-opacity:1;stroke-width:1px;stroke-linejoin:miter;stroke-linecap:butt;fill-opacity:1;font-family:Sans;font-style:normal;font-weight:normal;font-size:5px;line-height:25px;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect872);"
+       id="text870"
+       xml:space="preserve" />
+    <g
+       transform="translate(-0.280035,2.562039)"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:20.8333px;font-family:Syncopate;-inkscape-font-specification:Syncopate;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect878);fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="text876"
+       aria-label="!@#?">
+      <path
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:20.8333px;font-family:Syncopate;-inkscape-font-specification:Syncopate;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect878);fill:#a3a3a3;fill-opacity:1;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+         d="m 4.280035,61.437961 12,12 18,-18 -12,-12 z"
+         id="path7615"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:20.8333px;font-family:Syncopate;-inkscape-font-specification:Syncopate;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect878);fill:#ffea81;fill-opacity:1;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+         d="m 22.280035,35.437961 20,20 8,-8 -20,-20 z"
+         id="path7611"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:20.8333px;font-family:Syncopate;-inkscape-font-specification:Syncopate;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect878);fill:#d8b15d;fill-opacity:1;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+         d="m 22.280035,43.437961 12,12 h 8 l -20,-20 z"
+         id="path7613"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:20.8333px;font-family:Syncopate;-inkscape-font-specification:Syncopate;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect878);fill:#ffffff;fill-opacity:0.5;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+         d="m 6.280035,63.437961 2,2 18,-18 2,-6 8,-8 -3,-3 -8,8 -1,7 z"
+         id="path7617"
+         sodipodi:nodetypes="ccccccccc" />
+      <path
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:20.8333px;font-family:Syncopate;-inkscape-font-specification:Syncopate;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect878);fill:#000000;fill-opacity:0.25;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+         d="m 16.280035,73.437961 -3,-3 18,-18 5,-3 8,-8 6,6 -8,8 h -8 z"
+         id="path7619"
+         sodipodi:nodetypes="ccccccccc" />
+      <path
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:20.8333px;font-family:Syncopate;-inkscape-font-specification:Syncopate;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect878);fill:#a3a3a3;fill-opacity:1;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+         d="m 64.280035,1.4379612 12,11.9999998 -18,18 -12,-12 z"
+         id="path8978"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:20.8333px;font-family:Syncopate;-inkscape-font-specification:Syncopate;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect878);fill:#ffea81;fill-opacity:1;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+         d="m 38.280035,19.437961 20,20 -8,8 -20,-20 z"
+         id="path8980"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:20.8333px;font-family:Syncopate;-inkscape-font-specification:Syncopate;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect878);fill:#d8b15d;fill-opacity:1;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+         d="m 46.280035,19.437961 12,12 v 8 l -20,-20 z"
+         id="path8982"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:20.8333px;font-family:Syncopate;-inkscape-font-specification:Syncopate;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect878);fill:#ffffff;fill-opacity:0.5;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+         d="m 66.280035,3.437961 2,1.9999999 -18,18.0000001 -6,2 -8,8 -3,-3 8,-8 7,-1 z"
+         id="path8984"
+         sodipodi:nodetypes="ccccccccc" />
+      <path
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:20.8333px;font-family:Syncopate;-inkscape-font-specification:Syncopate;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect878);fill:#000000;fill-opacity:0.25;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+         d="m 76.280035,13.437961 -3,-3 -18,18 -3,5 -8,8 6,6 8,-8 v -8 z"
+         id="path8986"
+         sodipodi:nodetypes="ccccccccc" />
+      <path
+         style="fill:#000000;fill-opacity:0.2;stroke:none;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 29.280035,28.437961 2,-2 20,20 -2,2 z"
+         id="path9052" />
+    </g>
+  </g>
+</svg>
diff --git a/data/elementary/themes/img/bt-expand-left.svg b/data/elementary/themes/img/bt-expand-left.svg
new file mode 100644
index 0000000000..63745bd8e1
--- /dev/null
+++ b/data/elementary/themes/img/bt-expand-left.svg
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:export-ydpi="48"
+   inkscape:export-xdpi="48"
+   inkscape:export-filename="/home/raster/C/th-efl/th/img/ic/bt-expand-left-040.png"
+   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)"
+   sodipodi:docname="bt-expand-left.svg"
+   viewBox="0 0 80 80"
+   height="80"
+   width="80"
+   id="svg2"
+   version="1.1">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6">
+    <rect
+       id="rect878"
+       height="30"
+       width="40"
+       y="20"
+       x="20" />
+    <rect
+       id="rect872"
+       height="30"
+       width="40"
+       y="50"
+       x="20" />
+    <rect
+       id="rect864"
+       height="30"
+       width="40"
+       y="20"
+       x="20" />
+    <rect
+       id="rect858"
+       height="30"
+       width="40"
+       y="20"
+       x="20" />
+    <rect
+       id="rect852"
+       height="30"
+       width="40"
+       y="20"
+       x="20" />
+  </defs>
+  <sodipodi:namedview
+     inkscape:snap-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox="true"
+     showguides="false"
+     inkscape:current-layer="text876"
+     inkscape:window-maximized="0"
+     inkscape:window-y="0"
+     inkscape:window-x="804"
+     inkscape:cy="40"
+     inkscape:cx="40"
+     inkscape:zoom="13.05"
+     showgrid="true"
+     id="namedview4"
+     inkscape:window-height="1372"
+     inkscape:window-width="1756"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#404040"
+     inkscape:document-rotation="0">
+    <inkscape:grid
+       id="grid837"
+       type="xygrid"
+       empspacing="4" />
+  </sodipodi:namedview>
+  <g
+     id="g10"
+     inkscape:label="Image"
+     inkscape:groupmode="layer">
+    <text
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;line-height:120px;font-family:Quicksand;-inkscape-font-specification:Quicksand;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect852);fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
+       id="text850"
+       xml:space="preserve" />
+    <text
+       style="font-style:normal;font-weight:normal;font-size:28px;line-height:140px;font-family:Sans;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect858);fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
+       id="text856"
+       xml:space="preserve"><tspan
+         style="visibility:hidden"
+         x="20"
+         y="127.27344"><tspan
+           dx="0 28 28 26.605469 17.814453 26.605469 23.460938 23.460938 23.460938 17.814453 17.814453 17.814453"
+           style="font-size:28px">@@%$%^^^4445</tspan></tspan></text>
+    <text
+       style="font-style:normal;font-weight:normal;font-size:24px;line-height:120px;font-family:Sans;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect864);fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
+       id="text862"
+       xml:space="preserve"><tspan
+         style="visibility:hidden"
+         x="20"
+         y="117.27344"><tspan
+           dx="0 17.814453 17.814453 28"
+           style="font-size:28px">22@!</tspan></tspan></text>
+    <text
+       style="fill:black;stroke:none;stroke-opacity:1;stroke-width:1px;stroke-linejoin:miter;stroke-linecap:butt;fill-opacity:1;font-family:Sans;font-style:normal;font-weight:normal;font-size:5px;line-height:25px;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect872);"
+       id="text870"
+       xml:space="preserve" />
+    <g
+       transform="translate(-0.280035,2.562039)"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:20.8333px;font-family:Syncopate;-inkscape-font-specification:Syncopate;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect878);fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="text876"
+       aria-label="!@#?">
+      <path
+         style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 4.280035,37.437961 36,-36 16,16 -20,20 20,20 -16,16 z"
+         id="path9866"
+         sodipodi:nodetypes="ccccccc" />
+      <rect
+         style="fill:#e9c457;fill-opacity:1;stroke:none;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect9875"
+         width="8"
+         height="8"
+         x="44.280033"
+         y="33.437962" />
+      <rect
+         style="fill:#e9c457;fill-opacity:0.66000003;stroke:none;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect9877"
+         width="8"
+         height="8"
+         x="56.280033"
+         y="33.437962" />
+      <rect
+         style="fill:#e9c457;fill-opacity:0.33000001;stroke:none;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect9879"
+         width="8"
+         height="8"
+         x="68.280037"
+         y="33.437962" />
+    </g>
+  </g>
+</svg>
diff --git a/data/elementary/themes/img/bt-expand-right.svg b/data/elementary/themes/img/bt-expand-right.svg
new file mode 100644
index 0000000000..1b38378bcf
--- /dev/null
+++ b/data/elementary/themes/img/bt-expand-right.svg
@@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:export-ydpi="48"
+   inkscape:export-xdpi="48"
+   inkscape:export-filename="/home/raster/C/th-efl/th/img/ic/bt-expand-right-040.png"
+   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)"
+   sodipodi:docname="bt-expand-right.svg"
+   viewBox="0 0 80 80"
+   height="80"
+   width="80"
+   id="svg2"
+   version="1.1">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6">
+    <rect
+       id="rect878"
+       height="30"
+       width="40"
+       y="20"
+       x="20" />
+    <rect
+       id="rect872"
+       height="30"
+       width="40"
+       y="50"
+       x="20" />
+    <rect
+       id="rect864"
+       height="30"
+       width="40"
+       y="20"
+       x="20" />
+    <rect
+       id="rect858"
+       height="30"
+       width="40"
+       y="20"
+       x="20" />
+    <rect
+       id="rect852"
+       height="30"
+       width="40"
+       y="20"
+       x="20" />
+  </defs>
+  <sodipodi:namedview
+     inkscape:snap-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox="true"
+     showguides="false"
+     inkscape:current-layer="text876"
+     inkscape:window-maximized="0"
+     inkscape:window-y="0"
+     inkscape:window-x="804"
+     inkscape:cy="40"
+     inkscape:cx="40"
+     inkscape:zoom="13.05"
+     showgrid="true"
+     id="namedview4"
+     inkscape:window-height="1372"
+     inkscape:window-width="1756"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#404040"
+     inkscape:document-rotation="0">
+    <inkscape:grid
+       id="grid837"
+       type="xygrid"
+       empspacing="4" />
+  </sodipodi:namedview>
+  <g
+     id="g10"
+     inkscape:label="Image"
+     inkscape:groupmode="layer">
+    <text
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;line-height:120px;font-family:Quicksand;-inkscape-font-specification:Quicksand;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect852);fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
+       id="text850"
+       xml:space="preserve" />
+    <text
+       style="font-style:normal;font-weight:normal;font-size:28px;line-height:140px;font-family:Sans;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect858);fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
+       id="text856"
+       xml:space="preserve"><tspan
+         style="visibility:hidden"
+         x="20"
+         y="127.27344"><tspan
+           dx="0 28 28 26.605469 17.814453 26.605469 23.460938 23.460938 23.460938 17.814453 17.814453 17.814453"
+           style="font-size:28px">@@%$%^^^4445</tspan></tspan></text>
+    <text
+       style="font-style:normal;font-weight:normal;font-size:24px;line-height:120px;font-family:Sans;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect864);fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
+       id="text862"
+       xml:space="preserve"><tspan
+         style="visibility:hidden"
+         x="20"
+         y="117.27344"><tspan
+           dx="0 17.814453 17.814453 28"
+           style="font-size:28px">22@!</tspan></tspan></text>
+    <text
+       style="fill:black;stroke:none;stroke-opacity:1;stroke-width:1px;stroke-linejoin:miter;stroke-linecap:butt;fill-opacity:1;font-family:Sans;font-style:normal;font-weight:normal;font-size:5px;line-height:25px;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect872);"
+       id="text870"
+       xml:space="preserve" />
+    <g
+       transform="translate(-0.280035,2.562039)"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:20.8333px;font-family:Syncopate;-inkscape-font-specification:Syncopate;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect878);fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="text876"
+       aria-label="!@#?">
+      <path
+         style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 76.280037,37.437961 -36,-36 -16,16 20,20 -20,20 16,16 z"
+         id="path9866"
+         sodipodi:nodetypes="ccccccc" />
+      <rect
+         style="fill:#e9c457;fill-opacity:1;stroke:none;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect9875"
+         width="8"
+         height="8"
+         x="-36.280037"
+         y="33.437962"
+         transform="scale(-1,1)" />
+      <rect
+         style="fill:#e9c457;fill-opacity:0.66;stroke:none;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect9877"
+         width="8"
+         height="8"
+         x="-24.280039"
+         y="33.437962"
+         transform="scale(-1,1)" />
+      <rect
+         style="fill:#e9c457;fill-opacity:0.33;stroke:none;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="rect9879"
+         width="8"
+         height="8"
+         x="-12.280035"
+         y="33.437962"
+         transform="scale(-1,1)" />
+    </g>
+  </g>
+</svg>
diff --git a/data/elementary/themes/img/bt-force-connect-off.svg b/data/elementary/themes/img/bt-force-connect-off.svg
new file mode 100644
index 0000000000..af4c2c8a0a
--- /dev/null
+++ b/data/elementary/themes/img/bt-force-connect-off.svg
@@ -0,0 +1,183 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:export-ydpi="48"
+   inkscape:export-xdpi="48"
+   inkscape:export-filename="/home/raster/C/th-efl/th/img/ic/bt-force-connect-off-040.png"
+   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)"
+   sodipodi:docname="bt-force-connect-off.svg"
+   viewBox="0 0 80 80"
+   height="80"
+   width="80"
+   id="svg2"
+   version="1.1">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6">
+    <rect
+       id="rect878"
+       height="30"
+       width="40"
+       y="20"
+       x="20" />
+    <rect
+       id="rect872"
+       height="30"
+       width="40"
+       y="50"
+       x="20" />
+    <rect
+       id="rect864"
+       height="30"
+       width="40"
+       y="20"
+       x="20" />
+    <rect
+       id="rect858"
+       height="30"
+       width="40"
+       y="20"
+       x="20" />
+    <rect
+       id="rect852"
+       height="30"
+       width="40"
+       y="20"
+       x="20" />
+  </defs>
+  <sodipodi:namedview
+     inkscape:snap-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox="true"
+     showguides="false"
+     inkscape:current-layer="text876"
+     inkscape:window-maximized="0"
+     inkscape:window-y="0"
+     inkscape:window-x="804"
+     inkscape:cy="40.240385"
+     inkscape:cx="40"
+     inkscape:zoom="10.4"
+     showgrid="true"
+     id="namedview4"
+     inkscape:window-height="1372"
+     inkscape:window-width="1756"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#404040"
+     inkscape:document-rotation="0">
+    <inkscape:grid
+       id="grid837"
+       type="xygrid"
+       empspacing="4" />
+  </sodipodi:namedview>
+  <g
+     id="g10"
+     inkscape:label="Image"
+     inkscape:groupmode="layer">
+    <text
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;line-height:120px;font-family:Quicksand;-inkscape-font-specification:Quicksand;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect852);fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
+       id="text850"
+       xml:space="preserve" />
+    <text
+       style="font-style:normal;font-weight:normal;font-size:28px;line-height:140px;font-family:Sans;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect858);fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
+       id="text856"
+       xml:space="preserve"><tspan
+         style="visibility:hidden"
+         x="20"
+         y="127.27344"><tspan
+           dx="0 28 28 26.605469 17.814453 26.605469 23.460938 23.460938 23.460938 17.814453 17.814453 17.814453"
+           style="font-size:28px">@@%$%^^^4445</tspan></tspan></text>
+    <text
+       style="font-style:normal;font-weight:normal;font-size:24px;line-height:120px;font-family:Sans;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect864);fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
+       id="text862"
+       xml:space="preserve"><tspan
+         style="visibility:hidden"
+         x="20"
+         y="117.27344"><tspan
+           dx="0 17.814453 17.814453 28"
+           style="font-size:28px">22@!</tspan></tspan></text>
+    <text
+       style="fill:black;stroke:none;stroke-opacity:1;stroke-width:1px;stroke-linejoin:miter;stroke-linecap:butt;fill-opacity:1;font-family:Sans;font-style:normal;font-weight:normal;font-size:5px;line-height:25px;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect872);"
+       id="text870"
+       xml:space="preserve" />
+    <g
+       transform="translate(-0.280035,2.562039)"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:20.8333px;font-family:Syncopate;-inkscape-font-specification:Syncopate;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect878);fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="text876"
+       aria-label="!@#?">
+      <path
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:20.8333px;font-family:Syncopate;-inkscape-font-specification:Syncopate;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect878);fill:#c13a2a;fill-opacity:1;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+         d="m 4.280035,61.437961 12,12 12,-12 -12,-12 z"
+         id="path7615"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:20.8333px;font-family:Syncopate;-inkscape-font-specification:Syncopate;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect878);fill:#ffea81;fill-opacity:1;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+         d="m 16.280035,41.437961 20,20 8,-8 -20,-20 z"
+         id="path7611"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:20.8333px;font-family:Syncopate;-inkscape-font-specification:Syncopate;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect878);fill:#d8b15d;fill-opacity:1;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+         d="m 16.280035,49.437961 12,12 h 8 l -20,-20 z"
+         id="path7613"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:20.8333px;font-family:Syncopate;-inkscape-font-specification:Syncopate;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect878);fill:#ffffff;fill-opacity:0.5;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+         d="m 6.280035,63.437961 2,2 12,-12 2,-6 8,-8 -3,-3 -8,8 -1,7 z"
+         id="path7617"
+         sodipodi:nodetypes="ccccccccc" />
+      <path
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:20.8333px;font-family:Syncopate;-inkscape-font-specification:Syncopate;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect878);fill:#000000;fill-opacity:0.25;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+         d="m 16.280035,73.437961 -3,-3 12,-12 5,-3 8,-8 6,6 -8,8 h -8 z"
+         id="path7619"
+         sodipodi:nodetypes="ccccccccc" />
+      <path
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:20.8333px;font-family:Syncopate;-inkscape-font-specification:Syncopate;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect878);fill:#c13a2a;fill-opacity:1;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+         d="m 64.280035,1.4379612 12,11.9999998 -12,12 -12,-12 z"
+         id="path8978"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:20.8333px;font-family:Syncopate;-inkscape-font-specification:Syncopate;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect878);fill:#ffea81;fill-opacity:1;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+         d="m 44.280035,13.437961 20,20 -8,8 -20,-20 z"
+         id="path8980"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:20.8333px;font-family:Syncopate;-inkscape-font-specification:Syncopate;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect878);fill:#d8b15d;fill-opacity:1;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+         d="m 52.280035,13.437961 12,12 v 8 l -20,-20 z"
+         id="path8982"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:20.8333px;font-family:Syncopate;-inkscape-font-specification:Syncopate;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect878);fill:#ffffff;fill-opacity:0.5;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+         d="m 66.280035,3.4379611 2,1.9999999 -12,12 -6,2 -8,8 -3,-3 8,-8 7,-1 z"
+         id="path8984"
+         sodipodi:nodetypes="ccccccccc" />
+      <path
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:20.8333px;font-family:Syncopate;-inkscape-font-specification:Syncopate;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect878);fill:#000000;fill-opacity:0.25;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+         d="m 76.280035,13.437961 -3,-3 -12,12 -3,5 -8,8 6,6 8,-8 v -8 z"
+         id="path8986"
+         sodipodi:nodetypes="ccccccccc" />
+    </g>
+  </g>
+</svg>
diff --git a/data/elementary/themes/img/bt-force-connect-on.svg b/data/elementary/themes/img/bt-force-connect-on.svg
new file mode 100644
index 0000000000..890330043c
--- /dev/null
+++ b/data/elementary/themes/img/bt-force-connect-on.svg
@@ -0,0 +1,187 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:export-ydpi="48"
+   inkscape:export-xdpi="48"
+   inkscape:export-filename="/home/raster/C/th-efl/th/img/ic/bt-force-connect-on-040.png"
+   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)"
+   sodipodi:docname="bt-force-connect-on.svg"
+   viewBox="0 0 80 80"
+   height="80"
+   width="80"
+   id="svg2"
+   version="1.1">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6">
+    <rect
+       id="rect878"
+       height="30"
+       width="40"
+       y="20"
+       x="20" />
+    <rect
+       id="rect872"
+       height="30"
+       width="40"
+       y="50"
+       x="20" />
+    <rect
+       id="rect864"
+       height="30"
+       width="40"
+       y="20"
+       x="20" />
+    <rect
+       id="rect858"
+       height="30"
+       width="40"
+       y="20"
+       x="20" />
+    <rect
+       id="rect852"
+       height="30"
+       width="40"
+       y="20"
+       x="20" />
+  </defs>
+  <sodipodi:namedview
+     inkscape:snap-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox="true"
+     showguides="false"
+     inkscape:current-layer="text876"
+     inkscape:window-maximized="0"
+     inkscape:window-y="0"
+     inkscape:window-x="804"
+     inkscape:cy="40.240385"
+     inkscape:cx="40"
+     inkscape:zoom="10.4"
+     showgrid="true"
+     id="namedview4"
+     inkscape:window-height="1372"
+     inkscape:window-width="1756"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#404040"
+     inkscape:document-rotation="0">
+    <inkscape:grid
+       id="grid837"
+       type="xygrid"
+       empspacing="4" />
+  </sodipodi:namedview>
+  <g
+     id="g10"
+     inkscape:label="Image"
+     inkscape:groupmode="layer">
+    <text
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;line-height:120px;font-family:Quicksand;-inkscape-font-specification:Quicksand;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect852);fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
+       id="text850"
+       xml:space="preserve" />
+    <text
+       style="font-style:normal;font-weight:normal;font-size:28px;line-height:140px;font-family:Sans;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect858);fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
+       id="text856"
+       xml:space="preserve"><tspan
+         style="visibility:hidden"
+         x="20"
+         y="127.27344"><tspan
+           dx="0 28 28 26.605469 17.814453 26.605469 23.460938 23.460938 23.460938 17.814453 17.814453 17.814453"
+           style="font-size:28px">@@%$%^^^4445</tspan></tspan></text>
+    <text
+       style="font-style:normal;font-weight:normal;font-size:24px;line-height:120px;font-family:Sans;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect864);fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
+       id="text862"
+       xml:space="preserve"><tspan
+         style="visibility:hidden"
+         x="20"
+         y="117.27344"><tspan
+           dx="0 17.814453 17.814453 28"
+           style="font-size:28px">22@!</tspan></tspan></text>
+    <text
+       style="fill:black;stroke:none;stroke-opacity:1;stroke-width:1px;stroke-linejoin:miter;stroke-linecap:butt;fill-opacity:1;font-family:Sans;font-style:normal;font-weight:normal;font-size:5px;line-height:25px;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect872);"
+       id="text870"
+       xml:space="preserve" />
+    <g
+       transform="translate(-0.280035,2.562039)"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:20.8333px;font-family:Syncopate;-inkscape-font-specification:Syncopate;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect878);fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="text876"
+       aria-label="!@#?">
+      <path
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:20.8333px;font-family:Syncopate;-inkscape-font-specification:Syncopate;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect878);fill:#c13a2a;fill-opacity:1;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+         d="m 4.280035,61.437961 12,12 18,-18 -12,-12 z"
+         id="path7615"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:20.8333px;font-family:Syncopate;-inkscape-font-specification:Syncopate;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect878);fill:#ffea81;fill-opacity:1;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+         d="m 22.280035,35.437961 20,20 8,-8 -20,-20 z"
+         id="path7611"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:20.8333px;font-family:Syncopate;-inkscape-font-specification:Syncopate;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect878);fill:#d8b15d;fill-opacity:1;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+         d="m 22.280035,43.437961 12,12 h 8 l -20,-20 z"
+         id="path7613"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:20.8333px;font-family:Syncopate;-inkscape-font-specification:Syncopate;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect878);fill:#ffffff;fill-opacity:0.5;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+         d="m 6.280035,63.437961 2,2 18,-18 2,-6 8,-8 -3,-3 -8,8 -1,7 z"
+         id="path7617"
+         sodipodi:nodetypes="ccccccccc" />
+      <path
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:20.8333px;font-family:Syncopate;-inkscape-font-specification:Syncopate;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect878);fill:#000000;fill-opacity:0.25;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+         d="m 16.280035,73.437961 -3,-3 18,-18 5,-3 8,-8 6,6 -8,8 h -8 z"
+         id="path7619"
+         sodipodi:nodetypes="ccccccccc" />
+      <path
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:20.8333px;font-family:Syncopate;-inkscape-font-specification:Syncopate;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect878);fill:#c13a2a;fill-opacity:1;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+         d="m 64.280035,1.4379612 12,11.9999998 -18,18 -12,-12 z"
+         id="path8978"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:20.8333px;font-family:Syncopate;-inkscape-font-specification:Syncopate;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect878);fill:#ffea81;fill-opacity:1;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+         d="m 38.280035,19.437961 20,20 -8,8 -20,-20 z"
+         id="path8980"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:20.8333px;font-family:Syncopate;-inkscape-font-specification:Syncopate;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect878);fill:#d8b15d;fill-opacity:1;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+         d="m 46.280035,19.437961 12,12 v 8 l -20,-20 z"
+         id="path8982"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:20.8333px;font-family:Syncopate;-inkscape-font-specification:Syncopate;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect878);fill:#ffffff;fill-opacity:0.5;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+         d="m 66.280035,3.437961 2,1.9999999 -18,18.0000001 -6,2 -8,8 -3,-3 8,-8 7,-1 z"
+         id="path8984"
+         sodipodi:nodetypes="ccccccccc" />
+      <path
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:20.8333px;font-family:Syncopate;-inkscape-font-specification:Syncopate;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect878);fill:#000000;fill-opacity:0.25;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+         d="m 76.280035,13.437961 -3,-3 -18,18 -3,5 -8,8 6,6 8,-8 v -8 z"
+         id="path8986"
+         sodipodi:nodetypes="ccccccccc" />
+      <path
+         style="fill:#000000;fill-opacity:0.2;stroke:none;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 29.280035,28.437961 2,-2 20,20 -2,2 z"
+         id="path9052" />
+    </g>
+  </g>
+</svg>
diff --git a/data/elementary/themes/img/bt-lock-device-off.svg b/data/elementary/themes/img/bt-lock-device-off.svg
new file mode 100644
index 0000000000..3e98ec4434
--- /dev/null
+++ b/data/elementary/themes/img/bt-lock-device-off.svg
@@ -0,0 +1,175 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:export-ydpi="48"
+   inkscape:export-xdpi="48"
+   inkscape:export-filename="/home/raster/C/th-efl/th/img/ic/bt-lock-device-off-040.png"
+   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)"
+   sodipodi:docname="bt-lock-device-off.svg"
+   viewBox="0 0 80 80"
+   height="80"
+   width="80"
+   id="svg2"
+   version="1.1">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6">
+    <rect
+       id="rect878"
+       height="30"
+       width="40"
+       y="20"
+       x="20" />
+    <rect
+       id="rect872"
+       height="30"
+       width="40"
+       y="50"
+       x="20" />
+    <rect
+       id="rect864"
+       height="30"
+       width="40"
+       y="20"
+       x="20" />
+    <rect
+       id="rect858"
+       height="30"
+       width="40"
+       y="20"
+       x="20" />
+    <rect
+       id="rect852"
+       height="30"
+       width="40"
+       y="20"
+       x="20" />
+  </defs>
+  <sodipodi:namedview
+     inkscape:snap-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox="true"
+     showguides="false"
+     inkscape:current-layer="text876"
+     inkscape:window-maximized="0"
+     inkscape:window-y="0"
+     inkscape:window-x="804"
+     inkscape:cy="40.240385"
+     inkscape:cx="40"
+     inkscape:zoom="10.4"
+     showgrid="true"
+     id="namedview4"
+     inkscape:window-height="1372"
+     inkscape:window-width="1756"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#404040"
+     inkscape:document-rotation="0">
+    <inkscape:grid
+       id="grid837"
+       type="xygrid"
+       empspacing="4" />
+  </sodipodi:namedview>
+  <g
+     id="g10"
+     inkscape:label="Image"
+     inkscape:groupmode="layer">
+    <text
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;line-height:120px;font-family:Quicksand;-inkscape-font-specification:Quicksand;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect852);fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
+       id="text850"
+       xml:space="preserve" />
+    <text
+       style="font-style:normal;font-weight:normal;font-size:28px;line-height:140px;font-family:Sans;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect858);fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
+       id="text856"
+       xml:space="preserve"><tspan
+         style="visibility:hidden"
+         x="20"
+         y="127.27344"><tspan
+           dx="0 28 28 26.605469 17.814453 26.605469 23.460938 23.460938 23.460938 17.814453 17.814453 17.814453"
+           style="font-size:28px">@@%$%^^^4445</tspan></tspan></text>
+    <text
+       style="font-style:normal;font-weight:normal;font-size:24px;line-height:120px;font-family:Sans;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect864);fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
+       id="text862"
+       xml:space="preserve"><tspan
+         style="visibility:hidden"
+         x="20"
+         y="117.27344"><tspan
+           dx="0 17.814453 17.814453 28"
+           style="font-size:28px">22@!</tspan></tspan></text>
+    <text
+       style="fill:black;stroke:none;stroke-opacity:1;stroke-width:1px;stroke-linejoin:miter;stroke-linecap:butt;fill-opacity:1;font-family:Sans;font-style:normal;font-weight:normal;font-size:5px;line-height:25px;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect872);"
+       id="text870"
+       xml:space="preserve" />
+    <g
+       transform="translate(-0.280035,2.562039)"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:20.8333px;font-family:Syncopate;-inkscape-font-specification:Syncopate;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect878);fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="text876"
+       aria-label="!@#?">
+      <path
+         sodipodi:nodetypes="cccccccscccccsccc"
+         d="M 40.244424,1.3875927 C 30.462828,1.4487253 22.526999,9.3386744 22.389618,19.139165 h -0.07038 v 12.252011 h 5.973496 V 19.37848 C 28.422823,12.848631 33.750833,7.3797966 40.281964,7.365785 h 0.02346 c 6.634428,0 12.012695,5.378267 12.012695,12.012695 v 12.012696 h 6.006348 V 19.472329 c 5.9e-5,-0.02658 5.9e-5,-0.05318 0,-0.07978 v -0.01408 c -0.0077,-9.9387704 -8.050936,-17.9915 -17.969771,-17.9908813 -0.03676,-1.129e-4 -0.07352,-1.129e-4 -0.110276,0 z"
+         style="fill:#ffffff;fill-opacity:1;stroke-width:5.75419;stroke-linecap:round;stroke-linejoin:round"
+         id="circle1049" />
+      <path
+         d="m 40.274925,7.365785 a 14.415234,12.012695 0 0 0 -14.384733,12.012695 14.415234,12.012695 0 0 0 0,0.0258 v 11.986892 h 2.402539 V 26.01831 19.37848 C 28.422777,12.850997 33.747033,7.3837416 40.274925,7.365785 Z"
+         style="fill:#c8c8c8;fill-opacity:1;stroke-width:4.80617;stroke-linecap:round;stroke-linejoin:round"
+         id="path1077" />
+      <path
+         d="M 42.435803,1.5260198 A 15.616504,18.019043 0 0 1 55.92193,19.37848 v 12.012696 h 2.402539 V 19.472329 c 5.9e-5,-0.02658 5.9e-5,-0.05318 0,-0.07978 v -0.01408 C 58.317327,10.146637 51.372355,2.560475 42.435803,1.5260198 Z"
+         style="fill:#c8c8c8;fill-opacity:1;stroke-width:5.75419;stroke-linecap:round;stroke-linejoin:round"
+         id="path1091" />
+      <rect
+         y="31.391176"
+         x="16.280035"
+         height="42.044434"
+         width="48.050781"
+         id="rect1043"
+         style="fill:#838383;fill-opacity:1;stroke-width:5.14527;stroke-linecap:round;stroke-linejoin:round" />
+      <rect
+         y="31.405212"
+         x="52.318119"
+         height="42.044434"
+         width="12.012695"
+         id="rect1111-2"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:20.8333px;font-family:Syncopate;-inkscape-font-specification:Syncopate;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect878);fill:#686868;fill-opacity:1;stroke:none;stroke-width:2.57263;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="czcc"
+         id="path1107"
+         d="m 16.280035,73.435609 c 0,0 0,-2.402539 24.025391,-2.402539 24.025391,0 24.025391,2.402539 24.025391,2.402539 z"
+         style="fill:#2d2d2d;fill-opacity:1;stroke-width:4.80508;stroke-linecap:round;stroke-linejoin:round" />
+      <path
+         style="fill:#a6a6a2;fill-opacity:1;stroke-width:4.80508;stroke-linecap:round;stroke-linejoin:round"
+         d="m 16.280035,31.391176 c 0,0 0,2.402539 24.025391,2.402539 24.025391,0 24.025391,-2.402539 24.025391,-2.402539 z"
+         id="path1109"
+         sodipodi:nodetypes="czcc" />
+      <path
+         style="fill:#e54d33;fill-opacity:1;stroke-width:4;stroke-linecap:round;stroke-linejoin:round"
+         d="m 4.280035,9.437961 8,-8 64,64 -8,8 z"
+         id="path7587"
+         sodipodi:nodetypes="ccccc" />
+    </g>
+  </g>
+</svg>
diff --git a/data/elementary/themes/img/bt-lock-device-on.svg b/data/elementary/themes/img/bt-lock-device-on.svg
new file mode 100644
index 0000000000..430b682bad
--- /dev/null
+++ b/data/elementary/themes/img/bt-lock-device-on.svg
@@ -0,0 +1,177 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:export-ydpi="48"
+   inkscape:export-xdpi="48"
+   inkscape:export-filename="/home/raster/C/th-efl/th/img/ic/lang-lock-040.png"
+   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)"
+   sodipodi:docname="bt-lock-device-on.svg"
+   viewBox="0 0 80 80"
+   height="80"
+   width="80"
+   id="svg2"
+   version="1.1">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6">
+    <rect
+       id="rect878"
+       height="30"
+       width="40"
+       y="20"
+       x="20" />
+    <rect
+       id="rect872"
+       height="30"
+       width="40"
+       y="50"
+       x="20" />
+    <rect
+       id="rect864"
+       height="30"
+       width="40"
+       y="20"
+       x="20" />
+    <rect
+       id="rect858"
+       height="30"
+       width="40"
+       y="20"
+       x="20" />
+    <rect
+       id="rect852"
+       height="30"
+       width="40"
+       y="20"
+       x="20" />
+  </defs>
+  <sodipodi:namedview
+     inkscape:snap-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox="true"
+     showguides="false"
+     inkscape:current-layer="text876"
+     inkscape:window-maximized="0"
+     inkscape:window-y="0"
+     inkscape:window-x="804"
+     inkscape:cy="40.240385"
+     inkscape:cx="40"
+     inkscape:zoom="10.4"
+     showgrid="true"
+     id="namedview4"
+     inkscape:window-height="1372"
+     inkscape:window-width="1756"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#404040"
+     inkscape:document-rotation="0">
+    <inkscape:grid
+       id="grid837"
+       type="xygrid"
+       empspacing="4" />
+  </sodipodi:namedview>
+  <g
+     id="g10"
+     inkscape:label="Image"
+     inkscape:groupmode="layer">
+    <text
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;line-height:120px;font-family:Quicksand;-inkscape-font-specification:Quicksand;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect852);fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
+       id="text850"
+       xml:space="preserve" />
+    <text
+       style="font-style:normal;font-weight:normal;font-size:28px;line-height:140px;font-family:Sans;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect858);fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
+       id="text856"
+       xml:space="preserve"><tspan
+         style="visibility:hidden"
+         x="20"
+         y="127.27344"><tspan
+           dx="0 28 28 26.605469 17.814453 26.605469 23.460938 23.460938 23.460938 17.814453 17.814453 17.814453"
+           style="font-size:28px">@@%$%^^^4445</tspan></tspan></text>
+    <text
+       style="font-style:normal;font-weight:normal;font-size:24px;line-height:120px;font-family:Sans;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect864);fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
+       id="text862"
+       xml:space="preserve"><tspan
+         style="visibility:hidden"
+         x="20"
+         y="117.27344"><tspan
+           dx="0 17.814453 17.814453 28"
+           style="font-size:28px">22@!</tspan></tspan></text>
+    <text
+       style="fill:black;stroke:none;stroke-opacity:1;stroke-width:1px;stroke-linejoin:miter;stroke-linecap:butt;fill-opacity:1;font-family:Sans;font-style:normal;font-weight:normal;font-size:5px;line-height:25px;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect872);"
+       id="text870"
+       xml:space="preserve" />
+    <g
+       transform="translate(-0.280035,2.562039)"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:20.8333px;font-family:Syncopate;-inkscape-font-specification:Syncopate;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect878);fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="text876"
+       aria-label="!@#?">
+      <path
+         sodipodi:nodetypes="cccccccscccccsccc"
+         d="M 40.244424,1.3875927 C 30.462828,1.4487253 22.526999,9.3386744 22.389618,19.139165 h -0.07038 v 12.252011 h 5.973496 V 19.37848 C 28.422823,12.848631 33.750833,7.3797966 40.281964,7.365785 h 0.02346 c 6.634428,0 12.012695,5.378267 12.012695,12.012695 v 12.012696 h 6.006348 V 19.472329 c 5.9e-5,-0.02658 5.9e-5,-0.05318 0,-0.07978 v -0.01408 c -0.0077,-9.9387704 -8.050936,-17.9915 -17.969771,-17.9908813 -0.03676,-1.129e-4 -0.07352,-1.129e-4 -0.110276,0 z"
+         style="fill:#ffffff;fill-opacity:1;stroke-width:5.75419;stroke-linecap:round;stroke-linejoin:round"
+         id="circle1049" />
+      <path
+         d="m 40.274925,7.365785 a 14.415234,12.012695 0 0 0 -14.384733,12.012695 14.415234,12.012695 0 0 0 0,0.0258 v 11.986892 h 2.402539 V 26.01831 19.37848 C 28.422777,12.850997 33.747033,7.3837416 40.274925,7.365785 Z"
+         style="fill:#c8c8c8;fill-opacity:1;stroke-width:4.80617;stroke-linecap:round;stroke-linejoin:round"
+         id="path1077" />
+      <path
+         d="M 42.435803,1.5260198 A 15.616504,18.019043 0 0 1 55.92193,19.37848 v 12.012696 h 2.402539 V 19.472329 c 5.9e-5,-0.02658 5.9e-5,-0.05318 0,-0.07978 v -0.01408 C 58.317327,10.146637 51.372355,2.560475 42.435803,1.5260198 Z"
+         style="fill:#c8c8c8;fill-opacity:1;stroke-width:5.75419;stroke-linecap:round;stroke-linejoin:round"
+         id="path1091" />
+      <rect
+         y="31.391176"
+         x="16.280035"
+         height="42.044434"
+         width="48.050781"
+         id="rect1043"
+         style="fill:#dec86e;fill-opacity:1;stroke-width:5.14527;stroke-linecap:round;stroke-linejoin:round" />
+      <rect
+         style="fill:#eec944;fill-opacity:1;stroke-width:2.57263;stroke-linecap:round;stroke-linejoin:round"
+         id="rect1111"
+         width="12.012695"
+         height="42.044434"
+         x="52.318119"
+         y="31.391176" />
+      <rect
+         y="31.405212"
+         x="52.318119"
+         height="42.044434"
+         width="12.012695"
+         id="rect1111-2"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:20.8333px;font-family:Syncopate;-inkscape-font-specification:Syncopate;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect878);fill:#000000;fill-opacity:0.12041;stroke:none;stroke-width:2.57263;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="czcc"
+         id="path1107"
+         d="m 16.280035,73.435609 c 0,0 0,-2.402539 24.025391,-2.402539 24.025391,0 24.025391,2.402539 24.025391,2.402539 z"
+         style="fill:#a28a25;fill-opacity:1;stroke-width:4.80508;stroke-linecap:round;stroke-linejoin:round" />
+      <path
+         style="fill:#efe3b5;fill-opacity:1;stroke-width:4.80508;stroke-linecap:round;stroke-linejoin:round"
+         d="m 16.280035,31.391176 c 0,0 0,2.402539 24.025391,2.402539 24.025391,0 24.025391,-2.402539 24.025391,-2.402539 z"
+         id="path1109"
+         sodipodi:nodetypes="czcc" />
+    </g>
+  </g>
+</svg>
diff --git a/data/elementary/themes/img/bt-pair-off.svg b/data/elementary/themes/img/bt-pair-off.svg
new file mode 100644
index 0000000000..fc6db5d349
--- /dev/null
+++ b/data/elementary/themes/img/bt-pair-off.svg
@@ -0,0 +1,183 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:export-ydpi="48"
+   inkscape:export-xdpi="48"
+   inkscape:export-filename="/home/raster/C/th-efl/th/img/ic/bt-pair-off-040.png"
+   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)"
+   sodipodi:docname="bt-pair-off.svg"
+   viewBox="0 0 80 80"
+   height="80"
+   width="80"
+   id="svg2"
+   version="1.1">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6">
+    <rect
+       id="rect878"
+       height="30"
+       width="40"
+       y="20"
+       x="20" />
+    <rect
+       id="rect872"
+       height="30"
+       width="40"
+       y="50"
+       x="20" />
+    <rect
+       id="rect864"
+       height="30"
+       width="40"
+       y="20"
+       x="20" />
+    <rect
+       id="rect858"
+       height="30"
+       width="40"
+       y="20"
+       x="20" />
+    <rect
+       id="rect852"
+       height="30"
+       width="40"
+       y="20"
+       x="20" />
+  </defs>
+  <sodipodi:namedview
+     inkscape:snap-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox="true"
+     showguides="false"
+     inkscape:current-layer="text876"
+     inkscape:window-maximized="0"
+     inkscape:window-y="0"
+     inkscape:window-x="804"
+     inkscape:cy="40.240385"
+     inkscape:cx="40"
+     inkscape:zoom="10.4"
+     showgrid="true"
+     id="namedview4"
+     inkscape:window-height="1372"
+     inkscape:window-width="1756"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#404040"
+     inkscape:document-rotation="0">
+    <inkscape:grid
+       id="grid837"
+       type="xygrid"
+       empspacing="4" />
+  </sodipodi:namedview>
+  <g
+     id="g10"
+     inkscape:label="Image"
+     inkscape:groupmode="layer">
+    <text
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;line-height:120px;font-family:Quicksand;-inkscape-font-specification:Quicksand;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect852);fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
+       id="text850"
+       xml:space="preserve" />
+    <text
+       style="font-style:normal;font-weight:normal;font-size:28px;line-height:140px;font-family:Sans;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect858);fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
+       id="text856"
+       xml:space="preserve"><tspan
+         style="visibility:hidden"
+         x="20"
+         y="127.27344"><tspan
+           dx="0 28 28 26.605469 17.814453 26.605469 23.460938 23.460938 23.460938 17.814453 17.814453 17.814453"
+           style="font-size:28px">@@%$%^^^4445</tspan></tspan></text>
+    <text
+       style="font-style:normal;font-weight:normal;font-size:24px;line-height:120px;font-family:Sans;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect864);fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
+       id="text862"
+       xml:space="preserve"><tspan
+         style="visibility:hidden"
+         x="20"
+         y="117.27344"><tspan
+           dx="0 17.814453 17.814453 28"
+           style="font-size:28px">22@!</tspan></tspan></text>
+    <text
+       style="fill:black;stroke:none;stroke-opacity:1;stroke-width:1px;stroke-linejoin:miter;stroke-linecap:butt;fill-opacity:1;font-family:Sans;font-style:normal;font-weight:normal;font-size:5px;line-height:25px;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect872);"
+       id="text870"
+       xml:space="preserve" />
+    <g
+       transform="translate(-0.280035,2.562039)"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:20.8333px;font-family:Syncopate;-inkscape-font-specification:Syncopate;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect878);fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="text876"
+       aria-label="!@#?">
+      <path
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:20.8333px;font-family:Syncopate;-inkscape-font-specification:Syncopate;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect878);fill:#81adc6;fill-opacity:1;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+         d="m 4.280035,61.437961 12,12 12,-12 -12,-12 z"
+         id="path7615"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:20.8333px;font-family:Syncopate;-inkscape-font-specification:Syncopate;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect878);fill:#ffea81;fill-opacity:1;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+         d="m 16.280035,41.437961 20,20 8,-8 -20,-20 z"
+         id="path7611"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:20.8333px;font-family:Syncopate;-inkscape-font-specification:Syncopate;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect878);fill:#d8b15d;fill-opacity:1;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+         d="m 16.280035,49.437961 12,12 h 8 l -20,-20 z"
+         id="path7613"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:20.8333px;font-family:Syncopate;-inkscape-font-specification:Syncopate;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect878);fill:#ffffff;fill-opacity:0.5;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+         d="m 6.280035,63.437961 2,2 12,-12 2,-6 8,-8 -3,-3 -8,8 -1,7 z"
+         id="path7617"
+         sodipodi:nodetypes="ccccccccc" />
+      <path
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:20.8333px;font-family:Syncopate;-inkscape-font-specification:Syncopate;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect878);fill:#000000;fill-opacity:0.25;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+         d="m 16.280035,73.437961 -3,-3 12,-12 5,-3 8,-8 6,6 -8,8 h -8 z"
+         id="path7619"
+         sodipodi:nodetypes="ccccccccc" />
+      <path
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:20.8333px;font-family:Syncopate;-inkscape-font-specification:Syncopate;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect878);fill:#81adc6;fill-opacity:1;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+         d="m 64.280035,1.4379612 12,11.9999998 -12,12 -12,-12 z"
+         id="path8978"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:20.8333px;font-family:Syncopate;-inkscape-font-specification:Syncopate;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect878);fill:#ffea81;fill-opacity:1;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+         d="m 44.280035,13.437961 20,20 -8,8 -20,-20 z"
+         id="path8980"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:20.8333px;font-family:Syncopate;-inkscape-font-specification:Syncopate;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect878);fill:#d8b15d;fill-opacity:1;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+         d="m 52.280035,13.437961 12,12 v 8 l -20,-20 z"
+         id="path8982"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:20.8333px;font-family:Syncopate;-inkscape-font-specification:Syncopate;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect878);fill:#ffffff;fill-opacity:0.5;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+         d="m 66.280035,3.4379611 2,1.9999999 -12,12 -6,2 -8,8 -3,-3 8,-8 7,-1 z"
+         id="path8984"
+         sodipodi:nodetypes="ccccccccc" />
+      <path
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:20.8333px;font-family:Syncopate;-inkscape-font-specification:Syncopate;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect878);fill:#000000;fill-opacity:0.25;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+         d="m 76.280035,13.437961 -3,-3 -12,12 -3,5 -8,8 6,6 8,-8 v -8 z"
+         id="path8986"
+         sodipodi:nodetypes="ccccccccc" />
+    </g>
+  </g>
+</svg>
diff --git a/data/elementary/themes/img/bt-pair-on.svg b/data/elementary/themes/img/bt-pair-on.svg
new file mode 100644
index 0000000000..3cf1682679
--- /dev/null
+++ b/data/elementary/themes/img/bt-pair-on.svg
@@ -0,0 +1,187 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:export-ydpi="48"
+   inkscape:export-xdpi="48"
+   inkscape:export-filename="/home/raster/C/th-efl/th/img/ic/bt-pair-on-040.png"
+   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)"
+   sodipodi:docname="bt-pair-on.svg"
+   viewBox="0 0 80 80"
+   height="80"
+   width="80"
+   id="svg2"
+   version="1.1">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6">
+    <rect
+       id="rect878"
+       height="30"
+       width="40"
+       y="20"
+       x="20" />
+    <rect
+       id="rect872"
+       height="30"
+       width="40"
+       y="50"
+       x="20" />
+    <rect
+       id="rect864"
+       height="30"
+       width="40"
+       y="20"
+       x="20" />
+    <rect
+       id="rect858"
+       height="30"
+       width="40"
+       y="20"
+       x="20" />
+    <rect
+       id="rect852"
+       height="30"
+       width="40"
+       y="20"
+       x="20" />
+  </defs>
+  <sodipodi:namedview
+     inkscape:snap-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox="true"
+     showguides="false"
+     inkscape:current-layer="text876"
+     inkscape:window-maximized="0"
+     inkscape:window-y="0"
+     inkscape:window-x="804"
+     inkscape:cy="40.240385"
+     inkscape:cx="40"
+     inkscape:zoom="10.4"
+     showgrid="true"
+     id="namedview4"
+     inkscape:window-height="1372"
+     inkscape:window-width="1756"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#404040"
+     inkscape:document-rotation="0">
+    <inkscape:grid
+       id="grid837"
+       type="xygrid"
+       empspacing="4" />
+  </sodipodi:namedview>
+  <g
+     id="g10"
+     inkscape:label="Image"
+     inkscape:groupmode="layer">
+    <text
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;line-height:120px;font-family:Quicksand;-inkscape-font-specification:Quicksand;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect852);fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
+       id="text850"
+       xml:space="preserve" />
+    <text
+       style="font-style:normal;font-weight:normal;font-size:28px;line-height:140px;font-family:Sans;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect858);fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
+       id="text856"
+       xml:space="preserve"><tspan
+         style="visibility:hidden"
+         x="20"
+         y="127.27344"><tspan
+           dx="0 28 28 26.605469 17.814453 26.605469 23.460938 23.460938 23.460938 17.814453 17.814453 17.814453"
+           style="font-size:28px">@@%$%^^^4445</tspan></tspan></text>
+    <text
+       style="font-style:normal;font-weight:normal;font-size:24px;line-height:120px;font-family:Sans;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect864);fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"
+       id="text862"
+       xml:space="preserve"><tspan
+         style="visibility:hidden"
+         x="20"
+         y="117.27344"><tspan
+           dx="0 17.814453 17.814453 28"
+           style="font-size:28px">22@!</tspan></tspan></text>
+    <text
+       style="fill:black;stroke:none;stroke-opacity:1;stroke-width:1px;stroke-linejoin:miter;stroke-linecap:butt;fill-opacity:1;font-family:Sans;font-style:normal;font-weight:normal;font-size:5px;line-height:25px;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect872);"
+       id="text870"
+       xml:space="preserve" />
+    <g
+       transform="translate(-0.280035,2.562039)"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:20.8333px;font-family:Syncopate;-inkscape-font-specification:Syncopate;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect878);fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="text876"
+       aria-label="!@#?">
+      <path
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:20.8333px;font-family:Syncopate;-inkscape-font-specification:Syncopate;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect878);fill:#81adc6;fill-opacity:1;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+         d="m 4.280035,61.437961 12,12 18,-18 -12,-12 z"
+         id="path7615"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:20.8333px;font-family:Syncopate;-inkscape-font-specification:Syncopate;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect878);fill:#ffea81;fill-opacity:1;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+         d="m 22.280035,35.437961 20,20 8,-8 -20,-20 z"
+         id="path7611"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:20.8333px;font-family:Syncopate;-inkscape-font-specification:Syncopate;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect878);fill:#d8b15d;fill-opacity:1;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+         d="m 22.280035,43.437961 12,12 h 8 l -20,-20 z"
+         id="path7613"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:20.8333px;font-family:Syncopate;-inkscape-font-specification:Syncopate;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect878);fill:#ffffff;fill-opacity:0.5;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+         d="m 6.280035,63.437961 2,2 18,-18 2,-6 8,-8 -3,-3 -8,8 -1,7 z"
+         id="path7617"
+         sodipodi:nodetypes="ccccccccc" />
+      <path
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:20.8333px;font-family:Syncopate;-inkscape-font-specification:Syncopate;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect878);fill:#000000;fill-opacity:0.25;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+         d="m 16.280035,73.437961 -3,-3 18,-18 5,-3 8,-8 6,6 -8,8 h -8 z"
+         id="path7619"
+         sodipodi:nodetypes="ccccccccc" />
+      <path
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:20.8333px;font-family:Syncopate;-inkscape-font-specification:Syncopate;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect878);fill:#81adc6;fill-opacity:1;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+         d="m 64.280035,1.4379612 12,11.9999998 -18,18 -12,-12 z"
+         id="path8978"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:20.8333px;font-family:Syncopate;-inkscape-font-specification:Syncopate;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect878);fill:#ffea81;fill-opacity:1;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+         d="m 38.280035,19.437961 20,20 -8,8 -20,-20 z"
+         id="path8980"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:20.8333px;font-family:Syncopate;-inkscape-font-specification:Syncopate;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect878);fill:#d8b15d;fill-opacity:1;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+         d="m 46.280035,19.437961 12,12 v 8 l -20,-20 z"
+         id="path8982"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:20.8333px;font-family:Syncopate;-inkscape-font-specification:Syncopate;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect878);fill:#ffffff;fill-opacity:0.5;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+         d="m 66.280035,3.437961 2,1.9999999 -18,18.0000001 -6,2 -8,8 -3,-3 8,-8 7,-1 z"
+         id="path8984"
+         sodipodi:nodetypes="ccccccccc" />
+      <path
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:20px;line-height:20.8333px;font-family:Syncopate;-inkscape-font-specification:Syncopate;letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect878);fill:#000000;fill-opacity:0.25;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+         d="m 76.280035,13.437961 -3,-3 -18,18 -3,5 -8,8 6,6 8,-8 v -8 z"
+         id="path8986"
+         sodipodi:nodetypes="ccccccccc" />
+      <path
+         style="fill:#000000;fill-opacity:0.2;stroke:none;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 29.280035,28.437961 2,-2 20,20 -2,2 z"
+         id="path9052" />
+    </g>
+  </g>
+</svg>
diff --git a/data/elementary/themes/img/cell-3g.svg b/data/elementary/themes/img/cell-3g.svg
new file mode 100644
index 0000000000..ae2469efb5
--- /dev/null
+++ b/data/elementary/themes/img/cell-3g.svg
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="svg2"
+   width="15"
+   height="15"
+   viewBox="0 0 15 15"
+   sodipodi:docname="cell-3g.svg"
+   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)"
+   inkscape:export-filename="/home/raster/C/th-efl/th/img/ic/cell-3g-015.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6" />
+  <sodipodi:namedview
+     inkscape:document-rotation="0"
+     pagecolor="#404040"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     id="namedview4"
+     showgrid="true"
+     inkscape:zoom="55.933333"
+     inkscape:cx="7.5"
+     inkscape:cy="7.5"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g10"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="false"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="false"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:snap-smooth-nodes="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid837"
+       spacingx="0.5"
+       spacingy="0.5" />
+  </sodipodi:namedview>
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="Image"
+     id="g10">
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 2.5,3.5 H 4 c 1,0 2,1 2,2 0,1 -1,2 -2,2 H 3"
+       id="path1886"
+       sodipodi:nodetypes="cczcc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 13,3.5 c -2,0 -4,2 -4,4 0,2 1,4 3,4 v -4 h -1.5"
+       id="path1888"
+       sodipodi:nodetypes="czccc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 3,7.5 h 1 c 1,0 2,1 2,2 0,1 -1,2 -2,2 H 2.5"
+       id="path1890"
+       sodipodi:nodetypes="cczcc" />
+  </g>
+</svg>
diff --git a/data/elementary/themes/img/cell-4g.svg b/data/elementary/themes/img/cell-4g.svg
new file mode 100644
index 0000000000..977ffc115f
--- /dev/null
+++ b/data/elementary/themes/img/cell-4g.svg
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="svg2"
+   width="15"
+   height="15"
+   viewBox="0 0 15 15"
+   sodipodi:docname="cell-4g.svg"
+   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)"
+   inkscape:export-filename="/home/raster/C/th-efl/th/img/ic/cell-4g-015.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6" />
+  <sodipodi:namedview
+     inkscape:document-rotation="0"
+     pagecolor="#404040"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     id="namedview4"
+     showgrid="true"
+     inkscape:zoom="55.933333"
+     inkscape:cx="7.5"
+     inkscape:cy="7.5"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g10"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="false"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="false"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:snap-smooth-nodes="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid837"
+       spacingx="0.5"
+       spacingy="0.5" />
+  </sodipodi:namedview>
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="Image"
+     id="g10">
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 13,3.5 c -2,0 -4,2 -4,4 0,2 1,4 3,4 v -4 h -1.5"
+       id="path1888"
+       sodipodi:nodetypes="czccc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 6,12.5 v -9 l -3,6 h 4"
+       id="path1910"
+       sodipodi:nodetypes="cccc" />
+  </g>
+</svg>
diff --git a/data/elementary/themes/img/cell-antenna.svg b/data/elementary/themes/img/cell-antenna.svg
new file mode 100644
index 0000000000..6b2c0e5b1a
--- /dev/null
+++ b/data/elementary/themes/img/cell-antenna.svg
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="svg2"
+   width="15"
+   height="15"
+   viewBox="0 0 15 15"
+   sodipodi:docname="cell-antenna.svg"
+   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)"
+   inkscape:export-filename="/home/raster/C/th-efl/th/img/ic/cell-antenna-015.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6" />
+  <sodipodi:namedview
+     inkscape:document-rotation="0"
+     pagecolor="#404040"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     id="namedview4"
+     showgrid="true"
+     inkscape:zoom="55.933333"
+     inkscape:cx="7.5"
+     inkscape:cy="7.5"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g10"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="false"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="false"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:snap-smooth-nodes="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid837"
+       spacingx="0.5"
+       spacingy="0.5" />
+  </sodipodi:namedview>
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="Image"
+     id="g10">
+    <path
+       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 4.5,2 h 6 l -2,2 v 9 h -2 V 4 Z"
+       id="path1791"
+       sodipodi:nodetypes="ccccccc" />
+  </g>
+</svg>
diff --git a/data/elementary/themes/img/cell-edge.svg b/data/elementary/themes/img/cell-edge.svg
new file mode 100644
index 0000000000..00de8654cf
--- /dev/null
+++ b/data/elementary/themes/img/cell-edge.svg
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="svg2"
+   width="15"
+   height="15"
+   viewBox="0 0 15 15"
+   sodipodi:docname="cell-edge.svg"
+   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)"
+   inkscape:export-filename="/home/raster/C/th-efl/th/img/ic/cell-edge-015.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6" />
+  <sodipodi:namedview
+     inkscape:document-rotation="0"
+     pagecolor="#404040"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     id="namedview4"
+     showgrid="true"
+     inkscape:zoom="55.933333"
+     inkscape:cx="6.0697259"
+     inkscape:cy="7.5"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g10"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="false"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="false"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:snap-smooth-nodes="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid837"
+       spacingx="0.5"
+       spacingy="0.5" />
+  </sodipodi:namedview>
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="Image"
+     id="g10">
+    <rect
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect1860"
+       width="3"
+       height="11"
+       x="3"
+       y="2" />
+    <rect
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2.62342;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect1862"
+       width="6.5"
+       height="3"
+       x="5.5"
+       y="2" />
+    <rect
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2.62342;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect1864"
+       width="6.5"
+       height="3"
+       x="5.5"
+       y="10" />
+    <rect
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2.05799;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect1866"
+       width="4"
+       height="3"
+       x="5.5"
+       y="6" />
+  </g>
+</svg>
diff --git a/data/elementary/themes/img/cell-gprs.svg b/data/elementary/themes/img/cell-gprs.svg
new file mode 100644
index 0000000000..22a8c1efc6
--- /dev/null
+++ b/data/elementary/themes/img/cell-gprs.svg
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="svg2"
+   width="15"
+   height="15"
+   viewBox="0 0 15 15"
+   sodipodi:docname="cell-gprs.svg"
+   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)"
+   inkscape:export-filename="/home/raster/C/th-efl/th/img/ic/cell-gprs-015.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6" />
+  <sodipodi:namedview
+     inkscape:document-rotation="0"
+     pagecolor="#404040"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     id="namedview4"
+     showgrid="true"
+     inkscape:zoom="55.933333"
+     inkscape:cx="6.0697259"
+     inkscape:cy="7.5"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g10"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="false"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="false"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:snap-smooth-nodes="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid837"
+       spacingx="0.5"
+       spacingy="0.5" />
+  </sodipodi:namedview>
+  <g
+     inkscape:groupmode="layer"
+     inkscape:label="Image"
+     id="g10">
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"