diff --git a/gajim/conversation_textview.py b/gajim/conversation_textview.py
index 92856a81b..55b4c5648 100644
--- a/gajim/conversation_textview.py
+++ b/gajim/conversation_textview.py
@@ -1285,12 +1285,12 @@ class ConversationTextview(GObject.GObject):
             # Message was not encrypted
             if not self.encryption_enabled:
                 return
-            icon = 'security-low-symbolic'
-            color = 'error-color'
+            icon = 'channel-insecure-symbolic'
+            color = 'unencrypted-color'
             tooltip = _('Not encrypted')
         else:
-            icon = 'security-high-symbolic'
-            color = 'success-color'
+            icon = 'channel-secure-symbolic'
+            color = 'encrypted-color'
             name, fingerprint = details
             if fingerprint is None:
                 tooltip = name
diff --git a/gajim/data/style/gajim.css b/gajim/data/style/gajim.css
index 1b4c295ed..e79fe5559 100644
--- a/gajim/data/style/gajim.css
+++ b/gajim/data/style/gajim.css
@@ -215,6 +215,10 @@ button.flat.link { padding: 0; border: 0; }
 .error-color { color: @error_color; }
 .warning-color { color: @warning_color; }
 
+/*Encryption*/
+.encrypted-color { color: rgb(75, 181, 67) }
+.unencrypted-color { color: @error_color }
+
 /*Dataforms*/
 .field-fixed { font-size: 16px; font-weight: bold; padding-top:5px;}
 .data-form-title { font-size: 16px; font-weight: bold; }