diff --git a/images/drawable-src/ic_action_request_read_receipt_dark.svg b/images/drawable-src/ic_action_request_read_receipt_dark.svg
new file mode 100644
index 000000000..d4d9619d2
--- /dev/null
+++ b/images/drawable-src/ic_action_request_read_receipt_dark.svg
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48"
+   height="48"
+   id="svg3870"
+   version="1.1"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="ic_action_request_read_receipt_dark.svg"
+   inkscape:export-xdpi="45"
+   inkscape:export-ydpi="45">
+  <defs
+     id="defs3872">
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath1512">
+      <path
+         inkscape:connector-curvature="0"
+         d="M 0,96 96,96 96,0 0,0 0,96 z"
+         id="path1514" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath1272">
+      <path
+         inkscape:connector-curvature="0"
+         d="M 0,96 96,96 96,0 0,0 0,96 z"
+         id="path1274" />
+    </clipPath>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.313709"
+     inkscape:cx="25.235612"
+     inkscape:cy="19.434664"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="1138"
+     inkscape:window-x="1592"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata3875">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1004.3622)">
+    <g
+       id="g5056">
+      <path
+         id="path4928"
+         d="m 23.968604,1038.3897 c -2.726957,0 -4.9456,-2.1554 -5.057229,-4.8554 l -12.853875,-6.3908 0,18.7398 35.885,0 0,-18.7398 -12.915171,6.3898 c -0.112627,2.701 -2.330273,4.8564 -5.058725,4.8564"
+         style="fill:#ffffff;fill-opacity:0.50196081;fill-rule:nonzero;stroke:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path1278"
+         d="m 16.75,1014.4247 -10.6875,5.3125 0,5.1875 3,0 0,-3.4687 13,0 c 0.05422,-0.061 0.0994,-0.1282 0.15625,-0.1875 0.458001,-0.4782 0.984985,-0.9244 1.59375,-1.4063 0.492732,-0.3871 0.899107,-0.7444 1.21875,-1.0312 0.283638,-0.2541 0.523574,-0.4869 0.6875,-0.7188 0.141767,-0.2005 0.22254,-0.42 0.28125,-0.625 0.06258,-0.2195 0.125,-0.5071 0.125,-0.8437 0,-0.4248 -0.101961,-0.5806 -0.34375,-0.8125 -0.157294,-0.1514 -0.508186,-0.3438 -1.28125,-0.3438 -0.685423,0 -1.446773,0.1333 -2.28125,0.4375 -0.911223,0.3328 -1.855872,0.7306 -2.84375,1.2188 a 1.2023317,1.2023317 0 0 1 -1.625,-0.5625 l -1,-2.1563 z m 16.9375,1.2188 c 0.0214,0.2542 0.03125,0.4862 0.03125,0.75 0,0.8442 -0.07523,1.6158 -0.28125,2.3437 -0.200744,0.7089 -0.511916,1.3909 -0.90625,2 -0.152557,0.2353 -0.322454,0.4878 -0.5,0.7188 l 6.9375,0 0,3.4687 2.96875,0 0,-5.1875 -8.25,-4.0937 z"
+         style="fill:#ffffff;fill-opacity:0.50196081;fill-rule:nonzero;stroke:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path4900"
+         d="m 20.715646,1034.057 c 0,-0.5655 0.08122,-1.0441 0.244118,-1.4353 0.162018,-0.3913 0.387794,-0.7073 0.676457,-0.9483 0.289098,-0.241 0.629292,-0.4147 1.020577,-0.5232 0.390851,-0.1079 0.809213,-0.1628 1.254651,-0.1628 0.421422,0 0.821877,0.055 1.200939,0.1628 0.379059,0.1093 0.713138,0.2822 1.002237,0.5232 0.288661,0.241 0.517494,0.557 0.686061,0.9483 0.168569,0.3912 0.25329,0.8698 0.25329,1.4353 0,0.5418 -0.08471,1.0052 -0.25329,1.3904 -0.168567,0.3851 -0.3974,0.7044 -0.686061,0.9573 -0.289099,0.2524 -0.623178,0.4359 -1.002237,0.5508 -0.379062,0.1136 -0.779517,0.171 -1.200939,0.171 -0.445438,0 -0.8638,-0.057 -1.254651,-0.171 -0.391285,-0.1151 -0.731479,-0.2984 -1.020577,-0.5508 -0.288663,-0.2529 -0.514439,-0.5722 -0.676457,-0.9573 -0.162889,-0.3852 -0.244118,-0.8486 -0.244118,-1.3904"
+         style="fill:#ffffff;fill-opacity:0.50196081;fill-rule:nonzero;stroke:none"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path1518"
+         d="m 21.311312,1027.8812 0,-1.336 c 0,-0.6139 0.06332,-1.1706 0.189966,-1.6702 0.126208,-0.4996 0.318358,-0.9754 0.577323,-1.4269 0.259405,-0.451 0.593045,-0.8904 1.002237,-1.3178 0.409192,-0.4273 0.903105,-0.8699 1.480866,-1.3273 0.505703,-0.3973 0.9328,-0.7523 1.281728,-1.0655 0.349362,-0.3128 0.63191,-0.6232 0.848954,-0.9303 0.216602,-0.3064 0.37338,-0.6284 0.469894,-0.9655 0.09607,-0.3368 0.144111,-0.7289 0.144111,-1.1738 0,-0.6865 -0.231889,-1.2526 -0.695234,-1.6974 -0.46378,-0.4462 -1.171242,-0.6682 -2.121509,-0.6682 -0.831049,0 -1.724547,0.1745 -2.681803,0.5235 -0.956385,0.3493 -1.947266,0.7765 -2.970463,1.2822 l -1.842022,-3.9908 c 0.517497,-0.3007 1.08041,-0.5867 1.688739,-0.8575 0.607891,-0.2711 1.239803,-0.5117 1.895732,-0.7221 0.655931,-0.2107 1.32103,-0.3766 1.995303,-0.4969 0.674272,-0.1209 1.336315,-0.1806 1.98657,-0.1806 1.228013,0 2.335056,0.148 3.322446,0.4423 0.987391,0.2953 1.824116,0.7253 2.509742,1.2914 0.6865,0.5655 1.212727,1.2525 1.580432,2.0581 0.366832,0.807 0.550684,1.7277 0.550684,2.7631 0,0.7582 -0.08427,1.4359 -0.252852,2.0315 -0.168566,0.5953 -0.417925,1.15 -0.748947,1.6612 -0.331896,0.512 -0.746765,1.0055 -1.245918,1.4804 -0.500027,0.4756 -1.080843,0.9785 -1.742888,1.5081 -0.505703,0.3974 -0.917952,0.7437 -1.237621,1.0384 -0.318793,0.2948 -0.56815,0.5747 -0.748947,0.8395 -0.180796,0.2655 -0.303947,0.5393 -0.369887,0.8217 -0.06639,0.2827 -0.09956,0.6167 -0.09956,1.0018 l 0,1.0836 -4.767067,0 z"
+         style="fill:#ffffff;fill-opacity:0.50196081;fill-rule:nonzero;stroke:none"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+</svg>
diff --git a/images/drawable-src/ic_action_request_read_receipt_light.svg b/images/drawable-src/ic_action_request_read_receipt_light.svg
new file mode 100644
index 000000000..6bcf90da7
--- /dev/null
+++ b/images/drawable-src/ic_action_request_read_receipt_light.svg
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48"
+   height="48"
+   id="svg3870"
+   version="1.1"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="ic_action_request_read_receipt_light.svg"
+   inkscape:export-xdpi="45"
+   inkscape:export-ydpi="45">
+  <defs
+     id="defs3872">
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath1512">
+      <path
+         inkscape:connector-curvature="0"
+         d="M 0,96 96,96 96,0 0,0 0,96 z"
+         id="path1514" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath1272">
+      <path
+         inkscape:connector-curvature="0"
+         d="M 0,96 96,96 96,0 0,0 0,96 z"
+         id="path1274" />
+    </clipPath>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.313709"
+     inkscape:cx="25.235612"
+     inkscape:cy="19.434664"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="1138"
+     inkscape:window-x="1592"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata3875">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1004.3622)">
+    <g
+       id="g5046">
+      <path
+         id="path4928"
+         d="m 23.968604,1038.3897 c -2.726957,0 -4.9456,-2.1554 -5.057229,-4.8554 l -12.853875,-6.3908 0,18.7398 35.885,0 0,-18.7398 -12.915171,6.3898 c -0.112627,2.701 -2.330273,4.8564 -5.058725,4.8564"
+         style="fill:#323232;fill-opacity:0.60000002;fill-rule:nonzero;stroke:none" />
+      <path
+         id="path1278"
+         transform="translate(0,1004.3622)"
+         d="M 16.75 10.0625 L 6.0625 15.375 L 6.0625 20.5625 L 9.0625 20.5625 L 9.0625 17.09375 L 22.0625 17.09375 C 22.116725 17.03313 22.1619 16.96564 22.21875 16.90625 C 22.676751 16.42805 23.203735 15.9819 23.8125 15.5 C 24.305232 15.1129 24.711607 14.75565 25.03125 14.46875 C 25.314888 14.21475 25.554824 13.9819 25.71875 13.75 C 25.860517 13.5495 25.94129 13.33 26 13.125 C 26.06258 12.9055 26.125 12.61795 26.125 12.28125 C 26.125 11.85645 26.023039 11.70075 25.78125 11.46875 C 25.623956 11.31735 25.273064 11.125 24.5 11.125 C 23.814577 11.125 23.053227 11.2583 22.21875 11.5625 C 21.307527 11.8953 20.362878 12.29305 19.375 12.78125 A 1.2023317 1.2023317 0 0 1 17.75 12.21875 L 16.75 10.0625 z M 33.6875 11.28125 C 33.708903 11.535476 33.71875 11.767494 33.71875 12.03125 C 33.71875 12.87555 33.643522 13.6471 33.4375 14.375 C 33.236756 15.0839 32.925584 15.7659 32.53125 16.375 C 32.378693 16.610297 32.208796 16.862772 32.03125 17.09375 L 38.96875 17.09375 L 38.96875 20.5625 L 41.9375 20.5625 L 41.9375 15.375 L 33.6875 11.28125 z "
+         style="fill:#323232;fill-opacity:0.60000002;fill-rule:nonzero;stroke:none" />
+      <path
+         id="path4900"
+         d="m 20.715646,1034.057 c 0,-0.5655 0.08122,-1.0441 0.244118,-1.4353 0.162018,-0.3913 0.387794,-0.7073 0.676457,-0.9483 0.289098,-0.241 0.629292,-0.4147 1.020577,-0.5232 0.390851,-0.1079 0.809213,-0.1628 1.254651,-0.1628 0.421422,0 0.821877,0.055 1.200939,0.1628 0.379059,0.1093 0.713138,0.2822 1.002237,0.5232 0.288661,0.241 0.517494,0.557 0.686061,0.9483 0.168569,0.3912 0.25329,0.8698 0.25329,1.4353 0,0.5418 -0.08471,1.0052 -0.25329,1.3904 -0.168567,0.3851 -0.3974,0.7044 -0.686061,0.9573 -0.289099,0.2524 -0.623178,0.4359 -1.002237,0.5508 -0.379062,0.1136 -0.779517,0.171 -1.200939,0.171 -0.445438,0 -0.8638,-0.057 -1.254651,-0.171 -0.391285,-0.1151 -0.731479,-0.2984 -1.020577,-0.5508 -0.288663,-0.2529 -0.514439,-0.5722 -0.676457,-0.9573 -0.162889,-0.3852 -0.244118,-0.8486 -0.244118,-1.3904"
+         style="fill:#323232;fill-opacity:0.60000002;fill-rule:nonzero;stroke:none" />
+      <path
+         id="path1518"
+         d="m 21.311312,1027.8812 0,-1.336 c 0,-0.6139 0.06332,-1.1706 0.189966,-1.6702 0.126208,-0.4996 0.318358,-0.9754 0.577323,-1.4269 0.259405,-0.451 0.593045,-0.8904 1.002237,-1.3178 0.409192,-0.4273 0.903105,-0.8699 1.480866,-1.3273 0.505703,-0.3973 0.9328,-0.7523 1.281728,-1.0655 0.349362,-0.3128 0.63191,-0.6232 0.848954,-0.9303 0.216602,-0.3064 0.37338,-0.6284 0.469894,-0.9655 0.09607,-0.3368 0.144111,-0.7289 0.144111,-1.1738 0,-0.6865 -0.231889,-1.2526 -0.695234,-1.6974 -0.46378,-0.4462 -1.171242,-0.6682 -2.121509,-0.6682 -0.831049,0 -1.724547,0.1745 -2.681803,0.5235 -0.956385,0.3493 -1.947266,0.7765 -2.970463,1.2822 l -1.842022,-3.9908 c 0.517497,-0.3007 1.08041,-0.5867 1.688739,-0.8575 0.607891,-0.2711 1.239803,-0.5117 1.895732,-0.7221 0.655931,-0.2107 1.32103,-0.3766 1.995303,-0.4969 0.674272,-0.1209 1.336315,-0.1806 1.98657,-0.1806 1.228013,0 2.335056,0.148 3.322446,0.4423 0.987391,0.2953 1.824116,0.7253 2.509742,1.2914 0.6865,0.5655 1.212727,1.2525 1.580432,2.0581 0.366832,0.807 0.550684,1.7277 0.550684,2.7631 0,0.7582 -0.08427,1.4359 -0.252852,2.0315 -0.168566,0.5953 -0.417925,1.15 -0.748947,1.6612 -0.331896,0.512 -0.746765,1.0055 -1.245918,1.4804 -0.500027,0.4756 -1.080843,0.9785 -1.742888,1.5081 -0.505703,0.3974 -0.917952,0.7437 -1.237621,1.0384 -0.318793,0.2948 -0.56815,0.5747 -0.748947,0.8395 -0.180796,0.2655 -0.303947,0.5393 -0.369887,0.8217 -0.06639,0.2827 -0.09956,0.6167 -0.09956,1.0018 l 0,1.0836 -4.767067,0 z"
+         style="fill:#323232;fill-opacity:0.60000002;fill-rule:nonzero;stroke:none" />
+    </g>
+  </g>
+</svg>
diff --git a/images/drawable-src/ic_menu_envelope.png b/images/drawable-src/ic_menu_envelope.png
deleted file mode 100644
index 9c867bb69..000000000
Binary files a/images/drawable-src/ic_menu_envelope.png and /dev/null differ
diff --git a/images/drawable-src/ic_menu_reply_receipt.psd b/images/drawable-src/ic_menu_reply_receipt.psd
deleted file mode 100644
index 5ef1cbd7b..000000000
Binary files a/images/drawable-src/ic_menu_reply_receipt.psd and /dev/null differ
diff --git a/res/drawable-hdpi/ic_action_about_dark.png b/res/drawable-hdpi/ic_action_about_dark.png
new file mode 100644
index 000000000..6eaf08aec
Binary files /dev/null and b/res/drawable-hdpi/ic_action_about_dark.png differ
diff --git a/res/drawable-hdpi/ic_action_about_light.png b/res/drawable-hdpi/ic_action_about_light.png
new file mode 100644
index 000000000..8f39c428a
Binary files /dev/null and b/res/drawable-hdpi/ic_action_about_light.png differ
diff --git a/res/drawable-hdpi/ic_action_add_dark.png b/res/drawable-hdpi/ic_action_add_dark.png
new file mode 100644
index 000000000..ad8ada6bd
Binary files /dev/null and b/res/drawable-hdpi/ic_action_add_dark.png differ
diff --git a/res/drawable-hdpi/ic_action_add_light.png b/res/drawable-hdpi/ic_action_add_light.png
new file mode 100644
index 000000000..5741995cb
Binary files /dev/null and b/res/drawable-hdpi/ic_action_add_light.png differ
diff --git a/res/drawable-hdpi/ic_action_cancel_dark.png b/res/drawable-hdpi/ic_action_cancel_dark.png
new file mode 100644
index 000000000..094eea589
Binary files /dev/null and b/res/drawable-hdpi/ic_action_cancel_dark.png differ
diff --git a/res/drawable-hdpi/ic_action_cancel_light.png b/res/drawable-hdpi/ic_action_cancel_light.png
new file mode 100644
index 000000000..cde36e1fa
Binary files /dev/null and b/res/drawable-hdpi/ic_action_cancel_light.png differ
diff --git a/res/drawable-hdpi/ic_action_import_export_dark.png b/res/drawable-hdpi/ic_action_import_export_dark.png
new file mode 100644
index 000000000..160a2b8fe
Binary files /dev/null and b/res/drawable-hdpi/ic_action_import_export_dark.png differ
diff --git a/res/drawable-hdpi/ic_action_import_export_light.png b/res/drawable-hdpi/ic_action_import_export_light.png
new file mode 100644
index 000000000..cf7e761ba
Binary files /dev/null and b/res/drawable-hdpi/ic_action_import_export_light.png differ
diff --git a/res/drawable-hdpi/ic_action_request_read_receipt_dark.png b/res/drawable-hdpi/ic_action_request_read_receipt_dark.png
new file mode 100644
index 000000000..1950ff406
Binary files /dev/null and b/res/drawable-hdpi/ic_action_request_read_receipt_dark.png differ
diff --git a/res/drawable-hdpi/ic_action_request_read_receipt_light.png b/res/drawable-hdpi/ic_action_request_read_receipt_light.png
new file mode 100644
index 000000000..173a3b6c3
Binary files /dev/null and b/res/drawable-hdpi/ic_action_request_read_receipt_light.png differ
diff --git a/res/drawable-hdpi/ic_action_save_dark.png b/res/drawable-hdpi/ic_action_save_dark.png
new file mode 100644
index 000000000..306d55a9c
Binary files /dev/null and b/res/drawable-hdpi/ic_action_save_dark.png differ
diff --git a/res/drawable-hdpi/ic_action_save_light.png b/res/drawable-hdpi/ic_action_save_light.png
new file mode 100644
index 000000000..07c2817b5
Binary files /dev/null and b/res/drawable-hdpi/ic_action_save_light.png differ
diff --git a/res/drawable-hdpi/ic_action_select_all_dark.png b/res/drawable-hdpi/ic_action_select_all_dark.png
new file mode 100644
index 000000000..26a270b33
Binary files /dev/null and b/res/drawable-hdpi/ic_action_select_all_dark.png differ
diff --git a/res/drawable-hdpi/ic_action_select_all_light.png b/res/drawable-hdpi/ic_action_select_all_light.png
new file mode 100644
index 000000000..7053d7ac7
Binary files /dev/null and b/res/drawable-hdpi/ic_action_select_all_light.png differ
diff --git a/res/drawable-hdpi/ic_action_upload_dark.png b/res/drawable-hdpi/ic_action_upload_dark.png
new file mode 100644
index 000000000..0faf43b06
Binary files /dev/null and b/res/drawable-hdpi/ic_action_upload_dark.png differ
diff --git a/res/drawable-hdpi/ic_action_upload_light.png b/res/drawable-hdpi/ic_action_upload_light.png
new file mode 100644
index 000000000..d30ee8a83
Binary files /dev/null and b/res/drawable-hdpi/ic_action_upload_light.png differ
diff --git a/res/drawable-hdpi/ic_button_add_contact.png b/res/drawable-hdpi/ic_button_add_contact.png
new file mode 100644
index 000000000..38b91cc7c
Binary files /dev/null and b/res/drawable-hdpi/ic_button_add_contact.png differ
diff --git a/res/drawable-hdpi/ic_menu_add.png b/res/drawable-hdpi/ic_menu_add.png
deleted file mode 100644
index 8f5cd3df7..000000000
Binary files a/res/drawable-hdpi/ic_menu_add.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_menu_attachment.png b/res/drawable-hdpi/ic_menu_attachment.png
deleted file mode 100644
index bc52d8314..000000000
Binary files a/res/drawable-hdpi/ic_menu_attachment.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_menu_cc.png b/res/drawable-hdpi/ic_menu_cc.png
deleted file mode 100644
index 0810f29e8..000000000
Binary files a/res/drawable-hdpi/ic_menu_cc.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_menu_close_clear_cancel.png b/res/drawable-hdpi/ic_menu_close_clear_cancel.png
deleted file mode 100644
index 55ab11ea0..000000000
Binary files a/res/drawable-hdpi/ic_menu_close_clear_cancel.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_menu_delete.png b/res/drawable-hdpi/ic_menu_delete.png
deleted file mode 100644
index ffe9ba6a3..000000000
Binary files a/res/drawable-hdpi/ic_menu_delete.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_menu_preferences.png b/res/drawable-hdpi/ic_menu_preferences.png
deleted file mode 100644
index 98e3d1957..000000000
Binary files a/res/drawable-hdpi/ic_menu_preferences.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_menu_reply_receipt.png b/res/drawable-hdpi/ic_menu_reply_receipt.png
deleted file mode 100644
index dd965ad7c..000000000
Binary files a/res/drawable-hdpi/ic_menu_reply_receipt.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_menu_save_draft.png b/res/drawable-hdpi/ic_menu_save_draft.png
deleted file mode 100644
index 29f3070c2..000000000
Binary files a/res/drawable-hdpi/ic_menu_save_draft.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_menu_select_all.png b/res/drawable-hdpi/ic_menu_select_all.png
deleted file mode 100644
index a409ff31b..000000000
Binary files a/res/drawable-hdpi/ic_menu_select_all.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_show_folders.png b/res/drawable-hdpi/ic_show_folders.png
deleted file mode 100644
index 8698dd362..000000000
Binary files a/res/drawable-hdpi/ic_show_folders.png and /dev/null differ
diff --git a/res/drawable-ldpi/ic_action_about_dark.png b/res/drawable-ldpi/ic_action_about_dark.png
new file mode 100644
index 000000000..dc6d5b13e
Binary files /dev/null and b/res/drawable-ldpi/ic_action_about_dark.png differ
diff --git a/res/drawable-ldpi/ic_action_about_light.png b/res/drawable-ldpi/ic_action_about_light.png
new file mode 100644
index 000000000..40c73633f
Binary files /dev/null and b/res/drawable-ldpi/ic_action_about_light.png differ
diff --git a/res/drawable-ldpi/ic_action_add_dark.png b/res/drawable-ldpi/ic_action_add_dark.png
new file mode 100644
index 000000000..06a81d0bd
Binary files /dev/null and b/res/drawable-ldpi/ic_action_add_dark.png differ
diff --git a/res/drawable-ldpi/ic_action_add_light.png b/res/drawable-ldpi/ic_action_add_light.png
new file mode 100644
index 000000000..c06531db1
Binary files /dev/null and b/res/drawable-ldpi/ic_action_add_light.png differ
diff --git a/res/drawable-ldpi/ic_action_import_export_dark.png b/res/drawable-ldpi/ic_action_import_export_dark.png
new file mode 100644
index 000000000..e9e2da1e8
Binary files /dev/null and b/res/drawable-ldpi/ic_action_import_export_dark.png differ
diff --git a/res/drawable-ldpi/ic_action_import_export_light.png b/res/drawable-ldpi/ic_action_import_export_light.png
new file mode 100644
index 000000000..27ebc65e6
Binary files /dev/null and b/res/drawable-ldpi/ic_action_import_export_light.png differ
diff --git a/res/drawable-ldpi/ic_action_request_read_receipt_dark.png b/res/drawable-ldpi/ic_action_request_read_receipt_dark.png
new file mode 100644
index 000000000..9be12a175
Binary files /dev/null and b/res/drawable-ldpi/ic_action_request_read_receipt_dark.png differ
diff --git a/res/drawable-ldpi/ic_action_request_read_receipt_light.png b/res/drawable-ldpi/ic_action_request_read_receipt_light.png
new file mode 100644
index 000000000..dccb4dbe9
Binary files /dev/null and b/res/drawable-ldpi/ic_action_request_read_receipt_light.png differ
diff --git a/res/drawable-ldpi/ic_action_select_all_dark.png b/res/drawable-ldpi/ic_action_select_all_dark.png
new file mode 100644
index 000000000..a1622d3f5
Binary files /dev/null and b/res/drawable-ldpi/ic_action_select_all_dark.png differ
diff --git a/res/drawable-ldpi/ic_action_select_all_light.png b/res/drawable-ldpi/ic_action_select_all_light.png
new file mode 100644
index 000000000..a8afa76dd
Binary files /dev/null and b/res/drawable-ldpi/ic_action_select_all_light.png differ
diff --git a/res/drawable-ldpi/ic_action_upload_dark.png b/res/drawable-ldpi/ic_action_upload_dark.png
new file mode 100644
index 000000000..4a3bdf4e1
Binary files /dev/null and b/res/drawable-ldpi/ic_action_upload_dark.png differ
diff --git a/res/drawable-ldpi/ic_action_upload_light.png b/res/drawable-ldpi/ic_action_upload_light.png
new file mode 100644
index 000000000..569747f48
Binary files /dev/null and b/res/drawable-ldpi/ic_action_upload_light.png differ
diff --git a/res/drawable-ldpi/ic_button_add_contact.png b/res/drawable-ldpi/ic_button_add_contact.png
new file mode 100644
index 000000000..d7e83a404
Binary files /dev/null and b/res/drawable-ldpi/ic_button_add_contact.png differ
diff --git a/res/drawable-mdpi/ic_action_about_dark.png b/res/drawable-mdpi/ic_action_about_dark.png
new file mode 100644
index 000000000..d7b7e6986
Binary files /dev/null and b/res/drawable-mdpi/ic_action_about_dark.png differ
diff --git a/res/drawable-mdpi/ic_action_about_light.png b/res/drawable-mdpi/ic_action_about_light.png
new file mode 100644
index 000000000..7c57436fc
Binary files /dev/null and b/res/drawable-mdpi/ic_action_about_light.png differ
diff --git a/res/drawable-mdpi/ic_action_add_dark.png b/res/drawable-mdpi/ic_action_add_dark.png
new file mode 100644
index 000000000..4d5d484b3
Binary files /dev/null and b/res/drawable-mdpi/ic_action_add_dark.png differ
diff --git a/res/drawable-mdpi/ic_action_add_light.png b/res/drawable-mdpi/ic_action_add_light.png
new file mode 100644
index 000000000..884c9d270
Binary files /dev/null and b/res/drawable-mdpi/ic_action_add_light.png differ
diff --git a/res/drawable-mdpi/ic_action_cancel_dark.png b/res/drawable-mdpi/ic_action_cancel_dark.png
new file mode 100644
index 000000000..3336760d5
Binary files /dev/null and b/res/drawable-mdpi/ic_action_cancel_dark.png differ
diff --git a/res/drawable-mdpi/ic_action_cancel_light.png b/res/drawable-mdpi/ic_action_cancel_light.png
new file mode 100644
index 000000000..9f4c3d6a2
Binary files /dev/null and b/res/drawable-mdpi/ic_action_cancel_light.png differ
diff --git a/res/drawable-mdpi/ic_action_import_export_dark.png b/res/drawable-mdpi/ic_action_import_export_dark.png
new file mode 100644
index 000000000..a74fe6794
Binary files /dev/null and b/res/drawable-mdpi/ic_action_import_export_dark.png differ
diff --git a/res/drawable-mdpi/ic_action_import_export_light.png b/res/drawable-mdpi/ic_action_import_export_light.png
new file mode 100644
index 000000000..f481a04aa
Binary files /dev/null and b/res/drawable-mdpi/ic_action_import_export_light.png differ
diff --git a/res/drawable-mdpi/ic_action_request_read_receipt_dark.png b/res/drawable-mdpi/ic_action_request_read_receipt_dark.png
new file mode 100644
index 000000000..6d9102c7d
Binary files /dev/null and b/res/drawable-mdpi/ic_action_request_read_receipt_dark.png differ
diff --git a/res/drawable-mdpi/ic_action_request_read_receipt_light.png b/res/drawable-mdpi/ic_action_request_read_receipt_light.png
new file mode 100644
index 000000000..5e9196633
Binary files /dev/null and b/res/drawable-mdpi/ic_action_request_read_receipt_light.png differ
diff --git a/res/drawable-mdpi/ic_action_save_dark.png b/res/drawable-mdpi/ic_action_save_dark.png
new file mode 100644
index 000000000..ad0769553
Binary files /dev/null and b/res/drawable-mdpi/ic_action_save_dark.png differ
diff --git a/res/drawable-mdpi/ic_action_save_light.png b/res/drawable-mdpi/ic_action_save_light.png
new file mode 100644
index 000000000..d12760bbd
Binary files /dev/null and b/res/drawable-mdpi/ic_action_save_light.png differ
diff --git a/res/drawable-mdpi/ic_action_select_all_dark.png b/res/drawable-mdpi/ic_action_select_all_dark.png
new file mode 100644
index 000000000..070593ff8
Binary files /dev/null and b/res/drawable-mdpi/ic_action_select_all_dark.png differ
diff --git a/res/drawable-mdpi/ic_action_select_all_light.png b/res/drawable-mdpi/ic_action_select_all_light.png
new file mode 100644
index 000000000..9eb75cb0a
Binary files /dev/null and b/res/drawable-mdpi/ic_action_select_all_light.png differ
diff --git a/res/drawable-mdpi/ic_action_upload_dark.png b/res/drawable-mdpi/ic_action_upload_dark.png
new file mode 100644
index 000000000..2d4ba56fa
Binary files /dev/null and b/res/drawable-mdpi/ic_action_upload_dark.png differ
diff --git a/res/drawable-mdpi/ic_action_upload_light.png b/res/drawable-mdpi/ic_action_upload_light.png
new file mode 100644
index 000000000..9e3f74504
Binary files /dev/null and b/res/drawable-mdpi/ic_action_upload_light.png differ
diff --git a/res/drawable-mdpi/ic_button_add_contact.png b/res/drawable-mdpi/ic_button_add_contact.png
new file mode 100644
index 000000000..2c9899ec8
Binary files /dev/null and b/res/drawable-mdpi/ic_button_add_contact.png differ
diff --git a/res/drawable-mdpi/ic_menu_account_list.png b/res/drawable-mdpi/ic_menu_account_list.png
deleted file mode 100644
index f0945b254..000000000
Binary files a/res/drawable-mdpi/ic_menu_account_list.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_menu_add.png b/res/drawable-mdpi/ic_menu_add.png
deleted file mode 100644
index 6752bfd10..000000000
Binary files a/res/drawable-mdpi/ic_menu_add.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_menu_attachment.png b/res/drawable-mdpi/ic_menu_attachment.png
deleted file mode 100644
index d5929e84b..000000000
Binary files a/res/drawable-mdpi/ic_menu_attachment.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_menu_cc.png b/res/drawable-mdpi/ic_menu_cc.png
deleted file mode 100644
index 48760210c..000000000
Binary files a/res/drawable-mdpi/ic_menu_cc.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_menu_close_clear_cancel.png b/res/drawable-mdpi/ic_menu_close_clear_cancel.png
deleted file mode 100644
index 78222ea8e..000000000
Binary files a/res/drawable-mdpi/ic_menu_close_clear_cancel.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_menu_delete.png b/res/drawable-mdpi/ic_menu_delete.png
deleted file mode 100644
index 7d954943d..000000000
Binary files a/res/drawable-mdpi/ic_menu_delete.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_menu_preferences.png b/res/drawable-mdpi/ic_menu_preferences.png
deleted file mode 100644
index b8e71412d..000000000
Binary files a/res/drawable-mdpi/ic_menu_preferences.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_menu_reply_receipt.png b/res/drawable-mdpi/ic_menu_reply_receipt.png
deleted file mode 100644
index e4dfbba91..000000000
Binary files a/res/drawable-mdpi/ic_menu_reply_receipt.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_menu_save_draft.png b/res/drawable-mdpi/ic_menu_save_draft.png
deleted file mode 100644
index 723193323..000000000
Binary files a/res/drawable-mdpi/ic_menu_save_draft.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_menu_select_all.png b/res/drawable-mdpi/ic_menu_select_all.png
deleted file mode 100644
index be2ced1e1..000000000
Binary files a/res/drawable-mdpi/ic_menu_select_all.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_show_folders.png b/res/drawable-mdpi/ic_show_folders.png
deleted file mode 100644
index 6d40e48ad..000000000
Binary files a/res/drawable-mdpi/ic_show_folders.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_action_about_dark.png b/res/drawable-xhdpi/ic_action_about_dark.png
new file mode 100644
index 000000000..4ee903f07
Binary files /dev/null and b/res/drawable-xhdpi/ic_action_about_dark.png differ
diff --git a/res/drawable-xhdpi/ic_action_about_light.png b/res/drawable-xhdpi/ic_action_about_light.png
new file mode 100644
index 000000000..2641f142a
Binary files /dev/null and b/res/drawable-xhdpi/ic_action_about_light.png differ
diff --git a/res/drawable-xhdpi/ic_action_add_dark.png b/res/drawable-xhdpi/ic_action_add_dark.png
new file mode 100644
index 000000000..23b9a1c18
Binary files /dev/null and b/res/drawable-xhdpi/ic_action_add_dark.png differ
diff --git a/res/drawable-xhdpi/ic_action_add_light.png b/res/drawable-xhdpi/ic_action_add_light.png
new file mode 100644
index 000000000..9b48a63da
Binary files /dev/null and b/res/drawable-xhdpi/ic_action_add_light.png differ
diff --git a/res/drawable-xhdpi/ic_action_cancel_dark.png b/res/drawable-xhdpi/ic_action_cancel_dark.png
new file mode 100644
index 000000000..f391760ef
Binary files /dev/null and b/res/drawable-xhdpi/ic_action_cancel_dark.png differ
diff --git a/res/drawable-xhdpi/ic_action_cancel_light.png b/res/drawable-xhdpi/ic_action_cancel_light.png
new file mode 100644
index 000000000..ca7d159fd
Binary files /dev/null and b/res/drawable-xhdpi/ic_action_cancel_light.png differ
diff --git a/res/drawable-xhdpi/ic_action_import_export_dark.png b/res/drawable-xhdpi/ic_action_import_export_dark.png
new file mode 100644
index 000000000..6161b58e6
Binary files /dev/null and b/res/drawable-xhdpi/ic_action_import_export_dark.png differ
diff --git a/res/drawable-xhdpi/ic_action_import_export_light.png b/res/drawable-xhdpi/ic_action_import_export_light.png
new file mode 100644
index 000000000..7c1c1d718
Binary files /dev/null and b/res/drawable-xhdpi/ic_action_import_export_light.png differ
diff --git a/res/drawable-xhdpi/ic_action_request_read_receipt_dark.png b/res/drawable-xhdpi/ic_action_request_read_receipt_dark.png
new file mode 100644
index 000000000..f39686cb3
Binary files /dev/null and b/res/drawable-xhdpi/ic_action_request_read_receipt_dark.png differ
diff --git a/res/drawable-xhdpi/ic_action_request_read_receipt_light.png b/res/drawable-xhdpi/ic_action_request_read_receipt_light.png
new file mode 100644
index 000000000..4233a2fa8
Binary files /dev/null and b/res/drawable-xhdpi/ic_action_request_read_receipt_light.png differ
diff --git a/res/drawable-xhdpi/ic_action_save_dark.png b/res/drawable-xhdpi/ic_action_save_dark.png
new file mode 100644
index 000000000..272060253
Binary files /dev/null and b/res/drawable-xhdpi/ic_action_save_dark.png differ
diff --git a/res/drawable-xhdpi/ic_action_save_light.png b/res/drawable-xhdpi/ic_action_save_light.png
new file mode 100644
index 000000000..9460b391c
Binary files /dev/null and b/res/drawable-xhdpi/ic_action_save_light.png differ
diff --git a/res/drawable-xhdpi/ic_action_select_all_dark.png b/res/drawable-xhdpi/ic_action_select_all_dark.png
new file mode 100644
index 000000000..52d1155d2
Binary files /dev/null and b/res/drawable-xhdpi/ic_action_select_all_dark.png differ
diff --git a/res/drawable-xhdpi/ic_action_select_all_light.png b/res/drawable-xhdpi/ic_action_select_all_light.png
new file mode 100644
index 000000000..fbe5845ad
Binary files /dev/null and b/res/drawable-xhdpi/ic_action_select_all_light.png differ
diff --git a/res/drawable-xhdpi/ic_action_upload_dark.png b/res/drawable-xhdpi/ic_action_upload_dark.png
new file mode 100644
index 000000000..2369348c9
Binary files /dev/null and b/res/drawable-xhdpi/ic_action_upload_dark.png differ
diff --git a/res/drawable-xhdpi/ic_action_upload_light.png b/res/drawable-xhdpi/ic_action_upload_light.png
new file mode 100644
index 000000000..b372b7e19
Binary files /dev/null and b/res/drawable-xhdpi/ic_action_upload_light.png differ
diff --git a/res/drawable-xhdpi/ic_button_add_contact.png b/res/drawable-xhdpi/ic_button_add_contact.png
new file mode 100644
index 000000000..2cefca645
Binary files /dev/null and b/res/drawable-xhdpi/ic_button_add_contact.png differ
diff --git a/res/layout/message_compose.xml b/res/layout/message_compose.xml
index 826040c99..dd02a659c 100644
--- a/res/layout/message_compose.xml
+++ b/res/layout/message_compose.xml
@@ -36,6 +36,7 @@
                     android:id="@+id/to_wrapper"
                     android:layout_height="wrap_content"
                     android:baselineAligned="true"
