diff --git a/app/src/leanback/res/color/channel.xml b/app/src/leanback/res/color/channel.xml
deleted file mode 100644
index 1d23cc3b8..000000000
--- a/app/src/leanback/res/color/channel.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@color/white" android:state_focused="true" android:state_selected="true" />
-    <item android:color="@color/blue_500" android:state_selected="true" />
-    <item android:color="@color/white" />
-</selector>
\ No newline at end of file
diff --git a/app/src/leanback/res/color/group.xml b/app/src/leanback/res/color/group.xml
deleted file mode 100644
index 1d23cc3b8..000000000
--- a/app/src/leanback/res/color/group.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@color/white" android:state_focused="true" android:state_selected="true" />
-    <item android:color="@color/blue_500" android:state_selected="true" />
-    <item android:color="@color/white" />
-</selector>
\ No newline at end of file
diff --git a/app/src/leanback/res/color/epg.xml b/app/src/leanback/res/color/live.xml
similarity index 100%
rename from app/src/leanback/res/color/epg.xml
rename to app/src/leanback/res/color/live.xml
diff --git a/app/src/leanback/res/drawable/selector_channel.xml b/app/src/leanback/res/drawable/selector_channel.xml
deleted file mode 100644
index a8c20ac96..000000000
--- a/app/src/leanback/res/drawable/selector_channel.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/shape_channel" android:state_focused="true" />
-</selector>
\ No newline at end of file
diff --git a/app/src/leanback/res/drawable/selector_epg.xml b/app/src/leanback/res/drawable/selector_epg.xml
deleted file mode 100644
index 318a7508e..000000000
--- a/app/src/leanback/res/drawable/selector_epg.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/shape_epg_focused" android:state_focused="true" />
-</selector>
\ No newline at end of file
diff --git a/app/src/leanback/res/drawable/selector_group.xml b/app/src/leanback/res/drawable/selector_live.xml
similarity index 51%
rename from app/src/leanback/res/drawable/selector_group.xml
rename to app/src/leanback/res/drawable/selector_live.xml
index 37081f773..d10758c18 100644
--- a/app/src/leanback/res/drawable/selector_group.xml
+++ b/app/src/leanback/res/drawable/selector_live.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/shape_group" android:state_focused="true" />
+    <item android:drawable="@drawable/shape_live_focused" android:state_focused="true" />
 </selector>
\ No newline at end of file
diff --git a/app/src/leanback/res/drawable/shape_channel.xml b/app/src/leanback/res/drawable/shape_channel.xml
deleted file mode 100644
index 60f84f8be..000000000
--- a/app/src/leanback/res/drawable/shape_channel.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/blue_500" />
-
-    <corners android:radius="28dp" />
-
-    <padding
-        android:bottom="8dp"
-        android:left="12dp"
-        android:right="12dp"
-        android:top="8dp" />
-
-</shape>
\ No newline at end of file
diff --git a/app/src/leanback/res/drawable/shape_group.xml b/app/src/leanback/res/drawable/shape_group.xml
deleted file mode 100644
index 60f84f8be..000000000
--- a/app/src/leanback/res/drawable/shape_group.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="@color/blue_500" />
-
-    <corners android:radius="28dp" />
-
-    <padding
-        android:bottom="8dp"
-        android:left="12dp"
-        android:right="12dp"
-        android:top="8dp" />
-
-</shape>
\ No newline at end of file
diff --git a/app/src/leanback/res/drawable/shape_epg_focused.xml b/app/src/leanback/res/drawable/shape_live_focused.xml
similarity index 100%
rename from app/src/leanback/res/drawable/shape_epg_focused.xml
rename to app/src/leanback/res/drawable/shape_live_focused.xml
diff --git a/app/src/leanback/res/layout/activity_live.xml b/app/src/leanback/res/layout/activity_live.xml
index 058d80c85..fb88de18f 100644
--- a/app/src/leanback/res/layout/activity_live.xml
+++ b/app/src/leanback/res/layout/activity_live.xml
@@ -56,9 +56,6 @@
             android:id="@+id/group"
             android:layout_width="0dp"
             android:layout_height="match_parent"
