diff --git a/src/main/res/layout/account_row.xml b/src/main/res/layout/account_row.xml
index 2a0a0f71958e68d0161b22444a82ba2ff0f396ff..010bbd4be7181ad82fd59ddf54e05270c9d4552f 100644
--- a/src/main/res/layout/account_row.xml
+++ b/src/main/res/layout/account_row.xml
@@ -16,6 +16,7 @@
             android:layout_height="48dp"
             android:layout_alignParentLeft="true"
             android:contentDescription="@string/account_image_description"
+            app:strokeColor="@color/custom_theme_accent"
             app:shapeAppearance="@style/ShapeAppearanceOverlay.Photo" />
 
         <LinearLayout
diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml
index c973bd0c9f763d49059fc5f967f79e11130055cc..bb6344d41d83a6033e8db5f699344d9bbead94c4 100644
--- a/src/main/res/layout/activity_edit_account.xml
+++ b/src/main/res/layout/activity_edit_account.xml
@@ -45,6 +45,7 @@
                             android:layout_alignParentTop="true"
                             android:layout_marginRight="@dimen/avatar_item_distance"
                             android:contentDescription="@string/account_image_description"
+                            app:strokeColor="@color/custom_theme_accent"
                             app:shapeAppearance="@style/ShapeAppearanceOverlay.Photo" />
 
                         <LinearLayout
diff --git a/src/main/res/layout/activity_manage_accounts.xml b/src/main/res/layout/activity_manage_accounts.xml
index 0bf7c87e3a073a98f8438c6afaab28e10a010eb8..b4c7aba2aff71d7880b0e21104de8d427e45416f 100644
--- a/src/main/res/layout/activity_manage_accounts.xml
+++ b/src/main/res/layout/activity_manage_accounts.xml
@@ -33,6 +33,7 @@
             android:layout_alignParentLeft="true"
             android:src="@drawable/ic_call_white_48dp"
             android:background="@color/yeller"
+            app:strokeColor="@color/custom_theme_accent"
             app:shapeAppearance="@style/ShapeAppearanceOverlay.Photo" />
 
         <LinearLayout
@@ -66,6 +67,7 @@
             android:layout_centerVertical="true"
             android:paddingRight="16dp"
             android:src="?attr/icon_settings"
+            app:strokeColor="@null"
             app:shapeAppearance="@style/ShapeAppearanceOverlay.Photo" />
     </RelativeLayout>
 
diff --git a/src/main/res/layout/activity_muc_details.xml b/src/main/res/layout/activity_muc_details.xml
index 3898ef049cc4b16024fe2fe8b7e17364ebe9381a..48b9d1a429741316880bf49c81e90d5f1bb15aed 100644
--- a/src/main/res/layout/activity_muc_details.xml
+++ b/src/main/res/layout/activity_muc_details.xml
@@ -47,6 +47,7 @@
                                 android:layout_width="@dimen/avatar_on_details_screen_size"
                                 android:layout_height="@dimen/avatar_on_details_screen_size"
                                 android:layout_alignParentStart="true"
+                                app:strokeColor="@color/custom_theme_accent"
                                 app:shapeAppearance="@style/ShapeAppearanceOverlay.Photo"
                                 android:layout_marginEnd="@dimen/avatar_item_distance"
                                 android:layout_alignParentLeft="true"
diff --git a/src/main/res/layout/activity_rtp_session.xml b/src/main/res/layout/activity_rtp_session.xml
index e90fc50f7c788200226730dcbbfd04384906b605..29fc024527b97c5c1cd29b0c34c84ff44fcb9d4a 100644
--- a/src/main/res/layout/activity_rtp_session.xml
+++ b/src/main/res/layout/activity_rtp_session.xml
@@ -104,6 +104,7 @@
                 android:layout_width="@dimen/publish_avatar_size"
                 android:layout_height="@dimen/publish_avatar_size"
                 android:layout_centerInParent="true"
+                app:strokeColor="@color/custom_theme_accent"
                 app:shapeAppearance="@style/ShapeAppearanceOverlay.IncomingCall" />
 
         </RelativeLayout>
