updated toolbar flag to falseand updated icons