diff --git a/assets/images/call_chat_unsecure_hovered.svg b/assets/images/call_chat_unsecure_hovered.svg
index 414fe3d76..bdc687c6e 100644
--- a/assets/images/call_chat_unsecure_hovered.svg
+++ b/assets/images/call_chat_unsecure_hovered.svg
@@ -7,8 +7,8 @@
     <g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="chat_unsecure@x2">
             <g id="Group-2" transform="translate(0.000000, 0.180000)">
-                <rect id="Rectangle-4" fill="#FF0000" x="0" y="7.13541656" width="10" height="8.66666667"></rect>
-                <path d="M7.74999979,3.88630432 C7.74999979,2.19283123 6.44882738,0.820000052 4.84374987,0.820000052 C3.23867236,0.820000052 1.93749995,2.19283123 1.93749995,3.88630432 L1.93749995,11.8085172" id="Oval-6" stroke="#FF0000" stroke-width="2"></path>
+                <rect id="Rectangle-4" class="color-error-fill" fill="#FF0000" x="0" y="7.13541656" width="10" height="8.66666667"></rect>
+                <path d="M7.74999979,3.88630432 C7.74999979,2.19283123 6.44882738,0.820000052 4.84374987,0.820000052 C3.23867236,0.820000052 1.93749995,2.19283123 1.93749995,3.88630432 L1.93749995,11.8085172" id="Oval-6" class="color-error-stroke" stroke="#FF0000" stroke-width="2"></path>
             </g>
         </g>
     </g>
diff --git a/assets/images/call_chat_unsecure_normal.svg b/assets/images/call_chat_unsecure_normal.svg
index 414fe3d76..bdc687c6e 100644
--- a/assets/images/call_chat_unsecure_normal.svg
+++ b/assets/images/call_chat_unsecure_normal.svg
@@ -7,8 +7,8 @@
     <g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="chat_unsecure@x2">
             <g id="Group-2" transform="translate(0.000000, 0.180000)">
-                <rect id="Rectangle-4" fill="#FF0000" x="0" y="7.13541656" width="10" height="8.66666667"></rect>
-                <path d="M7.74999979,3.88630432 C7.74999979,2.19283123 6.44882738,0.820000052 4.84374987,0.820000052 C3.23867236,0.820000052 1.93749995,2.19283123 1.93749995,3.88630432 L1.93749995,11.8085172" id="Oval-6" stroke="#FF0000" stroke-width="2"></path>
+                <rect id="Rectangle-4" class="color-error-fill" fill="#FF0000" x="0" y="7.13541656" width="10" height="8.66666667"></rect>
+                <path d="M7.74999979,3.88630432 C7.74999979,2.19283123 6.44882738,0.820000052 4.84374987,0.820000052 C3.23867236,0.820000052 1.93749995,2.19283123 1.93749995,3.88630432 L1.93749995,11.8085172" id="Oval-6" class="color-error-stroke" stroke="#FF0000" stroke-width="2"></path>
             </g>
         </g>
     </g>
diff --git a/assets/images/call_chat_unsecure_pressed.svg b/assets/images/call_chat_unsecure_pressed.svg
index 414fe3d76..bdc687c6e 100644
--- a/assets/images/call_chat_unsecure_pressed.svg
+++ b/assets/images/call_chat_unsecure_pressed.svg
@@ -7,8 +7,8 @@
     <g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="chat_unsecure@x2">
             <g id="Group-2" transform="translate(0.000000, 0.180000)">
