diff --git a/src/main/res/values-v21/themes.xml b/src/main/res/values-v21/themes.xml
deleted file mode 100644
index 1f34e1517774be81f112ea0350e490164dc6dd99..0000000000000000000000000000000000000000
--- a/src/main/res/values-v21/themes.xml
+++ /dev/null
@@ -1,164 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <style name="ConversationsTheme" parent="Theme.AppCompat.Light.DarkActionBar">
-        <item name="colorPrimary">@color/primary500</item>
-        <item name="colorPrimaryDark">@color/primary700</item>
-        <item name="colorAccent">@color/accent</item>
-
-        <item name="color_text_primary">@color/black87</item>
-        <item name="color_text_secondary">@color/black54</item>
-
-        <item name="color_background_primary">@color/grey50</item>
-        <item name="color_background_secondary">@color/grey200</item>
-
-        <item name="android:windowActionModeOverlay">true</item>
-        <item name="android:actionModeBackground">@color/accent</item>
-
-        <item name="TextSizeInfo">12sp</item>
-        <item name="TextSizeBody">14sp</item>
-        <item name="TextSeparation">5sp</item>
-        <item name="IconSize">18sp</item>
-        <item name="TextSizeHeadline">20sp</item>
-
-        <item type="reference" name="infocard_border">@drawable/infocard_border</item>
-        <item name="divider">@color/black12</item>
-
-        <item type="reference" name="ic_send_cancel_offline">@drawable/ic_send_cancel_offline</item>
-        <item type="reference" name="ic_send_location_offline">@drawable/ic_send_location_offline</item>
-        <item type="reference" name="ic_send_photo_offline">@drawable/ic_send_photo_offline</item>
-        <item type="reference" name="ic_send_picture_offline">@drawable/ic_send_picture_offline</item>
-        <item type="reference" name="ic_send_text_offline">@drawable/ic_send_text_offline</item>
-        <item type="reference" name="ic_send_videocam_offline">@drawable/ic_send_videocam_offline</item>
-        <item type="reference" name="ic_send_voice_offline">@drawable/ic_send_voice_offline</item>
-
-        <item type="reference" name="ic_attach_camera">@drawable/ic_attach_camera</item>
-        <item type="reference" name="ic_attach_videocam">@drawable/ic_attach_videocam</item>
-        <item type="reference" name="ic_attach_document">@drawable/ic_attach_document</item>
-        <item type="reference" name="ic_attach_location">@drawable/ic_attach_location</item>
-        <item type="reference" name="ic_attach_photo">@drawable/ic_attach_photo</item>
-        <item type="reference" name="ic_attach_record">@drawable/ic_attach_record</item>
-
-        <item type="reference" name="message_bubble_received_monochrome">@drawable/message_bubble_received_white</item>
-        <item type="reference" name="message_bubble_sent">@drawable/message_bubble_sent</item>
-        <item type="reference" name="message_bubble_received_green">@drawable/message_bubble_received</item>
-
-        <item name="unread_count">@color/unreadcountlight</item>
-
-        <item name="conversations_overview_background">@color/primary700</item>
-
-        <item type="float" name="icon_alpha">0.54</item>
-
-        <item name="dialog_horizontal_padding">24dp</item>
-        <item name="dialog_vertical_padding">16dp</item>
-
-        <item type="reference" name="icon_add_group">@drawable/ic_group_add_white_24dp</item>
-        <item type="reference" name="icon_add_person">@drawable/ic_person_add_white_24dp</item>
-        <item type="reference" name="icon_cancel">@drawable/ic_cancel_white_24dp</item>
-        <item type="reference" name="icon_copy">@drawable/ic_content_copy_black_24dp</item>
-        <item type="reference" name="icon_discard">@drawable/ic_delete_white_24dp</item>
-        <item type="reference" name="icon_download">@drawable/ic_file_download_white_24dp</item>
-        <item type="reference" name="icon_edit">@drawable/ic_edit_white_24dp</item>
-        <item type="reference" name="icon_edit_body">@drawable/ic_edit_black_24dp</item>
-        <item type="reference" name="icon_done">@drawable/ic_done_black_24dp</item>
-        <item type="reference" name="icon_group">@drawable/ic_group_white_24dp</item>
-        <item type="reference" name="icon_new">@drawable/ic_add_white_24dp</item>
-        <item type="reference" name="icon_quote">@drawable/ic_reply_white_24dp</item>
-        <item type="reference" name="icon_refresh">@drawable/ic_refresh_black_24dp</item>
-        <item type="reference" name="icon_new_attachment">@drawable/ic_attach_file_white_24dp</item>
-        <item type="reference" name="icon_not_secure">@drawable/ic_lock_open_white_24dp</item>
-        <item type="reference" name="icon_remove">@drawable/ic_delete_black_24dp</item>
-        <item type="reference" name="icon_search">@drawable/ic_search_white_24dp</item>
-        <item type="reference" name="icon_secure">@drawable/ic_lock_open_white_24dp</item>
-        <item type="reference" name="icon_settings">@drawable/ic_settings_black_24dp</item>
-        <item type="reference" name="icon_import_export">@drawable/ic_import_export_white_24dp</item>
-        <item type="reference" name="icon_share">@drawable/ic_share_white_24dp</item>
-        <item type="reference" name="icon_scan_qr_code">@drawable/ic_camera_alt_white_24dp</item>
-
-        <item type="reference" name="icon_notifications">@drawable/ic_notifications_black_24dp</item>
-        <item type="reference" name="icon_notifications_off">@drawable/ic_notifications_off_black_24dp</item>
-        <item type="reference" name="icon_notifications_paused">@drawable/ic_notifications_paused_black_24dp</item>
-        <item type="reference" name="icon_notifications_none">@drawable/ic_notifications_none_black_24dp</item>
-    </style>
-
-    <style name="ConversationsTheme.Dark" parent="Theme.AppCompat">
-        <item name="colorPrimary">@color/primary800</item>
-        <item name="colorPrimaryDark">@color/primary900</item>
-        <item name="colorAccent">@color/accent</item>
-
-        <item name="color_text_primary">@color/white</item>
-        <item name="color_text_secondary">@color/white70</item>
-
-        <item name="color_background_primary">@color/grey800</item>
-        <item name="color_background_secondary">@color/grey900</item>
-
-        <item name="android:windowActionModeOverlay">true</item>
-        <item name="android:actionModeBackground">@color/accent</item>
-
-        <item name="TextSizeInfo">12sp</item>
-        <item name="TextSizeBody">14sp</item>
-        <item name="TextSeparation">5sp</item>
-        <item name="IconSize">18sp</item>
-        <item name="TextSizeHeadline">20sp</item>
-
-        <item type="reference" name="infocard_border">@drawable/infocard_border_dark</item>
-        <item name="divider">@color/white12</item>
-
-        <item type="reference" name="ic_send_cancel_offline">@drawable/ic_send_cancel_offline_white</item>
-        <item type="reference" name="ic_send_location_offline">@drawable/ic_send_location_offline_white</item>
-        <item type="reference" name="ic_send_photo_offline">@drawable/ic_send_photo_offline_white</item>
-        <item type="reference" name="ic_send_picture_offline">@drawable/ic_send_picture_offline_white</item>
-        <item type="reference" name="ic_send_text_offline">@drawable/ic_send_text_offline_white</item>
-        <item type="reference" name="ic_send_videocam_offline">@drawable/ic_send_videocam_offline_white</item>
-        <item type="reference" name="ic_send_voice_offline">@drawable/ic_send_voice_offline_white</item>
-
-        <item type="reference" name="ic_attach_camera">@drawable/ic_attach_camera_white</item>
-        <item type="reference" name="ic_attach_videocam">@drawable/ic_attach_videocam_white</item>
-        <item type="reference" name="ic_attach_document">@drawable/ic_attach_document_white</item>
-        <item type="reference" name="ic_attach_location">@drawable/ic_attach_location_white</item>
-        <item type="reference" name="ic_attach_photo">@drawable/ic_attach_photo_white</item>
-        <item type="reference" name="ic_attach_record">@drawable/ic_attach_record_white</item>
-
-        <item type="reference" name="message_bubble_received_monochrome">@drawable/message_bubble_received_grey</item>
-        <item type="reference" name="message_bubble_sent">@drawable/message_bubble_sent_grey</item>
-        <item type="reference" name="message_bubble_received_green">@drawable/message_bubble_received_dark</item>
-
-        <item name="unread_count">@color/unreadcountdark</item>
-
-        <item name="conversations_overview_background">@color/primary900</item>
-
-        <item type="float" name="icon_alpha">0.7</item>
-
-        <item name="dialog_horizontal_padding">24dp</item>
-        <item name="dialog_vertical_padding">16dp</item>
-
-        <item type="reference" name="icon_add_group">@drawable/ic_group_add_white_24dp</item>
-        <item type="reference" name="icon_add_person">@drawable/ic_person_add_white_24dp</item>
-        <item type="reference" name="icon_cancel">@drawable/ic_cancel_white_24dp</item>
-        <item type="reference" name="icon_copy">@drawable/ic_content_copy_white_24dp</item>
-        <item type="reference" name="icon_discard">@drawable/ic_delete_white_24dp</item>
-        <item type="reference" name="icon_download">@drawable/ic_file_download_white_24dp</item>
-        <item type="reference" name="icon_edit">@drawable/ic_edit_white_24dp</item>
-        <item type="reference" name="icon_edit_body">@drawable/ic_edit_white_24dp</item>
-        <item type="reference" name="icon_done">@drawable/ic_done_black_24dp</item>
-        <item type="reference" name="icon_group">@drawable/ic_group_white_24dp</item>
-        <item type="reference" name="icon_new">@drawable/ic_add_white_24dp</item>
-        <item type="reference" name="icon_quote">@drawable/ic_reply_white_24dp</item>
-        <item type="reference" name="icon_refresh">@drawable/ic_refresh_white_24dp</item>
-        <item type="reference" name="icon_new_attachment">@drawable/ic_attach_file_white_24dp</item>
-        <item type="reference" name="icon_not_secure">@drawable/ic_lock_open_white_24dp</item>
-        <item type="reference" name="icon_remove">@drawable/ic_delete_white_24dp</item>
-        <item type="reference" name="icon_search">@drawable/ic_search_white_24dp</item>
-        <item type="reference" name="icon_secure">@drawable/ic_lock_open_white_24dp</item>
-        <item type="reference" name="icon_settings">@drawable/ic_settings_white_24dp</item>
-        <item type="reference" name="icon_import_export">@drawable/ic_import_export_white_24dp</item>
-        <item type="reference" name="icon_share">@drawable/ic_share_white_24dp</item>
-        <item type="reference" name="icon_scan_qr_code">@drawable/ic_camera_alt_white_24dp</item>
-
-        <item type="reference" name="icon_notifications">@drawable/ic_notifications_white_24dp</item>
-        <item type="reference" name="icon_notifications_off">@drawable/ic_notifications_off_white_24dp</item>
-        <item type="reference" name="icon_notifications_paused">@drawable/ic_notifications_paused_white_24dp</item>
-        <item type="reference" name="icon_notifications_none">@drawable/ic_notifications_none_white_24dp</item>
-    </style>
-
-</resources>
\ No newline at end of file
diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml
index 5c4ccd09557bc2fe9136c8a9b66632991def2a7a..a36207d15e23461bb97493627bb6a42fc527ebdc 100644
--- a/src/main/res/values/themes.xml
+++ b/src/main/res/values/themes.xml
@@ -1,24 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="ConversationsTheme" parent="@android:style/Theme.Holo.Light.DarkActionBar">
-        <item name="android:actionBarStyle">@style/ConversationsActionBar</item>
-        <item name="android:actionBarWidgetTheme">@style/ConversationsActionBarWidget</item>
-        <item name="android:actionBarTabStyle">@style/ConversationsActionBarTabs</item>
+    <style name="ConversationsTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+        <item name="colorPrimary">@color/primary500</item>
+        <item name="colorPrimaryDark">@color/primary700</item>
+        <item name="colorAccent">@color/accent</item>
+
+        <item name="color_text_primary">@color/black87</item>
+        <item name="color_text_secondary">@color/black54</item>
+
+        <item name="color_background_primary">@color/grey50</item>
+        <item name="color_background_secondary">@color/grey200</item>
+
+        <item name="android:windowActionModeOverlay">true</item>
+        <item name="android:actionModeBackground">@color/accent</item>
+
         <item name="TextSizeInfo">12sp</item>
         <item name="TextSizeBody">14sp</item>
