diff --git a/res/drawable-hdpi/ic_advanced_black.png b/res/drawable-hdpi/ic_advanced_black.png
deleted file mode 100644
index 21f955b3f..000000000
Binary files a/res/drawable-hdpi/ic_advanced_black.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_advanced_black_24dp.png b/res/drawable-hdpi/ic_advanced_black_24dp.png
new file mode 100644
index 000000000..ab07536e5
Binary files /dev/null and b/res/drawable-hdpi/ic_advanced_black_24dp.png differ
diff --git a/res/drawable-hdpi/ic_advanced_gray.png b/res/drawable-hdpi/ic_advanced_gray.png
deleted file mode 100644
index a095c6615..000000000
Binary files a/res/drawable-hdpi/ic_advanced_gray.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_advanced_white_24dp.png b/res/drawable-hdpi/ic_advanced_white_24dp.png
new file mode 100644
index 000000000..3ce85689d
Binary files /dev/null and b/res/drawable-hdpi/ic_advanced_white_24dp.png differ
diff --git a/res/drawable-hdpi/ic_app_protection_black.png b/res/drawable-hdpi/ic_app_protection_black.png
deleted file mode 100644
index 5e61572be..000000000
Binary files a/res/drawable-hdpi/ic_app_protection_black.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_app_protection_gray.png b/res/drawable-hdpi/ic_app_protection_gray.png
deleted file mode 100644
index 8ee2c0b7e..000000000
Binary files a/res/drawable-hdpi/ic_app_protection_gray.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_brightness_6_black.png b/res/drawable-hdpi/ic_brightness_6_black.png
deleted file mode 100644
index 897bddf36..000000000
Binary files a/res/drawable-hdpi/ic_brightness_6_black.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_brightness_6_black_24dp.png b/res/drawable-hdpi/ic_brightness_6_black_24dp.png
new file mode 100644
index 000000000..7e9f3976e
Binary files /dev/null and b/res/drawable-hdpi/ic_brightness_6_black_24dp.png differ
diff --git a/res/drawable-hdpi/ic_brightness_6_gray.png b/res/drawable-hdpi/ic_brightness_6_gray.png
deleted file mode 100644
index 70c0dfa59..000000000
Binary files a/res/drawable-hdpi/ic_brightness_6_gray.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_brightness_6_white_24dp.png b/res/drawable-hdpi/ic_brightness_6_white_24dp.png
new file mode 100644
index 000000000..7e9a08756
Binary files /dev/null and b/res/drawable-hdpi/ic_brightness_6_white_24dp.png differ
diff --git a/res/drawable-hdpi/ic_forum_black_24dp.png b/res/drawable-hdpi/ic_forum_black_24dp.png
new file mode 100644
index 000000000..373168bd9
Binary files /dev/null and b/res/drawable-hdpi/ic_forum_black_24dp.png differ
diff --git a/res/drawable-hdpi/ic_forum_black_32dp.png b/res/drawable-hdpi/ic_forum_black_32dp.png
deleted file mode 100644
index 4911236d4..000000000
Binary files a/res/drawable-hdpi/ic_forum_black_32dp.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_forum_grey_32dp.png b/res/drawable-hdpi/ic_forum_grey_32dp.png
deleted file mode 100644
index 37c69a18a..000000000
Binary files a/res/drawable-hdpi/ic_forum_grey_32dp.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_forum_white_24dp.png b/res/drawable-hdpi/ic_forum_white_24dp.png
new file mode 100644
index 000000000..2a8fb7e0c
Binary files /dev/null and b/res/drawable-hdpi/ic_forum_white_24dp.png differ
diff --git a/res/drawable-hdpi/ic_laptop_black_24dp.png b/res/drawable-hdpi/ic_laptop_black_24dp.png
new file mode 100644
index 000000000..e175dcb77
Binary files /dev/null and b/res/drawable-hdpi/ic_laptop_black_24dp.png differ
diff --git a/res/drawable-hdpi/ic_laptop_black_32dp.png b/res/drawable-hdpi/ic_laptop_black_32dp.png
deleted file mode 100644
index c87e01d54..000000000
Binary files a/res/drawable-hdpi/ic_laptop_black_32dp.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_laptop_light_32dp.png b/res/drawable-hdpi/ic_laptop_light_32dp.png
deleted file mode 100644
index 0f8d1680f..000000000
Binary files a/res/drawable-hdpi/ic_laptop_light_32dp.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_laptop_white_24dp.png b/res/drawable-hdpi/ic_laptop_white_24dp.png
new file mode 100644
index 000000000..96703f315
Binary files /dev/null and b/res/drawable-hdpi/ic_laptop_white_24dp.png differ
diff --git a/res/drawable-hdpi/ic_notifications_black.png b/res/drawable-hdpi/ic_notifications_black.png
deleted file mode 100644
index bae2907b4..000000000
Binary files a/res/drawable-hdpi/ic_notifications_black.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_notifications_black_24dp.png b/res/drawable-hdpi/ic_notifications_black_24dp.png
new file mode 100644
index 000000000..876681f22
Binary files /dev/null and b/res/drawable-hdpi/ic_notifications_black_24dp.png differ
diff --git a/res/drawable-hdpi/ic_notifications_gray.png b/res/drawable-hdpi/ic_notifications_gray.png
deleted file mode 100644
index af04f236d..000000000
Binary files a/res/drawable-hdpi/ic_notifications_gray.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_notifications_white_24dp.png b/res/drawable-hdpi/ic_notifications_white_24dp.png
new file mode 100644
index 000000000..e5617555e
Binary files /dev/null and b/res/drawable-hdpi/ic_notifications_white_24dp.png differ
diff --git a/res/drawable-hdpi/ic_security_black_24dp.png b/res/drawable-hdpi/ic_security_black_24dp.png
new file mode 100644
index 000000000..ec30bf1e7
Binary files /dev/null and b/res/drawable-hdpi/ic_security_black_24dp.png differ
diff --git a/res/drawable-hdpi/ic_textsms_black_24dp.png b/res/drawable-hdpi/ic_textsms_black_24dp.png
new file mode 100644
index 000000000..0fc43a9a4
Binary files /dev/null and b/res/drawable-hdpi/ic_textsms_black_24dp.png differ
diff --git a/res/drawable-hdpi/ic_textsms_black_32dp.png b/res/drawable-hdpi/ic_textsms_black_32dp.png
deleted file mode 100644
index 091c4487a..000000000
Binary files a/res/drawable-hdpi/ic_textsms_black_32dp.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_textsms_grey_32dp.png b/res/drawable-hdpi/ic_textsms_grey_32dp.png
deleted file mode 100644
index 6882ef608..000000000
Binary files a/res/drawable-hdpi/ic_textsms_grey_32dp.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_textsms_white_24dp.png b/res/drawable-hdpi/ic_textsms_white_24dp.png
new file mode 100644
index 000000000..9fb0f46a4
Binary files /dev/null and b/res/drawable-hdpi/ic_textsms_white_24dp.png differ
diff --git a/res/drawable-mdpi/ic_advanced_black.png b/res/drawable-mdpi/ic_advanced_black.png
deleted file mode 100644
index be6c2d76c..000000000
Binary files a/res/drawable-mdpi/ic_advanced_black.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_advanced_black_24dp.png b/res/drawable-mdpi/ic_advanced_black_24dp.png
new file mode 100644
index 000000000..2e9ba9c66
Binary files /dev/null and b/res/drawable-mdpi/ic_advanced_black_24dp.png differ
diff --git a/res/drawable-mdpi/ic_advanced_gray.png b/res/drawable-mdpi/ic_advanced_gray.png
deleted file mode 100644
index 782eee96a..000000000
Binary files a/res/drawable-mdpi/ic_advanced_gray.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_advanced_white_24dp.png b/res/drawable-mdpi/ic_advanced_white_24dp.png
new file mode 100644
index 000000000..65af51ba0
Binary files /dev/null and b/res/drawable-mdpi/ic_advanced_white_24dp.png differ
diff --git a/res/drawable-mdpi/ic_app_protection_black.png b/res/drawable-mdpi/ic_app_protection_black.png
deleted file mode 100644
index 0f5ff12b1..000000000
Binary files a/res/drawable-mdpi/ic_app_protection_black.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_app_protection_gray.png b/res/drawable-mdpi/ic_app_protection_gray.png
deleted file mode 100644
index 31e38a6da..000000000
Binary files a/res/drawable-mdpi/ic_app_protection_gray.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_brightness_6_black.png b/res/drawable-mdpi/ic_brightness_6_black.png
deleted file mode 100644
index 88f0da473..000000000
Binary files a/res/drawable-mdpi/ic_brightness_6_black.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_brightness_6_black_24dp.png b/res/drawable-mdpi/ic_brightness_6_black_24dp.png
new file mode 100644
index 000000000..66555bac9
Binary files /dev/null and b/res/drawable-mdpi/ic_brightness_6_black_24dp.png differ
diff --git a/res/drawable-mdpi/ic_brightness_6_gray.png b/res/drawable-mdpi/ic_brightness_6_gray.png
deleted file mode 100644
index 4eb5746c0..000000000
Binary files a/res/drawable-mdpi/ic_brightness_6_gray.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_brightness_6_white_24dp.png b/res/drawable-mdpi/ic_brightness_6_white_24dp.png
new file mode 100644
index 000000000..e360fb747
Binary files /dev/null and b/res/drawable-mdpi/ic_brightness_6_white_24dp.png differ
diff --git a/res/drawable-mdpi/ic_forum_black_24dp.png b/res/drawable-mdpi/ic_forum_black_24dp.png
new file mode 100644
index 000000000..68f193dcf
Binary files /dev/null and b/res/drawable-mdpi/ic_forum_black_24dp.png differ
diff --git a/res/drawable-mdpi/ic_forum_black_32dp.png b/res/drawable-mdpi/ic_forum_black_32dp.png
deleted file mode 100644
index 7840302c1..000000000
Binary files a/res/drawable-mdpi/ic_forum_black_32dp.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_forum_grey_32dp.png b/res/drawable-mdpi/ic_forum_grey_32dp.png
deleted file mode 100644
index 00b00cea1..000000000
Binary files a/res/drawable-mdpi/ic_forum_grey_32dp.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_forum_white_24dp.png b/res/drawable-mdpi/ic_forum_white_24dp.png
new file mode 100644
index 000000000..770224b9f
Binary files /dev/null and b/res/drawable-mdpi/ic_forum_white_24dp.png differ
diff --git a/res/drawable-mdpi/ic_laptop_black_24dp.png b/res/drawable-mdpi/ic_laptop_black_24dp.png
new file mode 100644
index 000000000..29b3b50ec
Binary files /dev/null and b/res/drawable-mdpi/ic_laptop_black_24dp.png differ
diff --git a/res/drawable-mdpi/ic_laptop_black_32dp.png b/res/drawable-mdpi/ic_laptop_black_32dp.png
deleted file mode 100644
index 795f9991d..000000000
Binary files a/res/drawable-mdpi/ic_laptop_black_32dp.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_laptop_light_32dp.png b/res/drawable-mdpi/ic_laptop_light_32dp.png
deleted file mode 100644
index 58d056ffd..000000000
Binary files a/res/drawable-mdpi/ic_laptop_light_32dp.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_laptop_white_24dp.png b/res/drawable-mdpi/ic_laptop_white_24dp.png
new file mode 100644
index 000000000..7d7219dc6
Binary files /dev/null and b/res/drawable-mdpi/ic_laptop_white_24dp.png differ
diff --git a/res/drawable-mdpi/ic_notifications_black.png b/res/drawable-mdpi/ic_notifications_black.png
deleted file mode 100644
index 3bc2d671b..000000000
Binary files a/res/drawable-mdpi/ic_notifications_black.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_notifications_black_24dp.png b/res/drawable-mdpi/ic_notifications_black_24dp.png
new file mode 100644
index 000000000..8aebe8825
Binary files /dev/null and b/res/drawable-mdpi/ic_notifications_black_24dp.png differ
diff --git a/res/drawable-mdpi/ic_notifications_gray.png b/res/drawable-mdpi/ic_notifications_gray.png
deleted file mode 100644
index f36b4efca..000000000
Binary files a/res/drawable-mdpi/ic_notifications_gray.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_notifications_white_24dp.png b/res/drawable-mdpi/ic_notifications_white_24dp.png
new file mode 100644
index 000000000..fee93eea6
Binary files /dev/null and b/res/drawable-mdpi/ic_notifications_white_24dp.png differ
diff --git a/res/drawable-mdpi/ic_security_black_24dp.png b/res/drawable-mdpi/ic_security_black_24dp.png
new file mode 100644
index 000000000..677632000
Binary files /dev/null and b/res/drawable-mdpi/ic_security_black_24dp.png differ
diff --git a/res/drawable-mdpi/ic_textsms_black_24dp.png b/res/drawable-mdpi/ic_textsms_black_24dp.png
new file mode 100644
index 000000000..1589c3ae9
Binary files /dev/null and b/res/drawable-mdpi/ic_textsms_black_24dp.png differ
diff --git a/res/drawable-mdpi/ic_textsms_black_32dp.png b/res/drawable-mdpi/ic_textsms_black_32dp.png
deleted file mode 100644
index efb482e66..000000000
Binary files a/res/drawable-mdpi/ic_textsms_black_32dp.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_textsms_grey_32dp.png b/res/drawable-mdpi/ic_textsms_grey_32dp.png
deleted file mode 100644
index bad115a42..000000000
Binary files a/res/drawable-mdpi/ic_textsms_grey_32dp.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_textsms_white_24dp.png b/res/drawable-mdpi/ic_textsms_white_24dp.png
new file mode 100644
index 000000000..eb009035f
Binary files /dev/null and b/res/drawable-mdpi/ic_textsms_white_24dp.png differ
diff --git a/res/drawable-xhdpi/ic_advanced_black.png b/res/drawable-xhdpi/ic_advanced_black.png
deleted file mode 100644
index 3620a1c2a..000000000
Binary files a/res/drawable-xhdpi/ic_advanced_black.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_advanced_black_24dp.png b/res/drawable-xhdpi/ic_advanced_black_24dp.png
new file mode 100644
index 000000000..e45089616
Binary files /dev/null and b/res/drawable-xhdpi/ic_advanced_black_24dp.png differ
diff --git a/res/drawable-xhdpi/ic_advanced_gray.png b/res/drawable-xhdpi/ic_advanced_gray.png
deleted file mode 100644
index 9d6a35ab6..000000000
Binary files a/res/drawable-xhdpi/ic_advanced_gray.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_advanced_white_24dp.png b/res/drawable-xhdpi/ic_advanced_white_24dp.png
new file mode 100644
index 000000000..bb697e738
Binary files /dev/null and b/res/drawable-xhdpi/ic_advanced_white_24dp.png differ
diff --git a/res/drawable-xhdpi/ic_app_protection_black.png b/res/drawable-xhdpi/ic_app_protection_black.png
deleted file mode 100644
index 0fb36e5be..000000000
Binary files a/res/drawable-xhdpi/ic_app_protection_black.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_app_protection_gray.png b/res/drawable-xhdpi/ic_app_protection_gray.png
deleted file mode 100644
index c4001ab5a..000000000
Binary files a/res/drawable-xhdpi/ic_app_protection_gray.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_brightness_6_black.png b/res/drawable-xhdpi/ic_brightness_6_black.png
deleted file mode 100644
index f41d1e647..000000000
Binary files a/res/drawable-xhdpi/ic_brightness_6_black.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_brightness_6_black_24dp.png b/res/drawable-xhdpi/ic_brightness_6_black_24dp.png
new file mode 100644
index 000000000..b9f860428
Binary files /dev/null and b/res/drawable-xhdpi/ic_brightness_6_black_24dp.png differ
diff --git a/res/drawable-xhdpi/ic_brightness_6_gray.png b/res/drawable-xhdpi/ic_brightness_6_gray.png
deleted file mode 100644
index 57f841a90..000000000
Binary files a/res/drawable-xhdpi/ic_brightness_6_gray.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_brightness_6_white_24dp.png b/res/drawable-xhdpi/ic_brightness_6_white_24dp.png
new file mode 100644
index 000000000..91567f02f
Binary files /dev/null and b/res/drawable-xhdpi/ic_brightness_6_white_24dp.png differ
diff --git a/res/drawable-xhdpi/ic_forum_black_24dp.png b/res/drawable-xhdpi/ic_forum_black_24dp.png
new file mode 100644
index 000000000..91ef28df2
Binary files /dev/null and b/res/drawable-xhdpi/ic_forum_black_24dp.png differ
diff --git a/res/drawable-xhdpi/ic_forum_black_32dp.png b/res/drawable-xhdpi/ic_forum_black_32dp.png
deleted file mode 100644
index 2048b9c1e..000000000
Binary files a/res/drawable-xhdpi/ic_forum_black_32dp.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_forum_grey_32dp.png b/res/drawable-xhdpi/ic_forum_grey_32dp.png
deleted file mode 100644
index a9981ee98..000000000
Binary files a/res/drawable-xhdpi/ic_forum_grey_32dp.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_forum_white_24dp.png b/res/drawable-xhdpi/ic_forum_white_24dp.png
new file mode 100644
index 000000000..88268845b
Binary files /dev/null and b/res/drawable-xhdpi/ic_forum_white_24dp.png differ
diff --git a/res/drawable-xhdpi/ic_laptop_black_24dp.png b/res/drawable-xhdpi/ic_laptop_black_24dp.png
new file mode 100644
index 000000000..499b07c44
Binary files /dev/null and b/res/drawable-xhdpi/ic_laptop_black_24dp.png differ
diff --git a/res/drawable-xhdpi/ic_laptop_black_32dp.png b/res/drawable-xhdpi/ic_laptop_black_32dp.png
deleted file mode 100644
index c1228164b..000000000
Binary files a/res/drawable-xhdpi/ic_laptop_black_32dp.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_laptop_light_32dp.png b/res/drawable-xhdpi/ic_laptop_light_32dp.png
deleted file mode 100644
index 34e1a1efb..000000000
Binary files a/res/drawable-xhdpi/ic_laptop_light_32dp.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_laptop_white_24dp.png b/res/drawable-xhdpi/ic_laptop_white_24dp.png
new file mode 100644
index 000000000..30dc459a9
Binary files /dev/null and b/res/drawable-xhdpi/ic_laptop_white_24dp.png differ
diff --git a/res/drawable-xhdpi/ic_notifications_black.png b/res/drawable-xhdpi/ic_notifications_black.png
deleted file mode 100644
index 336329f61..000000000
Binary files a/res/drawable-xhdpi/ic_notifications_black.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_notifications_black_24dp.png b/res/drawable-xhdpi/ic_notifications_black_24dp.png
new file mode 100644
index 000000000..fbe581dad
Binary files /dev/null and b/res/drawable-xhdpi/ic_notifications_black_24dp.png differ
diff --git a/res/drawable-xhdpi/ic_notifications_gray.png b/res/drawable-xhdpi/ic_notifications_gray.png
deleted file mode 100644
index 506d85c00..000000000
Binary files a/res/drawable-xhdpi/ic_notifications_gray.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_notifications_white_24dp.png b/res/drawable-xhdpi/ic_notifications_white_24dp.png
new file mode 100644
index 000000000..aefc6cd60
Binary files /dev/null and b/res/drawable-xhdpi/ic_notifications_white_24dp.png differ
diff --git a/res/drawable-xhdpi/ic_security_black_24dp.png b/res/drawable-xhdpi/ic_security_black_24dp.png
new file mode 100644
index 000000000..b32465602
Binary files /dev/null and b/res/drawable-xhdpi/ic_security_black_24dp.png differ
diff --git a/res/drawable-xhdpi/ic_textsms_black_24dp.png b/res/drawable-xhdpi/ic_textsms_black_24dp.png
new file mode 100644
index 000000000..37c51f95c
Binary files /dev/null and b/res/drawable-xhdpi/ic_textsms_black_24dp.png differ
diff --git a/res/drawable-xhdpi/ic_textsms_black_32dp.png b/res/drawable-xhdpi/ic_textsms_black_32dp.png
deleted file mode 100644
index ef8cfe04f..000000000
Binary files a/res/drawable-xhdpi/ic_textsms_black_32dp.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_textsms_grey_32dp.png b/res/drawable-xhdpi/ic_textsms_grey_32dp.png
deleted file mode 100644
index 8bf0991bd..000000000
Binary files a/res/drawable-xhdpi/ic_textsms_grey_32dp.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_textsms_white_24dp.png b/res/drawable-xhdpi/ic_textsms_white_24dp.png
new file mode 100644
index 000000000..d89155a17
Binary files /dev/null and b/res/drawable-xhdpi/ic_textsms_white_24dp.png differ
diff --git a/res/drawable-xxhdpi/ic_advanced_black.png b/res/drawable-xxhdpi/ic_advanced_black.png
deleted file mode 100644
index fbab1e566..000000000
Binary files a/res/drawable-xxhdpi/ic_advanced_black.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_advanced_black_24dp.png b/res/drawable-xxhdpi/ic_advanced_black_24dp.png
new file mode 100644
index 000000000..d9de0aa28
Binary files /dev/null and b/res/drawable-xxhdpi/ic_advanced_black_24dp.png differ
diff --git a/res/drawable-xxhdpi/ic_advanced_gray.png b/res/drawable-xxhdpi/ic_advanced_gray.png
deleted file mode 100644
index d7dfd11e5..000000000
Binary files a/res/drawable-xxhdpi/ic_advanced_gray.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_advanced_white_24dp.png b/res/drawable-xxhdpi/ic_advanced_white_24dp.png
new file mode 100644
index 000000000..3ddb66e76
Binary files /dev/null and b/res/drawable-xxhdpi/ic_advanced_white_24dp.png differ
diff --git a/res/drawable-xxhdpi/ic_app_protection_black.png b/res/drawable-xxhdpi/ic_app_protection_black.png
deleted file mode 100644
index 959c7c607..000000000
Binary files a/res/drawable-xxhdpi/ic_app_protection_black.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_app_protection_gray.png b/res/drawable-xxhdpi/ic_app_protection_gray.png
deleted file mode 100644
index b445adc26..000000000
Binary files a/res/drawable-xxhdpi/ic_app_protection_gray.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_brightness_6_black.png b/res/drawable-xxhdpi/ic_brightness_6_black.png
deleted file mode 100644
index ecf9e4e21..000000000
Binary files a/res/drawable-xxhdpi/ic_brightness_6_black.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_brightness_6_black_24dp.png b/res/drawable-xxhdpi/ic_brightness_6_black_24dp.png
new file mode 100644
index 000000000..7664ef881
Binary files /dev/null and b/res/drawable-xxhdpi/ic_brightness_6_black_24dp.png differ
diff --git a/res/drawable-xxhdpi/ic_brightness_6_gray.png b/res/drawable-xxhdpi/ic_brightness_6_gray.png
deleted file mode 100644
index c591d9307..000000000
Binary files a/res/drawable-xxhdpi/ic_brightness_6_gray.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_brightness_6_white_24dp.png b/res/drawable-xxhdpi/ic_brightness_6_white_24dp.png
new file mode 100644
index 000000000..194c22d48
Binary files /dev/null and b/res/drawable-xxhdpi/ic_brightness_6_white_24dp.png differ
diff --git a/res/drawable-xxhdpi/ic_forum_black_24dp.png b/res/drawable-xxhdpi/ic_forum_black_24dp.png
new file mode 100644
index 000000000..69146b20a
Binary files /dev/null and b/res/drawable-xxhdpi/ic_forum_black_24dp.png differ
diff --git a/res/drawable-xxhdpi/ic_forum_black_32dp.png b/res/drawable-xxhdpi/ic_forum_black_32dp.png
deleted file mode 100644
index 22468201a..000000000
Binary files a/res/drawable-xxhdpi/ic_forum_black_32dp.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_forum_grey_32dp.png b/res/drawable-xxhdpi/ic_forum_grey_32dp.png
deleted file mode 100644
index 07031d106..000000000
Binary files a/res/drawable-xxhdpi/ic_forum_grey_32dp.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_forum_white_24dp.png b/res/drawable-xxhdpi/ic_forum_white_24dp.png
new file mode 100644
index 000000000..293b773d4
Binary files /dev/null and b/res/drawable-xxhdpi/ic_forum_white_24dp.png differ
diff --git a/res/drawable-xxhdpi/ic_laptop_black_24dp.png b/res/drawable-xxhdpi/ic_laptop_black_24dp.png
new file mode 100644
index 000000000..01e187043
Binary files /dev/null and b/res/drawable-xxhdpi/ic_laptop_black_24dp.png differ
diff --git a/res/drawable-xxhdpi/ic_laptop_black_32dp.png b/res/drawable-xxhdpi/ic_laptop_black_32dp.png
deleted file mode 100644
index c86e7c4ad..000000000
Binary files a/res/drawable-xxhdpi/ic_laptop_black_32dp.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_laptop_light_32dp.png b/res/drawable-xxhdpi/ic_laptop_light_32dp.png
deleted file mode 100644
index f13d25e42..000000000
Binary files a/res/drawable-xxhdpi/ic_laptop_light_32dp.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_laptop_white_24dp.png b/res/drawable-xxhdpi/ic_laptop_white_24dp.png
new file mode 100644
index 000000000..9c2d422f8
Binary files /dev/null and b/res/drawable-xxhdpi/ic_laptop_white_24dp.png differ
diff --git a/res/drawable-xxhdpi/ic_notifications_black.png b/res/drawable-xxhdpi/ic_notifications_black.png
deleted file mode 100644
index fe9be8cc8..000000000
Binary files a/res/drawable-xxhdpi/ic_notifications_black.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_notifications_black_24dp.png b/res/drawable-xxhdpi/ic_notifications_black_24dp.png
new file mode 100644
index 000000000..008f7bc1c
Binary files /dev/null and b/res/drawable-xxhdpi/ic_notifications_black_24dp.png differ
diff --git a/res/drawable-xxhdpi/ic_notifications_gray.png b/res/drawable-xxhdpi/ic_notifications_gray.png
deleted file mode 100644
index 2043b8e33..000000000
Binary files a/res/drawable-xxhdpi/ic_notifications_gray.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_notifications_white_24dp.png b/res/drawable-xxhdpi/ic_notifications_white_24dp.png
new file mode 100644
index 000000000..9bf2038e1
Binary files /dev/null and b/res/drawable-xxhdpi/ic_notifications_white_24dp.png differ
diff --git a/res/drawable-xxhdpi/ic_security_black_24dp.png b/res/drawable-xxhdpi/ic_security_black_24dp.png
new file mode 100644
index 000000000..e51bdb32f
Binary files /dev/null and b/res/drawable-xxhdpi/ic_security_black_24dp.png differ
diff --git a/res/drawable-xxhdpi/ic_textsms_black_24dp.png b/res/drawable-xxhdpi/ic_textsms_black_24dp.png
new file mode 100644
index 000000000..cbe60ee5a
Binary files /dev/null and b/res/drawable-xxhdpi/ic_textsms_black_24dp.png differ
diff --git a/res/drawable-xxhdpi/ic_textsms_black_32dp.png b/res/drawable-xxhdpi/ic_textsms_black_32dp.png
deleted file mode 100644
index 0b8b2b0f7..000000000
Binary files a/res/drawable-xxhdpi/ic_textsms_black_32dp.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_textsms_grey_32dp.png b/res/drawable-xxhdpi/ic_textsms_grey_32dp.png
deleted file mode 100644
index ffb8a5a70..000000000
Binary files a/res/drawable-xxhdpi/ic_textsms_grey_32dp.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_textsms_white_24dp.png b/res/drawable-xxhdpi/ic_textsms_white_24dp.png
new file mode 100644
index 000000000..e83f7cf16
Binary files /dev/null and b/res/drawable-xxhdpi/ic_textsms_white_24dp.png differ
diff --git a/res/drawable-xxxhdpi/ic_advanced_black_24dp.png b/res/drawable-xxxhdpi/ic_advanced_black_24dp.png
new file mode 100644
index 000000000..f10eb6d20
Binary files /dev/null and b/res/drawable-xxxhdpi/ic_advanced_black_24dp.png differ
diff --git a/res/drawable-xxxhdpi/ic_advanced_white_24dp.png b/res/drawable-xxxhdpi/ic_advanced_white_24dp.png
new file mode 100644
index 000000000..4739d2271
Binary files /dev/null and b/res/drawable-xxxhdpi/ic_advanced_white_24dp.png differ
diff --git a/res/drawable-xxxhdpi/ic_brightness_6_black_24dp.png b/res/drawable-xxxhdpi/ic_brightness_6_black_24dp.png
new file mode 100644
index 000000000..b6148f918
Binary files /dev/null and b/res/drawable-xxxhdpi/ic_brightness_6_black_24dp.png differ
diff --git a/res/drawable-xxxhdpi/ic_brightness_6_white_24dp.png b/res/drawable-xxxhdpi/ic_brightness_6_white_24dp.png
new file mode 100644
index 000000000..b28619380
Binary files /dev/null and b/res/drawable-xxxhdpi/ic_brightness_6_white_24dp.png differ
diff --git a/res/drawable-xxxhdpi/ic_forum_black_24dp.png b/res/drawable-xxxhdpi/ic_forum_black_24dp.png
new file mode 100644
index 000000000..cf8dbb36e
Binary files /dev/null and b/res/drawable-xxxhdpi/ic_forum_black_24dp.png differ
diff --git a/res/drawable-xxxhdpi/ic_forum_black_32dp.png b/res/drawable-xxxhdpi/ic_forum_black_32dp.png
deleted file mode 100644
index 8063a274f..000000000
Binary files a/res/drawable-xxxhdpi/ic_forum_black_32dp.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_forum_grey_32dp.png b/res/drawable-xxxhdpi/ic_forum_grey_32dp.png
deleted file mode 100644
index 008345bbc..000000000
Binary files a/res/drawable-xxxhdpi/ic_forum_grey_32dp.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_forum_white_24dp.png b/res/drawable-xxxhdpi/ic_forum_white_24dp.png
new file mode 100644
index 000000000..cf0232f6f
Binary files /dev/null and b/res/drawable-xxxhdpi/ic_forum_white_24dp.png differ
diff --git a/res/drawable-xxxhdpi/ic_laptop_black_24dp.png b/res/drawable-xxxhdpi/ic_laptop_black_24dp.png
new file mode 100644
index 000000000..0c4b00317
Binary files /dev/null and b/res/drawable-xxxhdpi/ic_laptop_black_24dp.png differ
diff --git a/res/drawable-xxxhdpi/ic_laptop_white_24dp.png b/res/drawable-xxxhdpi/ic_laptop_white_24dp.png
new file mode 100644
index 000000000..7ecc7b60d
Binary files /dev/null and b/res/drawable-xxxhdpi/ic_laptop_white_24dp.png differ
diff --git a/res/drawable-xxxhdpi/ic_notifications_black_24dp.png b/res/drawable-xxxhdpi/ic_notifications_black_24dp.png
new file mode 100644
index 000000000..f548f0e91
Binary files /dev/null and b/res/drawable-xxxhdpi/ic_notifications_black_24dp.png differ
diff --git a/res/drawable-xxxhdpi/ic_notifications_white_24dp.png b/res/drawable-xxxhdpi/ic_notifications_white_24dp.png
new file mode 100644
index 000000000..09bd38714
Binary files /dev/null and b/res/drawable-xxxhdpi/ic_notifications_white_24dp.png differ
diff --git a/res/drawable-xxxhdpi/ic_security_black_24dp.png b/res/drawable-xxxhdpi/ic_security_black_24dp.png
new file mode 100644
index 000000000..cd50cfd7c
Binary files /dev/null and b/res/drawable-xxxhdpi/ic_security_black_24dp.png differ
diff --git a/res/drawable-xxxhdpi/ic_textsms_black_24dp.png b/res/drawable-xxxhdpi/ic_textsms_black_24dp.png
new file mode 100644
index 000000000..cdf94b91b
Binary files /dev/null and b/res/drawable-xxxhdpi/ic_textsms_black_24dp.png differ
diff --git a/res/drawable-xxxhdpi/ic_textsms_black_32dp.png b/res/drawable-xxxhdpi/ic_textsms_black_32dp.png
deleted file mode 100644
index c0712d0bc..000000000
Binary files a/res/drawable-xxxhdpi/ic_textsms_black_32dp.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_textsms_grey_32dp.png b/res/drawable-xxxhdpi/ic_textsms_grey_32dp.png
deleted file mode 100644
index f47cc38ad..000000000
Binary files a/res/drawable-xxxhdpi/ic_textsms_grey_32dp.png and /dev/null differ
diff --git a/res/drawable-xxxhdpi/ic_textsms_white_24dp.png b/res/drawable-xxxhdpi/ic_textsms_white_24dp.png
new file mode 100644
index 000000000..9b27769cf
Binary files /dev/null and b/res/drawable-xxxhdpi/ic_textsms_white_24dp.png differ
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 0ab014834..cf026858b 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -208,13 +208,13 @@
 
         <item name="reminder_header_background">#ff1d85d7</item>
 
