fixed lock icon not showing
Merge branch 'dev'