diff --git a/app/src/main/java/net/schueller/peertube/adapter/VideoAdapter.java b/app/src/main/java/net/schueller/peertube/adapter/VideoAdapter.java
index 36b5c81..b3983f0 100644
--- a/app/src/main/java/net/schueller/peertube/adapter/VideoAdapter.java
+++ b/app/src/main/java/net/schueller/peertube/adapter/VideoAdapter.java
@@ -88,8 +88,14 @@ public class VideoAdapter extends RecyclerView.Adapter<VideoAdapter.VideoViewHol
         // set Name
         holder.name.setText(videoList.get(position).getName());
 
-        // set duration
-        holder.videoDuration.setText(MetaDataHelper.getDuration(videoList.get(position).getDuration().longValue()));
+        // set duration (if not live stream)
+        if (videoList.get(position).getLive()) {
+            holder.videoDuration.setText(R.string.video_list_live_marker);
+            holder.videoDuration.setBackgroundColor(context.getResources().getColor(R.color.durationLiveBackgroundColor));
+        } else {
+            holder.videoDuration.setText(MetaDataHelper.getDuration(videoList.get(position).getDuration().longValue()));
+            holder.videoDuration.setBackgroundColor(context.getResources().getColor(R.color.durationBackgroundColor));
+        }
 
         // set age and view count
         holder.videoMeta.setText(
diff --git a/app/src/main/java/net/schueller/peertube/model/State.java b/app/src/main/java/net/schueller/peertube/model/State.java
index c0bc50d..91f846f 100644
--- a/app/src/main/java/net/schueller/peertube/model/State.java
+++ b/app/src/main/java/net/schueller/peertube/model/State.java
@@ -18,6 +18,12 @@ package net.schueller.peertube.model;
 
 public class State {
 
+    public static final int PUBLISHED = 1;
+    public static final int TO_TRANSCODE = 2;
+    public static final int TO_IMPORT = 3;
+    public static final int WAITING_FOR_LIVE = 4;
+    public static final int LIVE_ENDED = 5;
+
     private Integer id;
     private String label;
 
diff --git a/app/src/main/java/net/schueller/peertube/model/Video.java b/app/src/main/java/net/schueller/peertube/model/Video.java
index c6b0d0c..e6d275e 100644
--- a/app/src/main/java/net/schueller/peertube/model/Video.java
+++ b/app/src/main/java/net/schueller/peertube/model/Video.java
@@ -43,6 +43,7 @@ public class Video {
     private Boolean nsfw;
     private String description;
     private Boolean isLocal;
+    private Boolean isLive;
     private Integer duration;
     private Integer views;
     private Integer likes;
@@ -149,6 +150,14 @@ public class Video {
         isLocal = local;
     }
 
+    public Boolean getLive() {
+        return isLive;
+    }
+
+    public void setLive(final Boolean live) {
+        isLive = live;
+    }
+
     public Integer getDuration() {
         return duration;
     }
diff --git a/app/src/main/res/layout/row_account_about.xml b/app/src/main/res/layout/row_account_about.xml
index cb86831..11ccc62 100644
--- a/app/src/main/res/layout/row_account_about.xml
+++ b/app/src/main/res/layout/row_account_about.xml
@@ -35,7 +35,8 @@
                 android:id="@+id/video_duration"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:background="#000000"/>
+                android:textColor="@color/durationTextColor"
+                android:background="@color/durationBackgroundColor"/>
 
         <de.hdodenhof.circleimageview.CircleImageView xmlns:app="http://schemas.android.com/apk/res-auto"
             android:id="@+id/avatar"
diff --git a/app/src/main/res/layout/row_account_channels.xml b/app/src/main/res/layout/row_account_channels.xml
index cb86831..11ccc62 100644
--- a/app/src/main/res/layout/row_account_channels.xml
+++ b/app/src/main/res/layout/row_account_channels.xml
@@ -35,7 +35,8 @@
                 android:id="@+id/video_duration"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:background="#000000"/>
+                android:textColor="@color/durationTextColor"
+                android:background="@color/durationBackgroundColor"/>
 
         <de.hdodenhof.circleimageview.CircleImageView xmlns:app="http://schemas.android.com/apk/res-auto"
             android:id="@+id/avatar"
diff --git a/app/src/main/res/layout/row_account_video.xml b/app/src/main/res/layout/row_account_video.xml
index cb86831..11ccc62 100644
--- a/app/src/main/res/layout/row_account_video.xml
+++ b/app/src/main/res/layout/row_account_video.xml
@@ -35,7 +35,8 @@
                 android:id="@+id/video_duration"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:background="#000000"/>
+                android:textColor="@color/durationTextColor"
+                android:background="@color/durationBackgroundColor"/>
 
         <de.hdodenhof.circleimageview.CircleImageView xmlns:app="http://schemas.android.com/apk/res-auto"
             android:id="@+id/avatar"
diff --git a/app/src/main/res/layout/row_video_list.xml b/app/src/main/res/layout/row_video_list.xml
index 398db17..d2affc9 100644
--- a/app/src/main/res/layout/row_video_list.xml
+++ b/app/src/main/res/layout/row_video_list.xml
@@ -42,8 +42,8 @@
                 android:id="@+id/video_duration"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:textColor="#ffffff"
-                android:background="#232323"/>
+                android:textColor="@color/durationTextColor"
+                android:background="@color/durationBackgroundColor"/>
 
         <de.hdodenhof.circleimageview.CircleImageView xmlns:app="http://schemas.android.com/apk/res-auto"
             android:id="@+id/avatar"
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index e5588c1..d448979 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -5,7 +5,9 @@
     <color name="themeSelected">#e300aaff</color>
     <color name="seperator">#7ca6a6a6</color>
     <color name="videoBackgroundColor">#000000</color>
-
+    <color name="durationBackgroundColor">#232323</color>
+    <color name="durationLiveBackgroundColor">#ff0000</color>
+    <color name="durationTextColor">#ffffff</color>
 
     <!-- RED Theme -->
     <color name="primaryColorRed">#F44336</color>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d4a765e..12b07d2 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -361,4 +361,5 @@
     <string name="pref_insecure_confirm_no">No</string>
     <string name="pref_insecure_confirm_yes">Yes</string>
     <string name="pref_insecure_confirm_message">You are about the disable all SSL Certification validation in Thorium. Disabling this can be very dangerous if the peertube server is not under your control, because a man-in-the-middle attack could direct traffic to another server without your knowledge. An attacker could record passwords and other personal data.</string>
+    <string name="video_list_live_marker">LIVE</string>
 </resources>
\ No newline at end of file