final changes for lock/unlock sets, icons, hints working for bucket