+                    android:gravity="bottom"
                     android:layout_marginLeft="6dip"
                     android:layout_marginRight="6dip"
                     android:layout_width="fill_parent">
@@ -54,9 +55,10 @@
                     <ImageButton
                         android:id="@+id/add_to"
                         android:contentDescription="@string/message_compose_description_add_to"
-                        android:src="@drawable/ic_button_contacts"
-                        android:layout_height="fill_parent"
+                        android:src="@drawable/ic_button_add_contact"
+                        android:layout_height="wrap_content"
                         android:layout_width="wrap_content"
+                        android:padding="8dip"
                         android:layout_marginTop="1dip"/>
 
                 </LinearLayout>
@@ -66,6 +68,7 @@
                     android:visibility="gone"
                     android:layout_height="wrap_content"
                     android:baselineAligned="true"
+                    android:gravity="bottom"
                     android:layout_marginLeft="6dip"
                     android:layout_marginRight="6dip"
                     android:layout_width="fill_parent">
@@ -84,9 +87,10 @@
                     <ImageButton
                         android:id="@+id/add_cc"
                         android:contentDescription="@string/message_compose_description_add_cc"
-                        android:src="@drawable/ic_button_contacts"
+                        android:src="@drawable/ic_button_add_contact"
                         android:layout_width="wrap_content"