-        <item name="pref_ic_sms_mms">@drawable/ic_textsms_black_32dp</item>
-        <item name="pref_ic_notifications">@drawable/ic_notifications_black</item>
-        <item name="pref_ic_app_protection">@drawable/ic_app_protection_black</item>
-        <item name="pref_ic_appearance">@drawable/ic_brightness_6_black</item>
-        <item name="pref_ic_chats">@drawable/ic_forum_black_32dp</item>
-        <item name="pref_ic_devices">@drawable/ic_laptop_black_32dp</item>
-        <item name="pref_ic_advanced">@drawable/ic_advanced_black</item>
+        <item name="pref_ic_sms_mms">@drawable/ic_textsms_black_24dp</item>
+        <item name="pref_ic_notifications">@drawable/ic_notifications_black_24dp</item>
+        <item name="pref_ic_app_protection">@drawable/ic_security_black_24dp</item>
+        <item name="pref_ic_appearance">@drawable/ic_brightness_6_black_24dp</item>
+        <item name="pref_ic_chats">@drawable/ic_forum_black_24dp</item>
+        <item name="pref_ic_devices">@drawable/ic_laptop_black_24dp</item>
+        <item name="pref_ic_advanced">@drawable/ic_advanced_black_24dp</item>
 
         <item name="app_protect_timeout_picker_color">@style/BetterPickersDialogFragment.Light</item>
 
