diff --git a/res/css/views/rooms/_E2EIcon.scss b/res/css/views/rooms/_E2EIcon.scss
index cacbad6693..ac47e3aedf 100644
--- a/res/css/views/rooms/_E2EIcon.scss
+++ b/res/css/views/rooms/_E2EIcon.scss
@@ -70,7 +70,7 @@ limitations under the License.
 
 .mx_E2EIcon_normal::after {
     mask-image: url('$(res)/img/e2e/normal.svg');
-    background-color: #020202; // TODO theme this
+    background-color: $composer-e2e-icon-color;
 }
 
 .mx_E2EIcon_verified::after {
diff --git a/res/css/views/rooms/_EventTile.scss b/res/css/views/rooms/_EventTile.scss
index 00782c58fe..6e2dc17727 100644
--- a/res/css/views/rooms/_EventTile.scss
+++ b/res/css/views/rooms/_EventTile.scss
@@ -391,7 +391,7 @@ $left-gutter: 64px;
 .mx_EventTile_e2eIcon_unauthenticated {
     &::after {
         mask-image: url('$(res)/img/e2e/normal.svg');
-        background-color: #020202; // TODO theme this
+        background-color: $composer-e2e-icon-color;
     }
     opacity: 1;
 }
diff --git a/res/themes/dark/css/_dark.scss b/res/themes/dark/css/_dark.scss
index bc133c2756..a6a85edfe1 100644
--- a/res/themes/dark/css/_dark.scss
+++ b/res/themes/dark/css/_dark.scss
@@ -103,6 +103,7 @@ $roomtopic-color: $text-secondary-color;
 $eventtile-meta-color: $roomtopic-color;
 
 $header-divider-color: $header-panel-text-primary-color;
+$composer-e2e-icon-color: $header-panel-text-primary-color;
 
 // ********************
 
diff --git a/res/themes/element-dark/css/_element-dark.scss b/res/themes/element-dark/css/_element-dark.scss
index 43a6c0ecec..9ae3548c67 100644
--- a/res/themes/element-dark/css/_element-dark.scss
+++ b/res/themes/element-dark/css/_element-dark.scss
@@ -104,6 +104,7 @@ $roomtopic-color: $text-secondary-color;
 $eventtile-meta-color: $roomtopic-color;
 
 $header-divider-color: $header-panel-text-primary-color;
+$composer-e2e-icon-color: $header-panel-text-primary-color;
 
 // ********************
 
diff --git a/res/themes/element/css/_element.scss b/res/themes/element/css/_element.scss
index 0703176dab..b61172cb31 100644
--- a/res/themes/element/css/_element.scss
+++ b/res/themes/element/css/_element.scss
@@ -169,7 +169,7 @@ $composer-button-color: #91A1C0;
 $roomtopic-color: #9e9e9e;
 $eventtile-meta-color: $roomtopic-color;
 
-$composer-e2e-icon-color: #c9ced6;
+$composer-e2e-icon-color: #91A1C0;
 $header-divider-color: #91A1C0;
 
 // ********************
diff --git a/res/themes/light/css/_light.scss b/res/themes/light/css/_light.scss
index 9ce2c9a980..991abdefff 100644
--- a/res/themes/light/css/_light.scss
+++ b/res/themes/light/css/_light.scss
@@ -169,7 +169,7 @@ $composer-button-color: #91a1c0;
 $roomtopic-color: #9e9e9e;
 $eventtile-meta-color: $roomtopic-color;
 
-$composer-e2e-icon-color: #c9ced6;
+$composer-e2e-icon-color: #91a1c0;
 $header-divider-color: #91a1c0;
 
 // ********************