diff --git a/lib/common.dart b/lib/common.dart
index cf8c455a9..9b94a9cf6 100644
--- a/lib/common.dart
+++ b/lib/common.dart
@@ -43,7 +43,28 @@ final ButtonStyle flatButtonStyle = TextButton.styleFrom(
 void showLoading(String text) {
   DialogManager.reset();
   EasyLoading.dismiss();
-  EasyLoading.show(status: text, maskType: EasyLoadingMaskType.black);
+  EasyLoading.show(
+      indicator: Container(
+          constraints: BoxConstraints(maxWidth: 240),
+          child:
+              Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
+            Center(child: CircularProgressIndicator()),
+            SizedBox(height: 20),
+            Center(
+                child: Text(Translator.call(text),
+                    style: TextStyle(fontSize: 15))),
+            SizedBox(height: 20),
+            Center(
+                child: TextButton(
+                    style: flatButtonStyle,
+                    onPressed: () {
+                      EasyLoading.dismiss();
+                      backToHome();
+                    },
+                    child: Text(Translator.call('Cancel'),
+                        style: TextStyle(color: MyTheme.accent))))
+          ])),
+      maskType: EasyLoadingMaskType.black);
 }
 
 backToHome() {
diff --git a/lib/pages/remote_page.dart b/lib/pages/remote_page.dart
index 9a7565639..fd7d578e8 100644
--- a/lib/pages/remote_page.dart
+++ b/lib/pages/remote_page.dart
@@ -306,12 +306,16 @@ class _RemotePageState extends State<RemotePage> {
                             onPressed: changeTouchMode,
                           )
                         ]) +
-                  <Widget>[
-                    IconButton(
-                      color: Colors.white,
-                      icon: Icon(Icons.message),
-                      onPressed: toggleChatOverlay,
-                    ),
+                  (isWeb
+                      ? []
+                      : <Widget>[
+                          IconButton(
+                            color: Colors.white,
+                            icon: Icon(Icons.message),
+                            onPressed: toggleChatOverlay,
+                          )
+                        ]) +
+                  [
                     IconButton(
                       color: Colors.white,
                       icon: Icon(Icons.more_vert),