diff --git a/src/src/app/app.component.ts b/src/src/app/app.component.ts
index 97bf3f3d..9538044f 100644
--- a/src/src/app/app.component.ts
+++ b/src/src/app/app.component.ts
@@ -91,7 +91,9 @@ export class AppComponent extends SubscriberBase implements AfterViewInit {
   }
 
   showHelp() {
-    this.dialog.open(HelpModalComponent);
+    this.dialog.open(HelpModalComponent, {
+      autoFocus: 'content',
+    });
   }
 
   ngAfterViewInit(): void {
diff --git a/src/src/app/components/card.component.ts b/src/src/app/components/card.component.ts
index 2eb54aac..861cfd92 100644
--- a/src/src/app/components/card.component.ts
+++ b/src/src/app/components/card.component.ts
@@ -60,6 +60,7 @@ export class CardComponent extends SubscriberBase {
   addToSavedPage() {
     this.dialog.open(AddToPageModalComponent, {
       data: this.cardItem,
+      autoFocus: 'content',
     });
   }
 
diff --git a/src/src/app/components/note/note-card.component.ts b/src/src/app/components/note/note-card.component.ts
index f51cab04..e8576c17 100644
--- a/src/src/app/components/note/note-card.component.ts
+++ b/src/src/app/components/note/note-card.component.ts
@@ -49,6 +49,7 @@ export class NoteCardComponent extends CardComponent {
   edit() {
     this.dialog.open(NoteEditModalComponent, {
       data: this.cardItem,
+      autoFocus: 'note-content',
     });
   }
 
diff --git a/src/src/app/components/page-edit-modal/page-edit-modal.component.html b/src/src/app/components/page-edit-modal/page-edit-modal.component.html
index 38097e68..4fda0d52 100644
--- a/src/src/app/components/page-edit-modal/page-edit-modal.component.html
+++ b/src/src/app/components/page-edit-modal/page-edit-modal.component.html
@@ -4,7 +4,7 @@
     <div class="title">{{ dialogTitle }}</div>
   </mat-toolbar>
 </div>
-<mat-dialog-content>
+<mat-dialog-content class="content">
   <form [formGroup]="form">
     <mat-form-field class="page-title">
       <mat-label>Title</mat-label>
diff --git a/src/src/app/components/passage/passage-card.component.ts b/src/src/app/components/passage/passage-card.component.ts
index 3df1cfda..9f666162 100644
--- a/src/src/app/components/passage/passage-card.component.ts
+++ b/src/src/app/components/passage/passage-card.component.ts
@@ -149,6 +149,7 @@ export class PassageCardComponent extends CardComponent implements OnInit {
         const card = await this.appService.getStrongsCard(sn, dict);
         this.dialog.open(StrongsModalComponent, {
           data: card,
+          autoFocus: 'content',
         });
       } else {
         this.appService.getStrongs(sn, dict, this.cardItem);
diff --git a/src/src/app/components/saved-page-card/saved-page-card.component.ts b/src/src/app/components/saved-page-card/saved-page-card.component.ts
index 29d9f604..a522d16e 100644
--- a/src/src/app/components/saved-page-card/saved-page-card.component.ts
+++ b/src/src/app/components/saved-page-card/saved-page-card.component.ts
@@ -130,6 +130,7 @@ export class SavedPageCardComponent extends SubscriberBase {
       data: {
         title: this.savedPage.title,
         savedPage: this.savedPage,
+        autoFocus: 'content',
       },
     });
   }
diff --git a/src/src/app/components/settings/settings.component.scss b/src/src/app/components/settings/settings.component.scss
index 05bf3a7b..be2ba65f 100644
--- a/src/src/app/components/settings/settings.component.scss
+++ b/src/src/app/components/settings/settings.component.scss
@@ -11,9 +11,3 @@
 .auth-button {
   width: 100%;
 }
-
-button>.mat-icon, .mat-mdc-outlined-button>.mat-icon {
-    font-size: 1.125rem !important;
-    height: 1.125rem !important;
-    width: 1.125rem !important;
-}
diff --git a/src/src/app/components/settings/settings.component.ts b/src/src/app/components/settings/settings.component.ts
index 4834c3e7..68c55790 100644
--- a/src/src/app/components/settings/settings.component.ts
+++ b/src/src/app/components/settings/settings.component.ts
@@ -101,7 +101,9 @@ export class SettingsComponent extends SubscriberBase {
 
   savePage() {
     this.navService.closeSettings();
-    this.dialog.open(PageEditModalComponent);
+    this.dialog.open(PageEditModalComponent, {
+      autoFocus: 'content',
+    });
   }
 
   updatePage(page: SavedPage) {
@@ -127,7 +129,9 @@ export class SettingsComponent extends SubscriberBase {
 
   createNote() {
     this.navService.closeSettings();
-    this.dialog.open(NoteEditModalComponent);
+    this.dialog.open(NoteEditModalComponent, {
+      autoFocus: 'note-content',
+    });
   }
 
   //#endregion
diff --git a/src/src/app/components/strongs/card/strongs-card.component.ts b/src/src/app/components/strongs/card/strongs-card.component.ts
index a54aa5d5..7341ffdd 100644
--- a/src/src/app/components/strongs/card/strongs-card.component.ts
+++ b/src/src/app/components/strongs/card/strongs-card.component.ts
@@ -39,6 +39,7 @@ export class StrongsCardComponent extends CardComponent {
       const card = await this.appService.getStrongsCard(sn, dict);
       this.dialog.open(StrongsModalComponent, {
         data: card,
+        autoFocus: 'content',
       });
     } else {
       this.appService.getStrongs(sn, dict, this.cardItem);
diff --git a/src/src/app/components/strongs/modal/strongs-modal.component.html b/src/src/app/components/strongs/modal/strongs-modal.component.html
index e58873b6..76577ebd 100644
--- a/src/src/app/components/strongs/modal/strongs-modal.component.html
+++ b/src/src/app/components/strongs/modal/strongs-modal.component.html
@@ -13,7 +13,7 @@
       </button>
     </span>
   </mat-toolbar>
-<mat-dialog-content class="content">
+<mat-dialog-content  class="content">
   <br />
   <app-strongs
     [data]="cardItem.data"
diff --git a/src/src/app/components/verse-picker-modal/verse-picker-modal.component.html b/src/src/app/components/verse-picker-modal/verse-picker-modal.component.html
index 37345908..eeb6fcc2 100644
--- a/src/src/app/components/verse-picker-modal/verse-picker-modal.component.html
+++ b/src/src/app/components/verse-picker-modal/verse-picker-modal.component.html
@@ -13,7 +13,7 @@
     </span>
   </mat-toolbar>
 </div>
-<mat-dialog-content>
+<mat-dialog-content class="content">
   <div>
     <span *ngIf="hasBook === false">
       <h2>Old Testament</h2>
diff --git a/src/src/app/pages/notes-admin/notes-admin.page.ts b/src/src/app/pages/notes-admin/notes-admin.page.ts
index 613ce9e8..4390d34a 100644
--- a/src/src/app/pages/notes-admin/notes-admin.page.ts
+++ b/src/src/app/pages/notes-admin/notes-admin.page.ts
@@ -30,7 +30,9 @@ export class NotesAdminPageComponent extends SubscriberBase implements OnInit {
   }
 
   addNote() {
-    this.dialog.open(NoteEditModalComponent);
+    this.dialog.open(NoteEditModalComponent, {
+      autoFocus: 'note-content',
+    });
   }
   ngOnInit() {
     this.navService.closeNav(); // close the nav immediately.
diff --git a/src/src/app/pages/search/search.page.ts b/src/src/app/pages/search/search.page.ts
index 5a5974c1..db83d1ed 100644
--- a/src/src/app/pages/search/search.page.ts
+++ b/src/src/app/pages/search/search.page.ts
@@ -93,7 +93,9 @@ export class SearchPageComponent extends SubscriberBase implements OnInit {
   }
 
   launchPicker() {
-    this.dialog.open(VersePickerModalComponent);
+    this.dialog.open(VersePickerModalComponent, {
+      autoFocus: 'content',
+    });
   }
 
   //#region Search
diff --git a/src/src/styles/app.scss b/src/src/styles/app.scss
index 298113d1..f0d12780 100644
--- a/src/src/styles/app.scss
+++ b/src/src/styles/app.scss
@@ -45,9 +45,9 @@ body {
 }
 
 mat-icon {
-  font-size: 1.2em !important;
-  height: 30px !important;
-  width: 30px !important;
+  // font-size: 1.2em !important;
+  // height: 30px !important;
+  // width: 30px !important;
   vertical-align: text-top;
 }