-                        android:layout_height="fill_parent"
+                        android:layout_height="wrap_content"
+                        android:padding="8dip"
                         android:layout_marginTop="1dip"/>
 
                 </LinearLayout>
@@ -96,6 +100,7 @@
                     android:visibility="gone"
                     android:layout_height="wrap_content"
                     android:baselineAligned="true"
+                    android:gravity="bottom"
                     android:layout_marginLeft="6dip"
                     android:layout_marginRight="6dip"
                     android:layout_width="fill_parent">
@@ -115,9 +120,10 @@
                         android:id="@+id/add_bcc"
                         android:contentDescription="@string/message_compose_description_add_bcc"
                         android:layout_marginTop="1dip"
-                        android:layout_height="fill_parent"
+                        android:layout_height="wrap_content"
                         android:layout_width="wrap_content"
-                        android:src="@drawable/ic_button_contacts"/>
+                        android:padding="8dip"
+                        android:src="@drawable/ic_button_add_contact"/>
 
                 </LinearLayout>
 
diff --git a/res/menu/accounts_option.xml b/res/menu/accounts_option.xml
index 0a4869884..cd53e7c98 100644
--- a/res/menu/accounts_option.xml
+++ b/res/menu/accounts_option.xml
@@ -20,18 +20,15 @@
         android:title="@string/compose_action"/>
     <item
         android:id="@+id/add_new_account"
