Two Edinburgh tower blocks are set to be refurbished and upgraded as part of an almost £22m package of proposed works.