Fixed safe mode button appearance
Merge branch 'dev'