-        <item name="TextSizeHeadline">20sp</item>
         <item name="TextSeparation">5sp</item>
         <item name="IconSize">18sp</item>
-
-        <item type="color" name="color_text_primary">@color/black87</item>
-        <item type="color" name="color_text_secondary">@color/black54</item>
-
-        <item type="color" name="color_background_primary">@color/grey50</item>
-        <item type="color" name="color_background_secondary">@color/grey200</item>
+        <item name="TextSizeHeadline">20sp</item>
 
         <item type="reference" name="infocard_border">@drawable/infocard_border</item>
-        <item type="color" name="divider">@color/black12</item>
+        <item name="divider">@color/black12</item>
 
         <item type="reference" name="ic_send_cancel_offline">@drawable/ic_send_cancel_offline</item>
         <item type="reference" name="ic_send_location_offline">@drawable/ic_send_location_offline</item>
@@ -35,42 +39,41 @@
         <item type="reference" name="ic_attach_photo">@drawable/ic_attach_photo</item>
         <item type="reference" name="ic_attach_record">@drawable/ic_attach_record</item>
 
-        <item type="reference" name="icon_add_group">@drawable/ic_action_add_group</item>
-        <item type="reference" name="icon_add_person">@drawable/ic_action_add_person</item>
-        <item type="reference" name="icon_cancel">@drawable/ic_action_cancel</item>
-        <item type="reference" name="icon_copy">@drawable/ic_action_copy</item>
-        <item type="reference" name="icon_discard">@drawable/ic_action_discard</item>
-        <item type="reference" name="icon_download">@drawable/ic_action_download</item>
-        <item type="reference" name="icon_edit">@drawable/ic_action_edit</item>
-        <item type="reference" name="icon_edit_body">@drawable/ic_action_edit_dark</item>
-        <item type="reference" name="icon_done">@drawable/ic_action_done</item>
-
         <item type="reference" name="message_bubble_received_monochrome">@drawable/message_bubble_received_white</item>
         <item type="reference" name="message_bubble_sent">@drawable/message_bubble_sent</item>
         <item type="reference" name="message_bubble_received_green">@drawable/message_bubble_received</item>
 
