Merge "Fix widget icon and tap behaviour." into nyc-dev