Try to enable masterswitch before dismissing dialog
Use correct icon for light theme
Merge branch 'master' of github.com:AChep/AcDisplay