-        <item type="color" name="unread_count">@color/unreadcountlight</item>
-
-        <item type="color" name="conversations_overview_background">@color/primary700</item>
-
-        <item type="float" name="icon_alpha">1.0</item>
-
-        <item type="dimen" name="dialog_horizontal_padding">16dp</item>
-        <item type="dimen" name="dialog_vertical_padding">16dp</item>
-
-        <item type="reference" name="icon_group">@drawable/ic_action_group</item>
-        <item type="reference" name="icon_new">@drawable/ic_action_new</item>
-        <item type="reference" name="icon_new_attachment">@drawable/ic_action_new_attachment</item>
-        <item type="reference" name="icon_not_secure">@drawable/ic_action_not_secure</item>
-        <item type="reference" name="icon_quote">@drawable/ic_action_reply</item>
-        <item type="reference" name="icon_refresh">@drawable/ic_action_refresh</item>
-        <item type="reference" name="icon_remove">@drawable/ic_action_remove</item>
-        <item type="reference" name="icon_search">@drawable/ic_action_search</item>
-        <item type="reference" name="icon_secure">@drawable/ic_action_secure</item>
-        <item type="reference" name="icon_settings">@drawable/ic_action_settings</item>
-        <item type="reference" name="icon_import_export">@drawable/ic_stat_communication_import_export</item>
-        <item type="reference" name="icon_share">@drawable/ic_action_share</item>
-        <item type="reference" name="icon_scan_qr_code">@drawable/ic_action_camera</item>
+        <item name="unread_count">@color/unreadcountlight</item>
+
+        <item name="conversations_overview_background">@color/primary700</item>
+
+        <item type="float" name="icon_alpha">0.54</item>
+
+        <item name="dialog_horizontal_padding">24dp</item>
+        <item name="dialog_vertical_padding">16dp</item>
+
+        <item type="reference" name="icon_add_group">@drawable/ic_group_add_white_24dp</item>
+        <item type="reference" name="icon_add_person">@drawable/ic_person_add_white_24dp</item>
+        <item type="reference" name="icon_cancel">@drawable/ic_cancel_white_24dp</item>
+        <item type="reference" name="icon_copy">@drawable/ic_content_copy_black_24dp</item>
+        <item type="reference" name="icon_discard">@drawable/ic_delete_white_24dp</item>
+        <item type="reference" name="icon_download">@drawable/ic_file_download_white_24dp</item>
+        <item type="reference" name="icon_edit">@drawable/ic_edit_white_24dp</item>
+        <item type="reference" name="icon_edit_body">@drawable/ic_edit_black_24dp</item>
+        <item type="reference" name="icon_done">@drawable/ic_done_black_24dp</item>
+        <item type="reference" name="icon_group">@drawable/ic_group_white_24dp</item>
+        <item type="reference" name="icon_new">@drawable/ic_add_white_24dp</item>
+        <item type="reference" name="icon_quote">@drawable/ic_reply_white_24dp</item>
+        <item type="reference" name="icon_refresh">@drawable/ic_refresh_black_24dp</item>
+        <item type="reference" name="icon_new_attachment">@drawable/ic_attach_file_white_24dp</item>
+        <item type="reference" name="icon_not_secure">@drawable/ic_lock_open_white_24dp</item>
+        <item type="reference" name="icon_remove">@drawable/ic_delete_black_24dp</item>
+        <item type="reference" name="icon_search">@drawable/ic_search_white_24dp</item>
+        <item type="reference" name="icon_secure">@drawable/ic_lock_open_white_24dp</item>
+        <item type="reference" name="icon_settings">@drawable/ic_settings_black_24dp</item>
+        <item type="reference" name="icon_import_export">@drawable/ic_import_export_white_24dp</item>
+        <item type="reference" name="icon_share">@drawable/ic_share_white_24dp</item>
+        <item type="reference" name="icon_scan_qr_code">@drawable/ic_camera_alt_white_24dp</item>
 
         <item type="reference" name="icon_notifications">@drawable/ic_notifications_black_24dp</item>
         <item type="reference" name="icon_notifications_off">@drawable/ic_notifications_off_black_24dp</item>
