diff --git a/app/src/main/java/com/limelight/utils/UiHelper.java b/app/src/main/java/com/limelight/utils/UiHelper.java
index b7fdd266..4afdd39d 100644
--- a/app/src/main/java/com/limelight/utils/UiHelper.java
+++ b/app/src/main/java/com/limelight/utils/UiHelper.java
@@ -2,13 +2,12 @@ package com.limelight.utils;
 
 import android.app.Activity;
 import android.app.AlertDialog;
-import android.app.UiModeManager;
-import android.content.Context;
 import android.content.DialogInterface;
 import android.content.SharedPreferences;
 import android.content.res.Configuration;
 import android.os.Build;
 import android.view.View;
+import android.view.WindowInsets;
 import android.view.WindowManager;
 
 import com.limelight.R;
@@ -19,10 +18,6 @@ import java.util.Locale;
 
 public class UiHelper {
 
-    // Values from https://developer.android.com/training/tv/start/layouts.html
-    private static final int TV_VERTICAL_PADDING_DP = 27;
-    private static final int TV_HORIZONTAL_PADDING_DP = 48;
-
     public static void setLocale(Activity activity)
     {
         String locale = PreferenceConfiguration.readPreferences(activity).language;
@@ -56,6 +51,23 @@ public class UiHelper {
             activity.getWindow().getAttributes().layoutInDisplayCutoutMode =
                     WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES;
         }
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+            // Draw under the status bar on Android Q devices
+
+            activity.getWindow().getDecorView().setOnApplyWindowInsetsListener(new View.OnApplyWindowInsetsListener() {
+                @Override
+                public WindowInsets onApplyWindowInsets(View view, WindowInsets windowInsets) {
+                    view.setPadding(windowInsets.getSystemWindowInsetLeft(),
+                            windowInsets.getSystemWindowInsetTop(),
+                            windowInsets.getSystemWindowInsetRight(),
+                            0);
+                    return windowInsets;
+                }
+            });
+
+            activity.getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_STABLE | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION);
+        }
     }
 
     public static void showDecoderCrashDialog(Activity activity) {
diff --git a/app/src/main/res/layout-land/activity_pc_view.xml b/app/src/main/res/layout-land/activity_pc_view.xml
index dcfdee1c..f745fe0a 100644
--- a/app/src/main/res/layout-land/activity_pc_view.xml
+++ b/app/src/main/res/layout-land/activity_pc_view.xml
@@ -2,7 +2,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:paddingBottom="@dimen/activity_vertical_margin"
     android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
diff --git a/app/src/main/res/layout/activity_app_view.xml b/app/src/main/res/layout/activity_app_view.xml
index 9decf13d..7a22e7dc 100644
--- a/app/src/main/res/layout/activity_app_view.xml
+++ b/app/src/main/res/layout/activity_app_view.xml
@@ -2,10 +2,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:paddingBottom="@dimen/activity_vertical_margin"
-    android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
     tools:context=".AppView" >
 
     <FrameLayout
@@ -27,8 +23,6 @@
         android:layout_centerHorizontal="true"
         android:layout_alignParentTop="true"
         android:gravity="center"
-        android:paddingTop="0dp"
-        android:paddingBottom="10dp"
         android:textSize="28sp"/>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_pc_view.xml b/app/src/main/res/layout/activity_pc_view.xml
index edf00f04..e58f474c 100644
--- a/app/src/main/res/layout/activity_pc_view.xml
+++ b/app/src/main/res/layout/activity_pc_view.xml
@@ -3,7 +3,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:paddingBottom="@dimen/activity_vertical_margin"
     android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
diff --git a/app/src/main/res/layout/activity_stream_settings.xml b/app/src/main/res/layout/activity_stream_settings.xml
index 9705162d..fa3674b7 100644
--- a/app/src/main/res/layout/activity_stream_settings.xml
+++ b/app/src/main/res/layout/activity_stream_settings.xml
@@ -2,10 +2,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
-    android:paddingBottom="@dimen/activity_vertical_margin"
     android:id="@+id/stream_settings"
     tools:context=".preferences.StreamSettings">
 
diff --git a/app/src/main/res/layout/app_grid_view.xml b/app/src/main/res/layout/app_grid_view.xml
index 4e50846d..f2e91bae 100644
--- a/app/src/main/res/layout/app_grid_view.xml
+++ b/app/src/main/res/layout/app_grid_view.xml
@@ -5,7 +5,7 @@
     android:layout_height="fill_parent"
     android:numColumns="auto_fit"
     android:columnWidth="160dp"
-    android:stretchMode="spacingWidth"
+    android:stretchMode="spacingWidthUniform"
     android:focusable="true"
     android:focusableInTouchMode="true"
     android:gravity="center"/>
\ No newline at end of file
diff --git a/app/src/main/res/layout/app_grid_view_small.xml b/app/src/main/res/layout/app_grid_view_small.xml
index 82ec1601..0415bb7e 100644
--- a/app/src/main/res/layout/app_grid_view_small.xml
+++ b/app/src/main/res/layout/app_grid_view_small.xml
@@ -5,7 +5,7 @@
     android:layout_height="fill_parent"
     android:numColumns="auto_fit"
     android:columnWidth="105dp"
-    android:stretchMode="spacingWidth"
+    android:stretchMode="spacingWidthUniform"
     android:focusable="true"
     android:focusableInTouchMode="true"
     android:gravity="center"/>
\ No newline at end of file