diff --git a/res/drawable-hdpi/ic_advanced_black.png b/res/drawable-hdpi/ic_advanced_black.png
deleted file mode 100644
index 21f955b3ff..0000000000
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 0000000000..ab07536e5d
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 a095c66155..0000000000
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 0000000000..3ce85689dd
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 5e61572be1..0000000000
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 8ee2c0b7ea..0000000000
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 897bddf367..0000000000
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 0000000000..7e9f3976ec
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 70c0dfa59a..0000000000
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 0000000000..7e9a08756d
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 0000000000..373168bd9c
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 4911236d4b..0000000000
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 37c69a18a5..0000000000
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 0000000000..2a8fb7e0c9
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 0000000000..e175dcb77a
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 c87e01d547..0000000000
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 0f8d1680fb..0000000000
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 0000000000..96703f315d
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 bae2907b41..0000000000
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 0000000000..876681f224
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 af04f236de..0000000000
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 0000000000..e5617555ee
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 0000000000..ec30bf1e7d
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 0000000000..0fc43a9a4d
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 091c4487a7..0000000000
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 6882ef608d..0000000000
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 0000000000..9fb0f46a42
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 be6c2d76c6..0000000000
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 0000000000..2e9ba9c667
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 782eee96a3..0000000000
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 0000000000..65af51ba04
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 0f5ff12b19..0000000000
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 31e38a6da4..0000000000
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 88f0da4732..0000000000
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 0000000000..66555bac97
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 4eb5746c0e..0000000000
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 0000000000..e360fb747d
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 0000000000..68f193dcf9
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 7840302c1c..0000000000
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 00b00cea10..0000000000
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 0000000000..770224b9f6
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 0000000000..29b3b50ec8
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 795f9991d3..0000000000
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 58d056ffd6..0000000000
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 0000000000..7d7219dc6c
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 3bc2d671b0..0000000000
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 0000000000..8aebe88250
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 f36b4efca6..0000000000
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 0000000000..fee93eea6b
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 0000000000..677632000c
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 0000000000..1589c3ae92
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 efb482e663..0000000000
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 bad115a429..0000000000
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 0000000000..eb009035fc
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 3620a1c2ac..0000000000
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 0000000000..e45089616b
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 9d6a35ab6b..0000000000
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 0000000000..bb697e7388
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 0fb36e5bec..0000000000
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 c4001ab5a3..0000000000
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 f41d1e6474..0000000000
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 0000000000..b9f860428b
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 57f841a909..0000000000
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 0000000000..91567f02f1
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 0000000000..91ef28df28
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 2048b9c1e0..0000000000
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 a9981ee985..0000000000
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 0000000000..88268845b6
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 0000000000..499b07c444
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 c1228164b2..0000000000
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 34e1a1efb4..0000000000
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 0000000000..30dc459a9f
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 336329f61a..0000000000
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 0000000000..fbe581dad0
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 506d85c004..0000000000
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 0000000000..aefc6cd603
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 0000000000..b32465602e
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 0000000000..37c51f95cd
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 ef8cfe04f4..0000000000
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 8bf0991bdb..0000000000
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 0000000000..d89155a174
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 fbab1e5668..0000000000
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 0000000000..d9de0aa280
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 d7dfd11e5d..0000000000
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 0000000000..3ddb66e76b
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 959c7c6076..0000000000
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 b445adc26b..0000000000
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 ecf9e4e217..0000000000
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 0000000000..7664ef8818
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 c591d93077..0000000000
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 0000000000..194c22d48c
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 0000000000..69146b20af
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 22468201a5..0000000000
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 07031d1062..0000000000
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 0000000000..293b773d46
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 0000000000..01e1870439
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 c86e7c4ada..0000000000
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 f13d25e424..0000000000
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 0000000000..9c2d422f8b
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 fe9be8cc8a..0000000000
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 0000000000..008f7bc1c5
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 2043b8e337..0000000000
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 0000000000..9bf2038e12
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 0000000000..e51bdb32f3
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 0000000000..cbe60ee5a9
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 0b8b2b0f79..0000000000
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 ffb8a5a70d..0000000000
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 0000000000..e83f7cf16e
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 0000000000..f10eb6d20a
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 0000000000..4739d22711
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 0000000000..b6148f9181
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 0000000000..b286193805
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 0000000000..cf8dbb36ee
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 8063a274fb..0000000000
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 008345bbc5..0000000000
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 0000000000..cf0232f6f3
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 0000000000..0c4b003176
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 0000000000..7ecc7b60d5
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 0000000000..f548f0e919
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 0000000000..09bd387145
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 0000000000..cd50cfd7cf
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 0000000000..cdf94b91be
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 c0712d0bc2..0000000000
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 f47cc38adf..0000000000
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 0000000000..9b27769cfb
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 0ab0148340..cf026858b6 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -208,13 +208,13 @@
- #ff1d85d7
- - @drawable/ic_textsms_black_32dp
- - @drawable/ic_notifications_black
- - @drawable/ic_app_protection_black
- - @drawable/ic_brightness_6_black
- - @drawable/ic_forum_black_32dp
- - @drawable/ic_laptop_black_32dp
- - @drawable/ic_advanced_black
+ - @drawable/ic_textsms_black_24dp
+ - @drawable/ic_notifications_black_24dp
+ - @drawable/ic_security_black_24dp
+ - @drawable/ic_brightness_6_black_24dp
+ - @drawable/ic_forum_black_24dp
+ - @drawable/ic_laptop_black_24dp
+ - @drawable/ic_advanced_black_24dp
- @style/BetterPickersDialogFragment.Light
@@ -338,13 +338,13 @@
- @color/textsecure_primary_dark
- - @drawable/ic_textsms_grey_32dp
- - @drawable/ic_notifications_gray
- - @drawable/ic_app_protection_gray
- - @drawable/ic_brightness_6_gray
- - @drawable/ic_forum_grey_32dp
- - @drawable/ic_laptop_light_32dp
- - @drawable/ic_advanced_gray
+ - @drawable/ic_textsms_white_24dp
+ - @drawable/ic_notifications_white_24dp
+ - @drawable/ic_security_white_24dp
+ - @drawable/ic_brightness_6_white_24dp
+ - @drawable/ic_forum_white_24dp
+ - @drawable/ic_laptop_white_24dp
+ - @drawable/ic_advanced_white_24dp
- @style/BetterPickersDialogFragment