diff --git a/assets/SourceHanSansSC-Regular.otf b/assets/SourceHanSansSC-Regular.otf
new file mode 100644
index 0000000..73fcdaf
Binary files /dev/null and b/assets/SourceHanSansSC-Regular.otf differ
diff --git a/lib/main.dart b/lib/main.dart
index 1559e8b..df09fa0 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -53,6 +53,7 @@ class MyApp extends StatelessWidget {
               title: 'pixes',
               theme: FluentThemeData(
                   brightness: Brightness.light,
+                  fontFamily: App.isWindows ? 'font' : null,
                   accentColor: AccentColor.swatch({
                     'darkest': SystemTheme.accentColor.darkest,
                     'darker': SystemTheme.accentColor.darker,
@@ -64,6 +65,7 @@ class MyApp extends StatelessWidget {
                   })),
               darkTheme: FluentThemeData(
                   brightness: Brightness.dark,
+                  fontFamily: App.isWindows ? 'font' : null,
                   accentColor: AccentColor.swatch({
                     'darkest': SystemTheme.accentColor.darkest,
                     'darker': SystemTheme.accentColor.darker,
diff --git a/lib/pages/login_page.dart b/lib/pages/login_page.dart
index 1245cb9..4baddaa 100644
--- a/lib/pages/login_page.dart
+++ b/lib/pages/login_page.dart
@@ -23,7 +23,9 @@ class _LoginPageState extends State<LoginPage> {
 
   @override
   Widget build(BuildContext context) {
-    if (!waitingForAuth) {
+    if(isLogging) {
+      return buildLoading(context);
+    } else if (!waitingForAuth) {
       return buildLogin(context);
     } else {
       return buildWaiting(context);
diff --git a/pubspec.yaml b/pubspec.yaml
index 1407899..676d32f 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -102,3 +102,9 @@ flutter:
   #
   # For details regarding fonts from package dependencies,
   # see https://flutter.dev/custom-fonts/#from-packages
+
+  # font used for building windows application
+  fonts:
+    - family: font
+      fonts:
+        - asset: assets/SourceHanSansSC-Regular.otf
\ No newline at end of file