diff --git a/app/src/main/java/com/limelight/binding/input/virtual_controller/VirtualController.java b/app/src/main/java/com/limelight/binding/input/virtual_controller/VirtualController.java
index 34d207e2..6746fdf0 100644
--- a/app/src/main/java/com/limelight/binding/input/virtual_controller/VirtualController.java
+++ b/app/src/main/java/com/limelight/binding/input/virtual_controller/VirtualController.java
@@ -60,7 +60,7 @@ public class VirtualController {
         frame_layout.addView(relative_layout);
 
         buttonConfigure = new Button(context);
-        buttonConfigure.setBackgroundResource(R.drawable.settings);
+        buttonConfigure.setBackgroundResource(R.drawable.ic_settings);
         buttonConfigure.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
diff --git a/app/src/main/java/com/limelight/grid/AppGridAdapter.java b/app/src/main/java/com/limelight/grid/AppGridAdapter.java
index 91bf6243..b28f53d9 100644
--- a/app/src/main/java/com/limelight/grid/AppGridAdapter.java
+++ b/app/src/main/java/com/limelight/grid/AppGridAdapter.java
@@ -101,7 +101,7 @@ public class AppGridAdapter extends GenericGridAdapter<AppView.AppObject> {
     public boolean populateOverlayView(ImageView overlayView, AppView.AppObject obj) {
         if (obj.app.getIsRunning()) {
             // Show the play button overlay
-            overlayView.setImageResource(R.drawable.play);
+            overlayView.setImageResource(R.drawable.ic_play);
             return true;
         }
 
diff --git a/app/src/main/java/com/limelight/grid/PcGridAdapter.java b/app/src/main/java/com/limelight/grid/PcGridAdapter.java
index b753ec0c..f28b0bfb 100644
--- a/app/src/main/java/com/limelight/grid/PcGridAdapter.java
+++ b/app/src/main/java/com/limelight/grid/PcGridAdapter.java
@@ -44,7 +44,7 @@ public class PcGridAdapter extends GenericGridAdapter<PcView.ComputerObject> {
             imgView.setAlpha(0.4f);
         }
 
-        imgView.setImageResource(R.drawable.computer);
+        imgView.setImageResource(R.drawable.ic_computer);
         return true;
     }
 
@@ -63,7 +63,11 @@ public class PcGridAdapter extends GenericGridAdapter<PcView.ComputerObject> {
 
     @Override
     public boolean populateOverlayView(ImageView overlayView, PcView.ComputerObject obj) {
-        // No overlay
+        if (obj.details.state == ComputerDetails.State.OFFLINE) {
+            overlayView.setImageResource(R.drawable.ic_pc_offline);
+            overlayView.setAlpha(0.4f);
+            return true;
+        }
         return false;
     }
 
diff --git a/app/src/main/res/drawable/add_computer.png b/app/src/main/res/drawable/add_computer.png
deleted file mode 100644
index e228d32d..00000000
Binary files a/app/src/main/res/drawable/add_computer.png and /dev/null differ
diff --git a/app/src/main/res/drawable/computer.png b/app/src/main/res/drawable/computer.png
deleted file mode 100644
index 1b6abe7c..00000000
Binary files a/app/src/main/res/drawable/computer.png and /dev/null differ
diff --git a/app/src/main/res/drawable/ic_add.xml b/app/src/main/res/drawable/ic_add.xml
new file mode 100644
index 00000000..9efccae6
--- /dev/null
+++ b/app/src/main/res/drawable/ic_add.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM17,13h-4v4h-2v-4L7,13v-2h4L11,7h2v4h4v2z"
+        android:fillColor="#FFFFFF"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_computer.xml b/app/src/main/res/drawable/ic_computer.xml
new file mode 100644
index 00000000..ceb77ca6
--- /dev/null
+++ b/app/src/main/res/drawable/ic_computer.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:pathData="M21,2L3,2c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h7v2L8,20v2h8v-2h-2v-2h7c1.1,0 2,-0.9 2,-2L23,4c0,-1.1 -0.9,-2 -2,-2zM21,16L3,16L3,4h18v12z"
+        android:fillColor="#FFFFFF"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_pc_offline.xml b/app/src/main/res/drawable/ic_pc_offline.xml
new file mode 100644
index 00000000..4b1fcea8
--- /dev/null
+++ b/app/src/main/res/drawable/ic_pc_offline.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:pathData="M23.64,7c-0.45,-0.34 -4.93,-4 -11.64,-4 -1.5,0 -2.89,0.19 -4.15,0.48L18.18,13.8 23.64,7zM17.04,15.22L3.27,1.44 2,2.72l2.05,2.06C1.91,5.76 0.59,6.82 0.36,7l11.63,14.49 0.01,0.01 0.01,-0.01 3.9,-4.86 3.32,3.32 1.27,-1.27 -3.46,-3.46z"
+        android:fillColor="#FFFFFF"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_play.xml b/app/src/main/res/drawable/ic_play.xml
new file mode 100644
index 00000000..806a1d50
--- /dev/null
+++ b/app/src/main/res/drawable/ic_play.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM10,16.5v-9l6,4.5 -6,4.5z"
+        android:fillColor="#FFFFFF"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_settings.xml b/app/src/main/res/drawable/ic_settings.xml
new file mode 100644
index 00000000..a59ecc14
--- /dev/null
+++ b/app/src/main/res/drawable/ic_settings.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:pathData="M19.43,12.98c0.04,-0.32 0.07,-0.64 0.07,-0.98s-0.03,-0.66 -0.07,-0.98l2.11,-1.65c0.19,-0.15 0.24,-0.42 0.12,-0.64l-2,-3.46c-0.12,-0.22 -0.39,-0.3 -0.61,-0.22l-2.49,1c-0.52,-0.4 -1.08,-0.73 -1.69,-0.98l-0.38,-2.65C14.46,2.18 14.25,2 14,2h-4c-0.25,0 -0.46,0.18 -0.49,0.42l-0.38,2.65c-0.61,0.25 -1.17,0.59 -1.69,0.98l-2.49,-1c-0.23,-0.09 -0.49,0 -0.61,0.22l-2,3.46c-0.13,0.22 -0.07,0.49 0.12,0.64l2.11,1.65c-0.04,0.32 -0.07,0.65 -0.07,0.98s0.03,0.66 0.07,0.98l-2.11,1.65c-0.19,0.15 -0.24,0.42 -0.12,0.64l2,3.46c0.12,0.22 0.39,0.3 0.61,0.22l2.49,-1c0.52,0.4 1.08,0.73 1.69,0.98l0.38,2.65c0.03,0.24 0.24,0.42 0.49,0.42h4c0.25,0 0.46,-0.18 0.49,-0.42l0.38,-2.65c0.61,-0.25 1.17,-0.59 1.69,-0.98l2.49,1c0.23,0.09 0.49,0 0.61,-0.22l2,-3.46c0.12,-0.22 0.07,-0.49 -0.12,-0.64l-2.11,-1.65zM12,15.5c-1.93,0 -3.5,-1.57 -3.5,-3.5s1.57,-3.5 3.5,-3.5 3.5,1.57 3.5,3.5 -1.57,3.5 -3.5,3.5z"
+        android:fillColor="#FFFFFF"/>
+</vector>
diff --git a/app/src/main/res/drawable/play.png b/app/src/main/res/drawable/play.png
deleted file mode 100644
index d03e6e6e..00000000
Binary files a/app/src/main/res/drawable/play.png and /dev/null differ
diff --git a/app/src/main/res/drawable/settings.png b/app/src/main/res/drawable/settings.png
deleted file mode 100644
index 8d20bbb2..00000000
Binary files a/app/src/main/res/drawable/settings.png and /dev/null differ
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 eb870d39..77c577c2 100644
--- a/app/src/main/res/layout-land/activity_pc_view.xml
+++ b/app/src/main/res/layout-land/activity_pc_view.xml
@@ -55,7 +55,7 @@
         android:layout_alignParentStart="true"
         android:layout_alignParentLeft="true"
         android:layout_alignParentTop="true"
-        android:src="@drawable/settings"
+        android:src="@drawable/ic_settings"
         style="?android:attr/borderlessButtonStyle"/>
 
     <ImageButton
@@ -68,7 +68,7 @@
         android:layout_alignParentTop="true"
         android:layout_alignParentRight="true"
         android:layout_alignParentEnd="true"
-        android:src="@drawable/add_computer"
+        android:src="@drawable/ic_add"
         style="?android:attr/borderlessButtonStyle"/>
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout-port/activity_pc_view.xml b/app/src/main/res/layout-port/activity_pc_view.xml
index a14290ae..fe961396 100644
--- a/app/src/main/res/layout-port/activity_pc_view.xml
+++ b/app/src/main/res/layout-port/activity_pc_view.xml
@@ -54,7 +54,7 @@
         android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true"
         android:layout_alignParentTop="true"
-        android:src="@drawable/settings"
+        android:src="@drawable/ic_settings"
         style="?android:attr/borderlessButtonStyle"/>
     
     <ImageButton
@@ -66,7 +66,7 @@
         android:layout_alignParentTop="true"
         android:layout_alignParentEnd="true"
         android:layout_alignParentRight="true"
-        android:src="@drawable/add_computer"
+        android:src="@drawable/ic_add"
         style="?android:attr/borderlessButtonStyle"/>
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/pc_grid_item.xml b/app/src/main/res/layout/pc_grid_item.xml
index 9fdaf2ce..df92608f 100644
--- a/app/src/main/res/layout/pc_grid_item.xml
+++ b/app/src/main/res/layout/pc_grid_item.xml
@@ -10,16 +10,20 @@
         <ImageView
             android:id="@+id/grid_image"
             android:layout_centerHorizontal="true"
-            android:layout_width="150dp"
-            android:layout_height="100dp">
+            android:layout_width="125dp"
+            android:layout_height="125dp">
+        </ImageView>
+        <ImageView
+            android:id="@+id/grid_overlay"
+            android:layout_centerHorizontal="true"
+            android:layout_marginTop="30dp"
+            android:layout_width="50dp"
+            android:layout_height="50dp">
         </ImageView>
         <ProgressBar
             android:id="@+id/grid_spinner"
-            android:layout_marginTop="15dp"
-            android:layout_marginLeft="65dp"
-            android:layout_marginStart="65dp"
-            android:layout_marginRight="20dp"
-            android:layout_marginEnd="20dp"
+            android:layout_centerHorizontal="true"
+            android:layout_marginTop="30dp"
             android:layout_width="50dp"
             android:layout_height="50dp"
             android:indeterminate="true">
@@ -27,7 +31,7 @@
     </RelativeLayout>
     <TextView
         android:id="@+id/grid_text"
-        android:layout_width="150dp"
+        android:layout_width="125dp"
         android:layout_height="wrap_content"
         android:layout_below="@id/grid_image_layout"
         android:layout_marginTop="10dp"
diff --git a/app/src/main/res/layout/pc_grid_item_small.xml b/app/src/main/res/layout/pc_grid_item_small.xml
index 1418746f..4b6defdd 100644
--- a/app/src/main/res/layout/pc_grid_item_small.xml
+++ b/app/src/main/res/layout/pc_grid_item_small.xml
@@ -10,16 +10,20 @@
         <ImageView
             android:id="@+id/grid_image"
             android:layout_centerHorizontal="true"
-            android:layout_width="100dp"
-            android:layout_height="67dp">
+            android:layout_width="75dp"
+            android:layout_height="75dp">
+        </ImageView>
+        <ImageView
+            android:id="@+id/grid_overlay"
+            android:layout_centerHorizontal="true"
+            android:layout_marginTop="16dp"
+            android:layout_width="33dp"
+            android:layout_height="33dp">
         </ImageView>
         <ProgressBar
             android:id="@+id/grid_spinner"
-            android:layout_marginTop="10dp"
-            android:layout_marginLeft="42dp"
-            android:layout_marginStart="42dp"
-            android:layout_marginRight="13dp"
-            android:layout_marginEnd="13dp"
+            android:layout_centerHorizontal="true"
+            android:layout_marginTop="16dp"
             android:layout_width="33dp"
             android:layout_height="33dp"
             android:indeterminate="true">
@@ -27,7 +31,7 @@
     </RelativeLayout>
     <TextView
         android:id="@+id/grid_text"
-        android:layout_width="100dp"
+        android:layout_width="75dp"
         android:layout_height="wrap_content"
         android:layout_below="@id/grid_image_layout"
         android:layout_marginTop="10dp"