diff --git a/android/Snapcast/build.gradle b/android/Snapcast/build.gradle
index 1d19af81..a8e0555f 100644
--- a/android/Snapcast/build.gradle
+++ b/android/Snapcast/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "de.badaix.snapcast"
         minSdkVersion 16
         targetSdkVersion 27
-        versionCode 1300
-        versionName "0.13.0"
+        versionCode 1301
+        versionName "0.13.1"
         multiDexEnabled true
         vectorDrawables.useSupportLibrary = true
     }
diff --git a/android/Snapcast/src/main/java/de/badaix/snapcast/ServerDialogFragment.java b/android/Snapcast/src/main/java/de/badaix/snapcast/ServerDialogFragment.java
index 47941d69..d3634ff0 100644
--- a/android/Snapcast/src/main/java/de/badaix/snapcast/ServerDialogFragment.java
+++ b/android/Snapcast/src/main/java/de/badaix/snapcast/ServerDialogFragment.java
@@ -23,7 +23,6 @@ import android.app.Dialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.net.nsd.NsdServiceInfo;
-import android.os.Build;
 import android.os.Bundle;
 import android.support.v4.app.DialogFragment;
 import android.support.v7.app.AlertDialog;
diff --git a/android/Snapcast/src/main/res/layout-large/client_item_not_used.xml b/android/Snapcast/src/main/res/layout-large/client_item_not_used.xml
index 1175856e..e14f6192 100644
--- a/android/Snapcast/src/main/res/layout-large/client_item_not_used.xml
+++ b/android/Snapcast/src/main/res/layout-large/client_item_not_used.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-             xmlns:card_view="http://schemas.android.com/apk/res-auto"
-             android:layout_width="match_parent"
-             android:layout_height="wrap_content">
+    xmlns:card_view="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
     <!--    android:descendantFocusability="afterDescendants"-->
     <!--    android:paddingRight="?android:attr/scrollbarSize"-->
     <!--    android:background="@drawable/big_card"-->
@@ -25,7 +26,7 @@
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
                 android:background="@null"
-                android:src="@drawable/ic_menu_overflow_material"/>
+                app:srcCompat="@drawable/ic_menu_overflow_material"/>
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -39,12 +40,11 @@
                     android:id="@+id/title"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:ellipsize="marquee"
+                    android:singleLine="true"
                     android:fadingEdge="horizontal"
                     android:paddingBottom="5dp"
                     android:paddingLeft="5dp"
                     android:paddingTop="5dp"
-                    android:maxLines="1"
                     android:text="Title"
                     android:textAppearance="?android:attr/textAppearanceMedium"/>
 
diff --git a/android/Snapcast/src/main/res/layout/client_item.xml b/android/Snapcast/src/main/res/layout/client_item.xml
index e0d91d7b..6fc96fe9 100644
--- a/android/Snapcast/src/main/res/layout/client_item.xml
+++ b/android/Snapcast/src/main/res/layout/client_item.xml
@@ -18,8 +18,9 @@
   -->
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <ImageButton
         android:id="@+id/ibOverflow"
@@ -28,7 +29,7 @@
         android:layout_alignParentRight="true"
         android:layout_centerVertical="true"
         android:background="@null"
-        android:src="@drawable/ic_menu_overflow_material"/>
+        app:srcCompat="@drawable/ic_menu_overflow_material"/>
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -42,9 +43,8 @@
             android:id="@+id/title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:ellipsize="marquee"
+            android:singleLine="true"
             android:fadingEdge="horizontal"
-            android:maxLines="1"
             android:paddingBottom="1dp"
             android:paddingLeft="5dp"
             android:paddingTop="2dp"
diff --git a/android/Snapcast/src/main/res/layout/group_item.xml b/android/Snapcast/src/main/res/layout/group_item.xml
index 7c3bd9a8..d0d52117 100644
--- a/android/Snapcast/src/main/res/layout/group_item.xml
+++ b/android/Snapcast/src/main/res/layout/group_item.xml
@@ -65,12 +65,11 @@
                         android:id="@+id/tvStreamName"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:ellipsize="marquee"
+                        android:singleLine="true"
                         android:fadingEdge="horizontal"
                         android:paddingBottom="1dp"
                         android:paddingLeft="5dp"
                         android:paddingTop="2dp"
-                        android:maxLines="1"
                         android:text="Stream name"
                         android:textAppearance="?android:attr/textAppearanceMedium"/>