-        android:icon="?attr/iconMenuAdd"
+        android:icon="?attr/iconActionAdd"
         android:title="@string/add_account_action"/>
     <item
         android:id="@+id/about"
-        android:icon="@android:drawable/ic_menu_info_details"
+        android:icon="?attr/iconActionAbout"
         android:title="@string/about_action"/>
-    <!--
-        <item android:id="@+id/search"
-        android:title="@string/search_action" />
-    -->
     <item
         android:id="@+id/import_export"
+        android:icon="?attr/iconActionImportExport"
         android:title="@string/import_export_action">
         <menu>
             <item
@@ -44,7 +41,7 @@
     </item>
     <item
         android:id="@+id/edit_prefs"
-        android:icon="@android:drawable/ic_menu_preferences"
+        android:icon="?attr/iconActionSettings"
         android:showAsAction="never"
         android:title="@string/preferences_action"/>
 
diff --git a/res/menu/folder_list_option.xml b/res/menu/folder_list_option.xml
index e8b05e9a5..5fc7305ea 100644
--- a/res/menu/folder_list_option.xml
+++ b/res/menu/folder_list_option.xml
@@ -24,7 +24,7 @@
         android:showAsAction="always"
         android:title="@string/compose_action"/>
     <item
-        android:icon="@drawable/ic_show_folders"
+        android:icon="?attr/iconFolder"
         android:title="@string/folder_list_display_mode_label">
         <menu>
             <item
