diff --git a/ionic_ui_templates/ios/App/App.xcodeproj/xcshareddata/xcschemes/App.xcscheme b/ionic_ui_templates/ios/App/App.xcodeproj/xcshareddata/xcschemes/App.xcscheme
new file mode 100644
index 0000000..283db1f
--- /dev/null
+++ b/ionic_ui_templates/ios/App/App.xcodeproj/xcshareddata/xcschemes/App.xcscheme
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1530"
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES"
+      buildArchitectures = "Automatic">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "504EC3031FED79650016851F"
+               BuildableName = "App.app"
+               BlueprintName = "App"
+               ReferencedContainer = "container:App.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "504EC3031FED79650016851F"
+            BuildableName = "App.app"
+            BlueprintName = "App"
+            ReferencedContainer = "container:App.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "504EC3031FED79650016851F"
+            BuildableName = "App.app"
+            BlueprintName = "App"
+            ReferencedContainer = "container:App.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/ionic_ui_templates/src/app/drawer/feedback/feedback.page.scss b/ionic_ui_templates/src/app/drawer/feedback/feedback.page.scss
index cede5c9..262cde7 100644
--- a/ionic_ui_templates/src/app/drawer/feedback/feedback.page.scss
+++ b/ionic_ui_templates/src/app/drawer/feedback/feedback.page.scss
@@ -53,8 +53,8 @@ ion-img {
   ion-button {
     text-transform: none;
     font-family: WorkSans-Medium;
-    width: 120px;
-    height: 40px;
+    min-width: 120px;
+    min-height: 40px;
     --background: rgb(33, 150, 243);
     --border-radius: 4px;
     --box-shadow: 4px 4px 8px 0px var(--shadow-color2);
diff --git a/ionic_ui_templates/src/app/drawer/help/help.page.scss b/ionic_ui_templates/src/app/drawer/help/help.page.scss
index 8d3e87c..d317046 100644
--- a/ionic_ui_templates/src/app/drawer/help/help.page.scss
+++ b/ionic_ui_templates/src/app/drawer/help/help.page.scss
@@ -53,8 +53,8 @@ ion-img {
   ion-button {
     text-transform: none;
     font-family: WorkSans-Medium;
-    width: 140px;
-    height: 40px;
+    min-width: 140px;
+    min-height: 40px;
     --background: rgb(33, 150, 243);
     --border-radius: 4px;
     --box-shadow: 4px 4px 8px 0px var(--shadow-color2);
diff --git a/ionic_ui_templates/src/app/drawer/invite-friend/invite-friend.page.scss b/ionic_ui_templates/src/app/drawer/invite-friend/invite-friend.page.scss
index abc1ef8..268aa11 100644
--- a/ionic_ui_templates/src/app/drawer/invite-friend/invite-friend.page.scss
+++ b/ionic_ui_templates/src/app/drawer/invite-friend/invite-friend.page.scss
@@ -61,8 +61,8 @@ ion-img {
   ion-button {
     text-transform: none;
     font-family: WorkSans-Medium;
-    width: 120px;
-    height: 40px;
+    min-height: 120px;
+    min-height: 40px;
     --background: rgb(33, 150, 243);
     --border-radius: 4px;
     --box-shadow: 4px 4px 8px 0px var(--shadow-color2);
diff --git a/ionic_ui_templates/src/app/templates/course-rive/views/on-boarding/on-boarding.page.scss b/ionic_ui_templates/src/app/templates/course-rive/views/on-boarding/on-boarding.page.scss
index 461dd09..9de2e09 100644
--- a/ionic_ui_templates/src/app/templates/course-rive/views/on-boarding/on-boarding.page.scss
+++ b/ionic_ui_templates/src/app/templates/course-rive/views/on-boarding/on-boarding.page.scss
@@ -111,8 +111,7 @@ div.content-container {
   --padding-end: 0;
   --padding-bottom: 0;
   width: 36px;
-  height: 36px;
-  min-height: auto;
+  min-height: 36px;
   color: white;
   position: absolute;
   top: calc(var(--safe-area-inset-top) + 100px);
diff --git a/ionic_ui_templates/src/app/templates/course-rive/views/on-boarding/sign-in/sign-in.component.scss b/ionic_ui_templates/src/app/templates/course-rive/views/on-boarding/sign-in/sign-in.component.scss
index 4059816..6d432cf 100644
--- a/ionic_ui_templates/src/app/templates/course-rive/views/on-boarding/sign-in/sign-in.component.scss
+++ b/ionic_ui_templates/src/app/templates/course-rive/views/on-boarding/sign-in/sign-in.component.scss
@@ -125,8 +125,7 @@ div.sign-in-container {
 
     ion-button {
       width: 36px;
-      height: 36px;
-      min-height: auto;
+      min-height: 36px;
       --background: white;
       --background-hover: white;
       --background-activated: lightgrey;