diff --git a/src/main/res/layout/contact.xml b/src/main/res/layout/contact.xml
index 279dd6f944b21b3e41435a57ddff255271fae02e..7c8bfbd82dfcb1ff823ea955becb8babeba707ac 100644
--- a/src/main/res/layout/contact.xml
+++ b/src/main/res/layout/contact.xml
@@ -14,6 +14,7 @@
             android:layout_height="48dp"
             android:layout_alignParentLeft="true"
             android:scaleType="centerCrop"
+            app:strokeColor="@color/custom_theme_accent"
             app:shapeAppearance="@style/ShapeAppearanceOverlay.Photo" />
 
         <LinearLayout
diff --git a/src/main/res/layout/conversation_list_row.xml b/src/main/res/layout/conversation_list_row.xml
index d3a7d70aafaca46993dc05dde511ea9dbdd54e40..c592080792bc2acb81347f6ff560813bdd13b967 100644
--- a/src/main/res/layout/conversation_list_row.xml
+++ b/src/main/res/layout/conversation_list_row.xml
@@ -25,6 +25,7 @@
                     android:layout_height="56dp"
                     android:layout_alignParentLeft="true"
                     android:scaleType="centerCrop"
+                    app:strokeColor="@color/custom_theme_accent"
                     app:shapeAppearance="@style/ShapeAppearanceOverlay.Photo" />
 
                 <RelativeLayout
diff --git a/src/main/res/layout/message_received.xml b/src/main/res/layout/message_received.xml
index 14108646b07937ee5098b3678a2ca9ff129509c9..7df8f42fdb05144e8a381d2b7e72d83c0f1ea44a 100644
--- a/src/main/res/layout/message_received.xml
+++ b/src/main/res/layout/message_received.xml
@@ -17,6 +17,7 @@
         android:layout_alignParentLeft="true"
         android:layout_alignParentTop="true"
         android:scaleType="fitXY"
+        app:strokeColor="@color/custom_theme_accent"
         app:shapeAppearance="@style/ShapeAppearanceOverlay.Photo" />
 
     <LinearLayout
diff --git a/src/main/res/layout/message_sent.xml b/src/main/res/layout/message_sent.xml
index f3675a5dd19cd68c3b2ba62f5cbd512acedb95f9..4531072d899a65db507ab6584bdea3c0b18fc6ef 100644
--- a/src/main/res/layout/message_sent.xml
+++ b/src/main/res/layout/message_sent.xml
@@ -28,6 +28,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:scaleType="fitXY"
+                app:strokeColor="@color/custom_theme_accent"
                 app:shapeAppearance="@style/ShapeAppearanceOverlay.Photo" />
 
             <View
diff --git a/src/main/res/layout/message_status.xml b/src/main/res/layout/message_status.xml
index d6dff2fa530f33e2f5fef34b7f5d8a28e037f528..e36adbd4854f8bf4a618344b73ebaa55888cfd1d 100644
--- a/src/main/res/layout/message_status.xml
+++ b/src/main/res/layout/message_status.xml
@@ -28,6 +28,7 @@
         android:layout_marginRight="-1.5dp"
         android:padding="0dp"
         android:scaleType="fitXY"
+        app:strokeColor="@color/custom_theme_accent"
         app:shapeAppearance="@style/ShapeAppearanceOverlay.Photo" />
 
     <TextView
diff --git a/src/main/res/layout/search_result_item.xml b/src/main/res/layout/search_result_item.xml
index ee6b463a8ef2c5e19a8734d0e1eef2998ef0fad1..b91f95d59fdd3429c42575b6e5af04f7e619acae 100644
--- a/src/main/res/layout/search_result_item.xml
+++ b/src/main/res/layout/search_result_item.xml
@@ -15,6 +15,7 @@
             android:layout_height="48dp"
             android:layout_alignParentLeft="true"
             android:scaleType="centerCrop"
+            app:strokeColor="@color/custom_theme_accent"
             app:shapeAppearance="@style/ShapeAppearanceOverlay.Photo" />
 
         <RelativeLayout