@@ -43,12 +43,12 @@
     </item>
     <item
         android:id="@+id/send_messages"
-        android:icon="?attr/iconMenuRefresh"
+        android:icon="?attr/iconActionUpload"
         android:title="@string/send_messages_action"/>
     <item
         android:id="@+id/empty_trash"
         android:alphabeticShortcut="e"
-        android:icon="?attr/iconMenuDelete"
+        android:icon="?attr/iconActionDelete"
         android:title="@string/empty_trash_action"/>
     <item
         android:id="@+id/compact"
@@ -56,10 +56,11 @@
         android:title="@string/compact_action"/>
     <item
         android:id="@+id/list_folders"
+        android:icon="?attr/iconActionRefresh"
         android:title="@string/refresh_folders_action"/>
     <item
         android:id="@+id/settings"
-        android:icon="?attr/iconMenuPreferences"
+        android:icon="?attr/iconActionSettings"
         android:showAsAction="never"
         android:title="@string/preferences_action">
         <menu>
diff --git a/res/menu/folder_select_option.xml b/res/menu/folder_select_option.xml
index 915459537..d45b46141 100644
--- a/res/menu/folder_select_option.xml
+++ b/res/menu/folder_select_option.xml
@@ -1,42 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-<!--
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+
     <item
-        android:title="@string/folder_list_display_mode_label"
-        android:icon="@drawable/ic_show_folders"
-    >
-        <menu>-->
-           <item
-            android:id="@+id/filter_folders"
-            android:icon="?attr/iconActionSearchFolder"
-            android:showAsAction="always|collapseActionView"
-            android:title="@string/filter_folders_action"
-            android:actionViewClass="com.actionbarsherlock.widget.SearchView"
-           />
-            <item
-            android:id="@+id/display_all"
-            android:title="@string/folder_list_display_mode_all"
-           />
-           <item
-            android:id="@+id/display_1st_class"
-            android:title="@string/folder_list_display_mode_first_class"
-           />
-           <item
-            android:id="@+id/display_1st_and_2nd_class"
-            android:title="@string/folder_list_display_mode_first_and_second_class"
-           />
-           <item
-            android:id="@+id/display_not_second_class"
-            android:title="@string/folder_list_display_mode_not_second_class"
-           />
-           <item
-            android:id="@+id/list_folders"
-            android:title="@string/refresh_folders_action"
-            android:icon="?attr/iconMenuRefresh"
-         />
+        android:id="@+id/filter_folders"
+        android:actionViewClass="com.actionbarsherlock.widget.SearchView"
+        android:icon="?attr/iconActionSearchFolder"
+        android:showAsAction="always|collapseActionView"
+        android:title="@string/filter_folders_action"/>
+    <item
+        android:id="@+id/display_all"
+        android:title="@string/folder_list_display_mode_all"/>
+    <item
+        android:id="@+id/display_1st_class"
+        android:title="@string/folder_list_display_mode_first_class"/>
+    <item
+        android:id="@+id/display_1st_and_2nd_class"
+        android:title="@string/folder_list_display_mode_first_and_second_class"/>
+    <item
+        android:id="@+id/display_not_second_class"
+        android:title="@string/folder_list_display_mode_not_second_class"/>
+    <item
+        android:id="@+id/list_folders"
+        android:icon="?attr/iconActionRefresh"
+        android:title="@string/refresh_folders_action"/>
 
