Menu and icons fixed