-                <rect id="Rectangle-4" fill="#FF0000" x="0" y="7.13541656" width="10" height="8.66666667"></rect>
-                <path d="M7.74999979,3.88630432 C7.74999979,2.19283123 6.44882738,0.820000052 4.84374987,0.820000052 C3.23867236,0.820000052 1.93749995,2.19283123 1.93749995,3.88630432 L1.93749995,11.8085172" id="Oval-6" stroke="#FF0000" stroke-width="2"></path>
+                <rect id="Rectangle-4" class="color-error-fill" fill="#FF0000" x="0" y="7.13541656" width="10" height="8.66666667"></rect>
+                <path d="M7.74999979,3.88630432 C7.74999979,2.19283123 6.44882738,0.820000052 4.84374987,0.820000052 C3.23867236,0.820000052 1.93749995,2.19283123 1.93749995,3.88630432 L1.93749995,11.8085172" id="Oval-6" class="color-error-stroke" stroke="#FF0000" stroke-width="2"></path>
             </g>
         </g>
     </g>
diff --git a/assets/images/declined_incoming_call.svg b/assets/images/declined_incoming_call.svg
index ee5fd365a..a3032a5bc 100644
--- a/assets/images/declined_incoming_call.svg
+++ b/assets/images/declined_incoming_call.svg
@@ -5,7 +5,7 @@
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round">
-        <g id="call_lost" stroke="#FF0000" stroke-width="2">
+        <g id="call_lost" class="color-error-stroke" stroke="#FF0000" stroke-width="2">
             <path d="M12.9852814,5.74407768 L-1.15685425,5.74407768" id="Line" transform="translate(6.266032, 5.768485) rotate(-45.000000) translate(-6.266032, -5.768485) "></path>
             <path d="M11,11 L1,1" id="Line"></path>
         </g>
diff --git a/assets/images/declined_outgoing_call.svg b/assets/images/declined_outgoing_call.svg
index ee5fd365a..a3032a5bc 100644
--- a/assets/images/declined_outgoing_call.svg
+++ b/assets/images/declined_outgoing_call.svg
@@ -5,7 +5,7 @@
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round">
-        <g id="call_lost" stroke="#FF0000" stroke-width="2">
+        <g id="call_lost" class="color-error-stroke" stroke="#FF0000" stroke-width="2">
             <path d="M12.9852814,5.74407768 L-1.15685425,5.74407768" id="Line" transform="translate(6.266032, 5.768485) rotate(-45.000000) translate(-6.266032, -5.768485) "></path>
             <path d="M11,11 L1,1" id="Line"></path>
         </g>
diff --git a/assets/images/generic_error.svg b/assets/images/generic_error.svg
index 1a9838722..bb5964668 100644
--- a/assets/images/generic_error.svg
+++ b/assets/images/generic_error.svg
@@ -6,7 +6,7 @@
     <defs></defs>
     <g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="chat_error">
-            <polygon id="Path-1067" fill="#FF0000" points="6.05012213 3.64153152e-14 0 10 12 10"></polygon>
+            <polygon id="Path-1067" class="color-error-fill" fill="#FF0000" points="6.05012213 3.64153152e-14 0 10 12 10"></polygon>
             <path d="M6,6 L6,3.5" id="chat_message_delivered-copy-4" stroke="#FFFFFF" stroke-width="1.4" stroke-linecap="round" stroke-linejoin="round"></path>
             <ellipse id="Oval-24" fill="#FFFFFF" cx="6.03499979" cy="8.13500017" rx="0.834999979" ry="0.834999979"></ellipse>
         </g>
diff --git a/assets/images/generic_error_hovered.svg b/assets/images/generic_error_hovered.svg
index 1a9838722..bb5964668 100644
--- a/assets/images/generic_error_hovered.svg
+++ b/assets/images/generic_error_hovered.svg
@@ -6,7 +6,7 @@
     <defs></defs>
     <g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="chat_error">
-            <polygon id="Path-1067" fill="#FF0000" points="6.05012213 3.64153152e-14 0 10 12 10"></polygon>
+            <polygon id="Path-1067" class="color-error-fill" fill="#FF0000" points="6.05012213 3.64153152e-14 0 10 12 10"></polygon>
             <path d="M6,6 L6,3.5" id="chat_message_delivered-copy-4" stroke="#FFFFFF" stroke-width="1.4" stroke-linecap="round" stroke-linejoin="round"></path>
             <ellipse id="Oval-24" fill="#FFFFFF" cx="6.03499979" cy="8.13500017" rx="0.834999979" ry="0.834999979"></ellipse>
         </g>