-    <!--     </menu>
-    </item>-->
-
-
-</menu>
+</menu>
\ No newline at end of file
diff --git a/res/menu/manage_identities_option.xml b/res/menu/manage_identities_option.xml
index 9abbde191..09b295175 100644
--- a/res/menu/manage_identities_option.xml
+++ b/res/menu/manage_identities_option.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
-	<item
-		android:id="@+id/new_identity"
+    <item
+        android:id="@+id/new_identity"
         android:alphabeticShortcut="n"
-		android:title="@string/new_identity_action"
-		android:icon="?attr/iconMenuAdd"
-	/>
+        android:title="@string/new_identity_action"
+        android:icon="?attr/iconActionAdd"
+    />
 </menu>
diff --git a/res/menu/message_compose_option.xml b/res/menu/message_compose_option.xml
index 9e2189f13..06cf7ac68 100644
--- a/res/menu/message_compose_option.xml
+++ b/res/menu/message_compose_option.xml
@@ -1,54 +1,54 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
-	<item
-		android:id="@+id/add_cc_bcc"
+    <item
+        android:id="@+id/add_cc_bcc"
         android:alphabeticShortcut="c"
-		android:title="@string/add_cc_bcc_action"
-		android:icon="?attr/iconActionAddCcBcc"
-		android:showAsAction="always"
-	/>
-	<item
-		android:id="@+id/add_attachment"
+        android:title="@string/add_cc_bcc_action"
+        android:icon="?attr/iconActionAddCcBcc"
+        android:showAsAction="always"
+    />
+    <item
+        android:id="@+id/add_attachment"
         android:alphabeticShortcut="n"
