diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index f6b5ed9b..786de94c 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -8,7 +8,6 @@
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
     <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
 
     <!--  is required for some Android 5.x devices  -->
     <uses-permission
diff --git a/app/src/main/res/layout/dialog_app_download.xml b/app/src/main/res/layout/dialog_app_download.xml
index 4246e46d..6ddf6aa0 100644
--- a/app/src/main/res/layout/dialog_app_download.xml
+++ b/app/src/main/res/layout/dialog_app_download.xml
@@ -3,6 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     tools:context=".ui.dialogs.AppDownloadDialog"
+    android:keepScreenOn="true"
     style="@style/DialogCard">
 
     <RelativeLayout
diff --git a/app/src/main/res/layout/dialog_manager_update.xml b/app/src/main/res/layout/dialog_manager_update.xml
index b0567218..eb5e9180 100644
--- a/app/src/main/res/layout/dialog_manager_update.xml
+++ b/app/src/main/res/layout/dialog_manager_update.xml
@@ -2,11 +2,9 @@
 <com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    app:contentPaddingLeft="16dp"
-    app:contentPaddingRight="16dp"
     tools:context=".ui.dialogs.ManagerUpdateDialog"
-    style="@style/MaterialCard">
+    android:keepScreenOn="true"
+    style="@style/DialogCard">
 
     <RelativeLayout
         android:layout_width="match_parent"
@@ -19,15 +17,9 @@
 
         <TextView
             android:id="@+id/manager_update_patient"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_alignParentEnd="true"
-            android:layout_alignParentStart="true"
             android:layout_below="@id/manager_update_header"
-            android:layout_marginTop="8dp"
-            android:gravity="center"
             android:text="@string/checking_updates"
-            android:textSize="16sp" />
+            style="@style/DialogCardSubtitle"/>
 
         <com.google.android.material.progressindicator.LinearProgressIndicator
             android:id="@+id/manager_update_progressbar"