@@ -78,24 +81,28 @@
         <item type="reference" name="icon_notifications_none">@drawable/ic_notifications_none_black_24dp</item>
     </style>
 
-    <style name="ConversationsTheme.Dark" parent="@android:style/Theme.Holo">
-        <item name="android:actionBarStyle">@style/ConversationsActionBar.Dark</item>
-        <item name="android:actionBarWidgetTheme">@style/ConversationsActionBarWidget.Dark</item>
-        <item name="android:actionBarTabStyle">@style/ConversationsActionBarTabs</item>
+    <style name="ConversationsTheme.Dark" parent="Theme.AppCompat">
+        <item name="colorPrimary">@color/primary800</item>
+        <item name="colorPrimaryDark">@color/primary900</item>
+        <item name="colorAccent">@color/accent</item>
+
+        <item name="color_text_primary">@color/white</item>
+        <item name="color_text_secondary">@color/white70</item>
+
+        <item name="color_background_primary">@color/grey800</item>
+        <item name="color_background_secondary">@color/grey900</item>
+
+        <item name="android:windowActionModeOverlay">true</item>
+        <item name="android:actionModeBackground">@color/accent</item>
+
         <item name="TextSizeInfo">12sp</item>
         <item name="TextSizeBody">14sp</item>
         <item name="TextSeparation">5sp</item>
         <item name="IconSize">18sp</item>
         <item name="TextSizeHeadline">20sp</item>
 