diff --git a/assets/images/generic_error_normal.svg b/assets/images/generic_error_normal.svg
index 1a9838722..bb5964668 100644
--- a/assets/images/generic_error_normal.svg
+++ b/assets/images/generic_error_normal.svg
@@ -6,7 +6,7 @@
     <defs></defs>
     <g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="chat_error">
-            <polygon id="Path-1067" fill="#FF0000" points="6.05012213 3.64153152e-14 0 10 12 10"></polygon>
+            <polygon id="Path-1067" class="color-error-fill" fill="#FF0000" points="6.05012213 3.64153152e-14 0 10 12 10"></polygon>
             <path d="M6,6 L6,3.5" id="chat_message_delivered-copy-4" stroke="#FFFFFF" stroke-width="1.4" stroke-linecap="round" stroke-linejoin="round"></path>
             <ellipse id="Oval-24" fill="#FFFFFF" cx="6.03499979" cy="8.13500017" rx="0.834999979" ry="0.834999979"></ellipse>
         </g>
diff --git a/assets/images/generic_error_pressed.svg b/assets/images/generic_error_pressed.svg
index 1a9838722..bb5964668 100644
--- a/assets/images/generic_error_pressed.svg
+++ b/assets/images/generic_error_pressed.svg
@@ -6,7 +6,7 @@
     <defs></defs>
     <g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="chat_error">
-            <polygon id="Path-1067" fill="#FF0000" points="6.05012213 3.64153152e-14 0 10 12 10"></polygon>
+            <polygon id="Path-1067" class="color-error-fill" fill="#FF0000" points="6.05012213 3.64153152e-14 0 10 12 10"></polygon>
             <path d="M6,6 L6,3.5" id="chat_message_delivered-copy-4" stroke="#FFFFFF" stroke-width="1.4" stroke-linecap="round" stroke-linejoin="round"></path>
             <ellipse id="Oval-24" fill="#FFFFFF" cx="6.03499979" cy="8.13500017" rx="0.834999979" ry="0.834999979"></ellipse>
         </g>
diff --git a/assets/images/missed_incoming_call.svg b/assets/images/missed_incoming_call.svg
index ee5fd365a..a3032a5bc 100644
--- a/assets/images/missed_incoming_call.svg
+++ b/assets/images/missed_incoming_call.svg
@@ -5,7 +5,7 @@
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round">
-        <g id="call_lost" stroke="#FF0000" stroke-width="2">
+        <g id="call_lost" class="color-error-stroke" stroke="#FF0000" stroke-width="2">
             <path d="M12.9852814,5.74407768 L-1.15685425,5.74407768" id="Line" transform="translate(6.266032, 5.768485) rotate(-45.000000) translate(-6.266032, -5.768485) "></path>
             <path d="M11,11 L1,1" id="Line"></path>
         </g>
diff --git a/assets/images/missed_outgoing_call.svg b/assets/images/missed_outgoing_call.svg
index ee5fd365a..a3032a5bc 100644
--- a/assets/images/missed_outgoing_call.svg
+++ b/assets/images/missed_outgoing_call.svg
@@ -5,7 +5,7 @@
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round">
-        <g id="call_lost" stroke="#FF0000" stroke-width="2">
+        <g id="call_lost" class="color-error-stroke" stroke="#FF0000" stroke-width="2">
             <path d="M12.9852814,5.74407768 L-1.15685425,5.74407768" id="Line" transform="translate(6.266032, 5.768485) rotate(-45.000000) translate(-6.266032, -5.768485) "></path>
             <path d="M11,11 L1,1" id="Line"></path>
         </g>