Revert "Move icons to drawable older. Might not be correct."

This reverts commit f6307dca022b5975d592f5c61ab9d7f23dee690b.