-        <item type="color" name="color_text_primary">@color/white</item>
-        <item type="color" name="color_text_secondary">@color/white70</item>
-
-        <item type="color" name="color_background_primary">@color/grey800</item>
-        <item type="color" name="color_background_secondary">@color/grey900</item>
-
         <item type="reference" name="infocard_border">@drawable/infocard_border_dark</item>
-        <item type="color" name="divider">@color/white12</item>
+        <item name="divider">@color/white12</item>
 
         <item type="reference" name="ic_send_cancel_offline">@drawable/ic_send_cancel_offline_white</item>
         <item type="reference" name="ic_send_location_offline">@drawable/ic_send_location_offline_white</item>
@@ -116,43 +123,42 @@
         <item type="reference" name="message_bubble_sent">@drawable/message_bubble_sent_grey</item>
         <item type="reference" name="message_bubble_received_green">@drawable/message_bubble_received_dark</item>
 
-        <item type="color" name="unread_count">@color/unreadcountdark</item>
-
-        <item type="color" name="conversations_overview_background">@color/primary900</item>
-
-        <item type="float" name="icon_alpha">1.0</item>
-
-        <item type="dimen" name="dialog_horizontal_padding">16dp</item>
-        <item type="dimen" name="dialog_vertical_padding">16dp</item>
-
-        <item type="reference" name="icon_add_group">@drawable/ic_action_add_group</item>
-        <item type="reference" name="icon_add_person">@drawable/ic_action_add_person</item>
-        <item type="reference" name="icon_cancel">@drawable/ic_action_cancel</item>
-        <item type="reference" name="icon_copy">@drawable/ic_action_copy_white</item>
-        <item type="reference" name="icon_discard">@drawable/ic_action_discard</item>
-        <item type="reference" name="icon_download">@drawable/ic_action_download</item>
-        <item type="reference" name="icon_edit">@drawable/ic_action_edit</item>
-        <item type="reference" name="icon_edit_body">@drawable/ic_action_edit</item>
-        <item type="reference" name="icon_done">@drawable/ic_action_done</item>
-
-        <item type="reference" name="icon_group">@drawable/ic_action_group</item>
-        <item type="reference" name="icon_new">@drawable/ic_action_new</item>
-        <item type="reference" name="icon_new_attachment">@drawable/ic_action_new_attachment</item>
-        <item type="reference" name="icon_not_secure">@drawable/ic_action_not_secure</item>
-        <item type="reference" name="icon_quote">@drawable/ic_action_reply</item>
-        <item type="reference" name="icon_refresh">@drawable/ic_action_refresh_white</item>
-        <item type="reference" name="icon_remove">@drawable/ic_action_remove_white</item>
-        <item type="reference" name="icon_search">@drawable/ic_action_search</item>
-        <item type="reference" name="icon_secure">@drawable/ic_action_secure</item>
-        <item type="reference" name="icon_settings">@drawable/ic_action_settings_white</item>
-        <item type="reference" name="icon_import_export">@drawable/ic_stat_communication_import_export</item>
-        <item type="reference" name="icon_share">@drawable/ic_action_share</item>
-        <item type="reference" name="icon_scan_qr_code">@drawable/ic_action_camera</item>
-
-        <item type="reference" name="icon_notifications">@drawable/ic_notifications_white80</item>
-        <item type="reference" name="icon_notifications_off">@drawable/ic_notifications_off_white80</item>
-        <item type="reference" name="icon_notifications_paused">@drawable/ic_notifications_paused_white80</item>
-        <item type="reference" name="icon_notifications_none">@drawable/ic_notifications_none_white80</item>
+        <item name="unread_count">@color/unreadcountdark</item>
+
+        <item name="conversations_overview_background">@color/primary900</item>
+
+        <item type="float" name="icon_alpha">0.7</item>
+
+        <item name="dialog_horizontal_padding">24dp</item>
+        <item name="dialog_vertical_padding">16dp</item>
+
+        <item type="reference" name="icon_add_group">@drawable/ic_group_add_white_24dp</item>
+        <item type="reference" name="icon_add_person">@drawable/ic_person_add_white_24dp</item>
+        <item type="reference" name="icon_cancel">@drawable/ic_cancel_white_24dp</item>
+        <item type="reference" name="icon_copy">@drawable/ic_content_copy_white_24dp</item>
+        <item type="reference" name="icon_discard">@drawable/ic_delete_white_24dp</item>
+        <item type="reference" name="icon_download">@drawable/ic_file_download_white_24dp</item>
+        <item type="reference" name="icon_edit">@drawable/ic_edit_white_24dp</item>
+        <item type="reference" name="icon_edit_body">@drawable/ic_edit_white_24dp</item>
+        <item type="reference" name="icon_done">@drawable/ic_done_black_24dp</item>
+        <item type="reference" name="icon_group">@drawable/ic_group_white_24dp</item>
+        <item type="reference" name="icon_new">@drawable/ic_add_white_24dp</item>
+        <item type="reference" name="icon_quote">@drawable/ic_reply_white_24dp</item>
+        <item type="reference" name="icon_refresh">@drawable/ic_refresh_white_24dp</item>
+        <item type="reference" name="icon_new_attachment">@drawable/ic_attach_file_white_24dp</item>
+        <item type="reference" name="icon_not_secure">@drawable/ic_lock_open_white_24dp</item>
+        <item type="reference" name="icon_remove">@drawable/ic_delete_white_24dp</item>
+        <item type="reference" name="icon_search">@drawable/ic_search_white_24dp</item>
+        <item type="reference" name="icon_secure">@drawable/ic_lock_open_white_24dp</item>
+        <item type="reference" name="icon_settings">@drawable/ic_settings_white_24dp</item>
+        <item type="reference" name="icon_import_export">@drawable/ic_import_export_white_24dp</item>
+        <item type="reference" name="icon_share">@drawable/ic_share_white_24dp</item>
+        <item type="reference" name="icon_scan_qr_code">@drawable/ic_camera_alt_white_24dp</item>
+
+        <item type="reference" name="icon_notifications">@drawable/ic_notifications_white_24dp</item>
+        <item type="reference" name="icon_notifications_off">@drawable/ic_notifications_off_white_24dp</item>
+        <item type="reference" name="icon_notifications_paused">@drawable/ic_notifications_paused_white_24dp</item>
+        <item type="reference" name="icon_notifications_none">@drawable/ic_notifications_none_white_24dp</item>
     </style>
 
     <style name="ConversationsTheme.LargerText" parent="ConversationsTheme">
