diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml
index e6b2710..0246547 100644
--- a/android/app/src/debug/AndroidManifest.xml
+++ b/android/app/src/debug/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.notes">
+    package="com.trisven.safenotes">
     <!-- Flutter needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->
diff --git a/android/app/src/main/kotlin/com/example/notes/MainActivity.kt b/android/app/src/main/kotlin/com/example/notes/MainActivity.kt
index b3665a2..f590d9c 100644
--- a/android/app/src/main/kotlin/com/example/notes/MainActivity.kt
+++ b/android/app/src/main/kotlin/com/example/notes/MainActivity.kt
@@ -1,4 +1,4 @@
-package com.example.notes
+package com.trisven.safenotes
 
 import io.flutter.embedding.android.FlutterActivity
 
diff --git a/assets/icon.png b/assets/icon.png
deleted file mode 100644
index 317fc0f..0000000
Binary files a/assets/icon.png and /dev/null differ
diff --git a/lib/page/edit_safe_note_page.dart b/lib/page/edit_safe_note_page.dart
index 1fb455c..478af31 100644
--- a/lib/page/edit_safe_note_page.dart
+++ b/lib/page/edit_safe_note_page.dart
@@ -28,7 +28,9 @@ class _AddEditNotePageState extends State<AddEditNotePage> {
   }
 
   @override
-  Widget build(BuildContext context) => Scaffold(
+  Widget build(BuildContext context) => GestureDetector(
+      onTap: () => FocusScope.of(context).unfocus(),
+      child: Scaffold(
         appBar: AppBar(
           actions: [buildButton()],
         ),
@@ -42,7 +44,7 @@ class _AddEditNotePageState extends State<AddEditNotePage> {
                 setState(() => this.description = description),
           ),
         ),
-      );
+      ));
 
   Widget buildButton() {
     final isFormValid = title.isNotEmpty && description.isNotEmpty;
diff --git a/lib/page/login_page/encryption_phrase_login_page.dart b/lib/page/login_page/encryption_phrase_login_page.dart
index 76fc669..9aec243 100644
--- a/lib/page/login_page/encryption_phrase_login_page.dart
+++ b/lib/page/login_page/encryption_phrase_login_page.dart
@@ -26,7 +26,9 @@ class _EncryptionPhraseLoginPageState extends State<EncryptionPhraseLoginPage> {
   }
 
   @override
-  Widget build(BuildContext context) => Scaffold(
+  Widget build(BuildContext context) => GestureDetector(
+      onTap: () => FocusScope.of(context).unfocus(),
+      child: Scaffold(
         resizeToAvoidBottomInset: false,
         appBar: AppBar(
           title: Text(AppInfo.getLoginPageName()),
@@ -55,7 +57,7 @@ class _EncryptionPhraseLoginPageState extends State<EncryptionPhraseLoginPage> {
             ),
           ],
         ),
-      );
+      ));
 
   Widget columnAllowNonDecrypt() => Column(
         children: [
diff --git a/lib/page/login_page/set_encryption_phrase_page.dart b/lib/page/login_page/set_encryption_phrase_page.dart
index a8fd48d..85656fc 100644
--- a/lib/page/login_page/set_encryption_phrase_page.dart
+++ b/lib/page/login_page/set_encryption_phrase_page.dart
@@ -29,42 +29,45 @@ class _SetEncryptionPhrasePageState extends State<SetEncryptionPhrasePage> {
   @override
   Widget build(BuildContext context) {
     final node = FocusScope.of(context);
-    return Scaffold(
-        resizeToAvoidBottomInset: false,
-        appBar: AppBar(
-          title: Text(AppInfo.getFirstLoginPageName()),
-          centerTitle: true,
-        ),
-        body: Column(
-          children: [
-            Padding(
-              padding: const EdgeInsets.only(top: 90.0),
-              child: Center(
-                child: Container(
-                    width: 200,
-                    height: 200,
-                    child: Image.asset(AppInfo.getAppLogoPath())),
+    return GestureDetector(
+      onTap: () => FocusScope.of(context).unfocus(),
+      child: Scaffold(
+          resizeToAvoidBottomInset: false,
+          appBar: AppBar(
+            title: Text(AppInfo.getFirstLoginPageName()),
+            centerTitle: true,
+          ),
+          body: Column(
+            children: [
+              Padding(
+                padding: const EdgeInsets.only(top: 90.0),
+                child: Center(
+                  child: Container(
+                      width: 200,
+                      height: 200,
+                      child: Image.asset(AppInfo.getAppLogoPath())),
+                ),
               ),
-            ),
-            Form(
-              key: formKey,
-              child: SingleChildScrollView(
-                padding: EdgeInsets.all(16),
-                child: Column(
-                  children: [
-                    inputFieldFirst(node),
-                    const SizedBox(height: 10),
-                    inputFieldSecond(),
-                    buildForgotPassword(),
-                    //const SizedBox(height: 16),
-                    buildButton(),
-                    //buildNoAccount(),
-                  ],
+              Form(
+                key: formKey,
+                child: SingleChildScrollView(
+                  padding: EdgeInsets.all(16),
+                  child: Column(
+                    children: [
+                      inputFieldFirst(node),
+                      const SizedBox(height: 10),
+                      inputFieldSecond(),
+                      buildForgotPassword(),
+                      //const SizedBox(height: 16),
+                      buildButton(),
+                      //buildNoAccount(),
+                    ],
+                  ),
                 ),
               ),
-            ),
-          ],
-        ));
+            ],
+          )),
+    );
   }
 
   Widget inputFieldFirst(node) => TextFormField(
diff --git a/lib/page/safe_notes_page.dart b/lib/page/safe_notes_page.dart
index 37213fe..70ba8ff 100644
--- a/lib/page/safe_notes_page.dart
+++ b/lib/page/safe_notes_page.dart
@@ -63,7 +63,9 @@ class _NotesPageState extends State<NotesPage> {
   }
 
   @override
-  Widget build(BuildContext context) => Scaffold(
+  Widget build(BuildContext context) => GestureDetector(
+      onTap: () => FocusScope.of(context).unfocus(),
+      child: Scaffold(
         drawer: UnDecryptedLoginControl.getNoDecryptionFlag()
             ? null
             : navigatioDrawerWidget(context),
@@ -115,7 +117,7 @@ class _NotesPageState extends State<NotesPage> {
                   refreshNotes();
                 },
               ),
-      );
+      ));
 
   Widget buildSearch() => SearchWidget(
         text: query,