@@ -338,13 +338,13 @@
 
         <item name="reminder_header_background">@color/textsecure_primary_dark</item>
 
-        <item name="pref_ic_sms_mms">@drawable/ic_textsms_grey_32dp</item>
-        <item name="pref_ic_notifications">@drawable/ic_notifications_gray</item>
-        <item name="pref_ic_app_protection">@drawable/ic_app_protection_gray</item>
-        <item name="pref_ic_appearance">@drawable/ic_brightness_6_gray</item>
-        <item name="pref_ic_chats">@drawable/ic_forum_grey_32dp</item>
-        <item name="pref_ic_devices">@drawable/ic_laptop_light_32dp</item>
-        <item name="pref_ic_advanced">@drawable/ic_advanced_gray</item>
+        <item name="pref_ic_sms_mms">@drawable/ic_textsms_white_24dp</item>
+        <item name="pref_ic_notifications">@drawable/ic_notifications_white_24dp</item>
+        <item name="pref_ic_app_protection">@drawable/ic_security_white_24dp</item>
+        <item name="pref_ic_appearance">@drawable/ic_brightness_6_white_24dp</item>
+        <item name="pref_ic_chats">@drawable/ic_forum_white_24dp</item>
+        <item name="pref_ic_devices">@drawable/ic_laptop_white_24dp</item>
+        <item name="pref_ic_advanced">@drawable/ic_advanced_white_24dp</item>
 
         <item name="app_protect_timeout_picker_color">@style/BetterPickersDialogFragment</item>