diff --git a/.gitignore b/.gitignore
index 398fd61bd..2e5ffb5cb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -104,4 +104,8 @@ ios/Flutter/.last_build_id
 
 
 \#*\#
-.\#*
\ No newline at end of file
+.\#*
+
+ios/build
+*.sublime-workspace
+*.sublime-project
diff --git a/assets/images/yat_mini_logo.png b/assets/images/yat_mini_logo.png
new file mode 100644
index 000000000..82830c5ce
Binary files /dev/null and b/assets/images/yat_mini_logo.png differ
diff --git a/lib/router.dart b/lib/router.dart
index acf81043e..10898f625 100644
--- a/lib/router.dart
+++ b/lib/router.dart
@@ -68,7 +68,11 @@ import 'package:cake_wallet/src/screens/exchange_trade/exchange_trade_page.dart'
 import 'package:flutter/services.dart';
 import 'package:hive/hive.dart';
 
+RouteSettings currentRouteSettings;
+
 Route<dynamic> createRoute(RouteSettings settings) {
+  currentRouteSettings = settings;
+  
   switch (settings.name) {
     case Routes.welcome:
       return MaterialPageRoute<void>(builder: (_) => createWelcomePage());
diff --git a/lib/src/screens/dashboard/dashboard_page.dart b/lib/src/screens/dashboard/dashboard_page.dart
index 8c25e1ba0..9b55ac306 100644
--- a/lib/src/screens/dashboard/dashboard_page.dart
+++ b/lib/src/screens/dashboard/dashboard_page.dart
@@ -23,6 +23,7 @@ import 'package:mobx/mobx.dart';
 import 'package:smooth_page_indicator/smooth_page_indicator.dart';
 import 'package:flutter_spinkit/flutter_spinkit.dart';
 import 'package:cake_wallet/main.dart';
+import 'package:cake_wallet/router.dart';
 
 class DashboardPage extends BasePage {
   DashboardPage({
@@ -159,11 +160,16 @@ class DashboardPage extends BasePage {
               walletViewModel: walletViewModel));
     pages.add(BalancePage(dashboardViewModel: walletViewModel));
     pages.add(TransactionsPage(dashboardViewModel: walletViewModel));
-
     _isEffectsInstalled = true;
-
+    
     if (walletViewModel.shouldShowYatPopup) {
       await Future<void>.delayed(Duration(seconds: 1));
+    
+      if (currentRouteSettings.name == Routes.preSeed
+          || currentRouteSettings.name == Routes.seed) {
+        return;
+      }
+
       await showPopUp<void>(
           context: context,
           builder: (BuildContext context) {
diff --git a/lib/src/screens/settings/widgets/settings_link_provider_cell.dart b/lib/src/screens/settings/widgets/settings_link_provider_cell.dart
index 643c1a77b..8c65067da 100644
--- a/lib/src/screens/settings/widgets/settings_link_provider_cell.dart
+++ b/lib/src/screens/settings/widgets/settings_link_provider_cell.dart
@@ -19,7 +19,7 @@ class SettingsLinkProviderCell extends StandardListRow {
 
   @override
   Widget buildLeading(BuildContext context) =>
-      icon != null ? Image.asset(icon, color: iconColor) : null;
+      icon != null ? Image.asset(icon, color: iconColor, height: 30, width: 30) : null;
 
   @override
   Widget buildTrailing(BuildContext context) => Text(linkTitle,
diff --git a/lib/view_model/support_view_model.dart b/lib/view_model/support_view_model.dart
index 9b8dbe426..d355e0608 100644
--- a/lib/view_model/support_view_model.dart
+++ b/lib/view_model/support_view_model.dart
@@ -59,7 +59,13 @@ abstract class SupportViewModelBase with Store {
           icon: 'assets/images/moonpay.png',
           hasIconColor: true,
           linkTitle: S.current.submit_request,
-          link: 'https://support.moonpay.com/hc/en-gb/requests/new')
+          link: 'https://support.moonpay.com/hc/en-gb/requests/new'),
+      LinkListItem(
+          title: 'Yat',
+          icon: 'assets/images/yat_mini_logo.png',
+          hasIconColor: true,
+          linkTitle: 'support@y.at',
+          link: 'mailto:support@y.at')
     ];
   }
   static const url = 'https://cakewallet.com/guide/';