-		android:title="@string/add_attachment_action"
+        android:title="@string/add_attachment_action"
         android:icon="?attr/iconActionAddAttachment"
         android:showAsAction="always"
     />
-	<item
-		android:id="@+id/send"
+    <item
+        android:id="@+id/send"
         android:alphabeticShortcut="s"
-		android:title="@string/send_action"
-		android:icon="?attr/iconActionSend"
-		android:showAsAction="always"
-	/>
-	<item
-		android:id="@+id/save"
+        android:title="@string/send_action"
+        android:icon="?attr/iconActionSend"
+        android:showAsAction="always"
+    />
+    <item
+        android:id="@+id/save"
         android:alphabeticShortcut="d"
-		android:title="@string/save_draft_action"
-		android:icon="?attr/iconMenuSaveDraft"
-	/>
-	<item
-		android:id="@+id/discard"
+        android:title="@string/save_draft_action"
+        android:icon="?attr/iconActionSave"
+    />
+    <item
+        android:id="@+id/discard"
         android:alphabeticShortcut="q"
-		android:title="@string/discard_action"
-		android:icon="?attr/iconMenuCloseClearCancel"
-	/>
-	<item
-		android:id="@+id/read_receipt"
+        android:title="@string/discard_action"
+        android:icon="?attr/iconActionCancel"
+    />
+    <item
+        android:id="@+id/read_receipt"
         android:alphabeticShortcut="r"
         android:title="@string/read_receipt"
-        android:icon="?attr/iconMenuReplyReceipt"
-	/>
-	<item
-		android:id="@+id/add_attachment_image"
-		android:title="@string/add_attachment_action_image"
-        android:icon="?attr/iconMenuAttachment"
-        android:visible="false" 
+        android:icon="?attr/iconActionRequestReadReceipt"
     />
-	<item
-		android:id="@+id/add_attachment_video"
-		android:title="@string/add_attachment_action_video"
-        android:icon="?attr/iconMenuAttachment"
+    <item
+        android:id="@+id/add_attachment_image"
+        android:title="@string/add_attachment_action_image"
+        android:icon="?attr/iconActionAddAttachment"
+        android:visible="false"
+    />
+    <item
+        android:id="@+id/add_attachment_video"
+        android:title="@string/add_attachment_action_video"
+        android:icon="?attr/iconActionAddAttachment"
         android:visible="false"
     />
 </menu>
diff --git a/res/menu/message_list_context.xml b/res/menu/message_list_context.xml
index 44ff9c361..89c1007aa 100644
--- a/res/menu/message_list_context.xml
+++ b/res/menu/message_list_context.xml
@@ -54,7 +54,7 @@
     />
     <item
         android:id="@+id/select_all"