@@ -171,32 +177,4 @@
         <item name="TextSizeHeadline">22sp</item>
     </style>
 
-    <style name="ConversationsActionBar" parent="@android:style/Widget.Holo.Light.ActionBar.Solid.Inverse">
-        <item name="android:background">@color/primary500</item>
-        <item name="android:backgroundStacked">@color/primary700</item>
-        <item name="android:displayOptions">showHome|homeAsUp|showTitle</item>
-        <item name="android:icon">@android:color/transparent</item>
-    </style>
-
-    <style name="ConversationsActionBar.Dark" parent="@android:style/Widget.Holo.ActionBar.Solid">
-        <item name="android:background">@color/primary800</item>
-        <item name="android:backgroundStacked">@color/primary900</item>
-        <item name="android:displayOptions">showHome|homeAsUp|showTitle</item>
-        <item name="android:icon">@android:color/transparent</item>
-    </style>
-
-    <style name="ConversationsActionBarWidget" parent="android:Theme.Holo.Light">
-        <item name="android:popupMenuStyle">@android:style/Widget.Holo.Light.PopupMenu</item>
-        <item name="android:dropDownListViewStyle">@android:style/Widget.Holo.Light.ListView.DropDown</item>
-    </style>
-
-    <style name="ConversationsActionBarWidget.Dark" parent="android:Theme.Holo">
-        <item name="android:popupMenuStyle">@android:style/Widget.Holo.PopupMenu</item>
-        <item name="android:dropDownListViewStyle">@android:style/Widget.Holo.ListView.DropDown</item>
-    </style>
-
-    <style name="ConversationsActionBarTabs" parent="@android:style/Widget.Holo.ActionBar.TabView">
-        <item name="android:background">@drawable/actionbar_tab_indicator</item>
-    </style>
-
 </resources>
\ No newline at end of file