-            android:clipChildren="false"
-            android:clipToPadding="false"
-            android:padding="8dp"
             tools:itemCount="5"
             tools:listitem="@layout/adapter_group" />
 
@@ -66,10 +63,6 @@
             android:id="@+id/channel"
             android:layout_width="0dp"
             android:layout_height="match_parent"
-            android:clipChildren="false"
-            android:clipToPadding="false"
-            android:padding="8dp"
-            android:translationX="-16dp"
             tools:itemCount="5"
             tools:listitem="@layout/adapter_channel" />
 
diff --git a/app/src/leanback/res/layout/adapter_channel.xml b/app/src/leanback/res/layout/adapter_channel.xml
index add10718d..5444110e2 100644
--- a/app/src/leanback/res/layout/adapter_channel.xml
+++ b/app/src/leanback/res/layout/adapter_channel.xml
@@ -3,9 +3,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:layout_marginTop="8dp"
-    android:layout_marginBottom="8dp"
-    android:background="@drawable/selector_channel"
+    android:layout_margin="1.5dp"
+    android:background="@drawable/selector_live"
     android:focusable="true"
     android:focusableInTouchMode="true"
     android:gravity="center"
@@ -17,7 +16,7 @@
         android:layout_height="wrap_content"
         android:layout_marginEnd="12dp"
         android:duplicateParentState="true"
-        android:textColor="@color/channel"
+        android:textColor="@color/live"
         android:textSize="16sp"
         tools:text="01" />
 
@@ -35,7 +34,7 @@
         android:duplicateParentState="true"
         android:ellipsize="marquee"
         android:singleLine="true"
-        android:textColor="@color/channel"
+        android:textColor="@color/live"
         android:textSize="16sp"
         tools:text="CNN" />
 
diff --git a/app/src/leanback/res/layout/adapter_epg_data.xml b/app/src/leanback/res/layout/adapter_epg_data.xml
index 35c15f42a..15a882633 100644
--- a/app/src/leanback/res/layout/adapter_epg_data.xml
+++ b/app/src/leanback/res/layout/adapter_epg_data.xml
@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_margin="1.5dp"
-    android:background="@drawable/selector_epg"
+    android:background="@drawable/selector_live"
     android:focusable="true"
     android:focusableInTouchMode="true"
     android:orientation="vertical">
@@ -16,7 +16,7 @@
         android:duplicateParentState="true"
         android:ellipsize="marquee"
         android:singleLine="true"
-        android:textColor="@color/epg"
+        android:textColor="@color/live"
         android:textSize="16sp"
         tools:text="七龍珠" />
 
@@ -27,7 +27,7 @@
         android:duplicateParentState="true"
         android:ellipsize="marquee"
         android:singleLine="true"
-        android:textColor="@color/epg"
+        android:textColor="@color/live"
         android:textSize="14sp"
         tools:text="18:00 ~ 19:00" />
 
diff --git a/app/src/leanback/res/layout/adapter_group.xml b/app/src/leanback/res/layout/adapter_group.xml
index a4db80cd0..06da727e9 100644
--- a/app/src/leanback/res/layout/adapter_group.xml
+++ b/app/src/leanback/res/layout/adapter_group.xml
@@ -3,8 +3,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginTop="8dp"
-    android:layout_marginBottom="8dp"
+    android:layout_margin="1.5dp"
+    android:background="@drawable/selector_live"
     android:focusable="true"
     android:focusableInTouchMode="true"
     android:gravity="center"
@@ -14,11 +14,10 @@
         android:id="@+id/name"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:background="@drawable/selector_group"
         android:duplicateParentState="true"
         android:ellipsize="marquee"
         android:singleLine="true"
-        android:textColor="@color/group"
+        android:textColor="@color/live"
         android:textSize="16sp"
         tools:text="收藏" />