-        android:icon="?attr/iconMenuSelectAll"
+        android:icon="?attr/iconActionSelectAll"
         android:showAsAction="never"
         android:title="@string/batch_select_all"
     />
diff --git a/res/menu/message_list_option.xml b/res/menu/message_list_option.xml
index cf4161acb..ff5ff8659 100644
--- a/res/menu/message_list_option.xml
+++ b/res/menu/message_list_option.xml
@@ -164,7 +164,7 @@
     <!-- MessageList -->
     <item
         android:id="@+id/select_all"
-        android:icon="?attr/iconMenuSelectAll"
+        android:icon="?attr/iconActionSelectAll"
         android:showAsAction="never"
         android:title="@string/batch_select_all"/>
 
@@ -172,7 +172,7 @@
     <item
         android:id="@+id/send_messages"
         android:alphabeticShortcut="r"
-        android:icon="?attr/iconActionRefresh"
+        android:icon="?attr/iconActionUpload"
         android:showAsAction="never"
         android:title="@string/send_messages_action"/>
 
@@ -197,7 +197,7 @@
     <!-- always -->
     <item
         android:id="@+id/settings"
-        android:icon="?attr/iconMenuPreferences"
+        android:icon="?attr/iconActionSettings"
         android:showAsAction="never"
         android:title="@string/preferences_action">
         <menu>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index ef69c3d1b..ad77ada74 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -26,16 +26,14 @@
         <attr name="iconActionMarkAsRead" format="reference" />
         <attr name="iconActionMarkAsUnread" format="reference" />
         <attr name="iconActionRemoteSearch" format="reference" />
-        <attr name="iconMenuAdd" format="reference" />
-        <attr name="iconMenuAttachment" format="reference" />
-        <attr name="iconMenuCloseClearCancel" format="reference" />
-        <attr name="iconMenuDelete" format="reference" />
-        <attr name="iconMenuPreferences" format="reference" />
-        <attr name="iconMenuRefresh" format="reference" />
-        <attr name="iconMenuReplyReceipt" format="reference" />
-        <attr name="iconMenuSaveDraft" format="reference" />
-        <attr name="iconMenuSelectAll" format="reference" />
-        <attr name="iconMenuShowFolders" format="reference" />
+        <attr name="iconActionAbout" format="reference" />
+        <attr name="iconActionAdd" format="reference" />
+        <attr name="iconActionImportExport" format="reference" />
+        <attr name="iconActionUpload" format="reference" />
+        <attr name="iconActionSelectAll" format="reference" />
+        <attr name="iconActionSave" format="reference" />
+        <attr name="iconActionCancel" format="reference" />
+        <attr name="iconActionRequestReadReceipt" format="reference" />
         <attr name="textColorPrimaryRecipientDropdown" format="reference" />
         <attr name="textColorSecondaryRecipientDropdown" format="reference" />
         <attr name="backgroundColorChooseAccountHeader" format="color" />
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 4e3481a4c..dcd75b5cc 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -26,16 +26,14 @@
         <item name="iconActionMarkAsRead">@drawable/ic_action_mark_as_read_light</item>
         <item name="iconActionMarkAsUnread">@drawable/ic_action_mark_as_unread_light</item>
         <item name="iconActionRemoteSearch">@drawable/ic_action_remote_search_light</item>
-        <item name="iconMenuAdd">@drawable/ic_menu_add</item>
-        <item name="iconMenuAttachment">@drawable/ic_menu_attachment</item>
-        <item name="iconMenuCloseClearCancel">@drawable/ic_menu_close_clear_cancel</item>
-        <item name="iconMenuDelete">@drawable/ic_menu_delete</item>
-        <item name="iconMenuPreferences">@drawable/ic_menu_preferences</item>
-        <item name="iconMenuRefresh">@drawable/ic_menu_refresh</item>
-        <item name="iconMenuReplyReceipt">@drawable/ic_menu_reply_receipt</item>
-        <item name="iconMenuSaveDraft">@drawable/ic_menu_save_draft</item>
-        <item name="iconMenuSelectAll">@drawable/ic_menu_select_all</item>
-        <item name="iconMenuShowFolders">@drawable/ic_show_folders</item>
+        <item name="iconActionAbout">@drawable/ic_action_about_light</item>
+        <item name="iconActionAdd">@drawable/ic_action_add_light</item>
+        <item name="iconActionImportExport">@drawable/ic_action_import_export_light</item>
+        <item name="iconActionUpload">@drawable/ic_action_upload_light</item>
+        <item name="iconActionSelectAll">@drawable/ic_action_select_all_light</item>
+        <item name="iconActionSave">@drawable/ic_action_save_light</item>
+        <item name="iconActionCancel">@drawable/ic_action_cancel_light</item>
+        <item name="iconActionRequestReadReceipt">@drawable/ic_action_request_read_receipt_light</item>
         <item name="textColorPrimaryRecipientDropdown">@android:color/primary_text_light</item>
         <item name="textColorSecondaryRecipientDropdown">@android:color/secondary_text_light</item>
         <item name="messageListReadItemBackgroundColor">#80cdcdcd</item>
@@ -75,16 +73,14 @@
         <item name="iconActionMarkAsRead">@drawable/ic_action_mark_as_read_dark</item>
         <item name="iconActionMarkAsUnread">@drawable/ic_action_mark_as_unread_dark</item>
         <item name="iconActionRemoteSearch">@drawable/ic_action_remote_search_dark</item>
-        <item name="iconMenuAdd">@drawable/ic_menu_add</item>
-        <item name="iconMenuAttachment">@drawable/ic_menu_attachment</item>
-        <item name="iconMenuCloseClearCancel">@drawable/ic_menu_close_clear_cancel</item>
-        <item name="iconMenuDelete">@drawable/ic_menu_delete</item>
-        <item name="iconMenuPreferences">@drawable/ic_menu_preferences</item>
-        <item name="iconMenuRefresh">@drawable/ic_menu_refresh</item>
-        <item name="iconMenuReplyReceipt">@drawable/ic_menu_reply_receipt</item>
-        <item name="iconMenuSaveDraft">@drawable/ic_menu_save_draft</item>
-        <item name="iconMenuSelectAll">@drawable/ic_menu_select_all</item>
-        <item name="iconMenuShowFolders">@drawable/ic_show_folders</item>
+        <item name="iconActionAbout">@drawable/ic_action_about_dark</item>
+        <item name="iconActionAdd">@drawable/ic_action_add_dark</item>
+        <item name="iconActionImportExport">@drawable/ic_action_import_export_dark</item>
+        <item name="iconActionUpload">@drawable/ic_action_upload_dark</item>
+        <item name="iconActionSelectAll">@drawable/ic_action_select_all_dark</item>
+        <item name="iconActionSave">@drawable/ic_action_save_dark</item>
+        <item name="iconActionCancel">@drawable/ic_action_cancel_dark</item>
+        <item name="iconActionRequestReadReceipt">@drawable/ic_action_request_read_receipt_dark</item>
         <item name="textColorPrimaryRecipientDropdown">@android:color/primary_text_dark</item>
         <item name="textColorSecondaryRecipientDropdown">@android:color/secondary_text_dark</item>
         <item name="messageListReadItemBackgroundColor">#00000000</item>