Added Energy icon and updated TODO