diff --git a/libSafeMobile/src/main/AndroidManifest.xml b/libSafeMobile/src/main/AndroidManifest.xml
index b6b0535..dc6d6f5 100644
--- a/libSafeMobile/src/main/AndroidManifest.xml
+++ b/libSafeMobile/src/main/AndroidManifest.xml
@@ -6,7 +6,7 @@
 
     <application
         android:allowBackup="true"
-        android:icon="@drawable/ic_launcher"
+        android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:theme="@style/AppTheme" >
     </application>
diff --git a/libSafeMobile/src/main/res/drawable/ic_launcher.png b/libSafeMobile/src/main/res/drawable/ic_launcher.png
deleted file mode 100644
index 63d2d68..0000000
Binary files a/libSafeMobile/src/main/res/drawable/ic_launcher.png and /dev/null differ
diff --git a/libSafeMobile/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/libSafeMobile/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
new file mode 100644
index 0000000..036d09b
--- /dev/null
+++ b/libSafeMobile/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>
\ No newline at end of file
diff --git a/libSafeMobile/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/libSafeMobile/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
new file mode 100644
index 0000000..036d09b
--- /dev/null
+++ b/libSafeMobile/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>
\ No newline at end of file
diff --git a/libSafeMobile/src/main/res/mipmap-hdpi/ic_launcher.png b/libSafeMobile/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 0000000..20fca4b
Binary files /dev/null and b/libSafeMobile/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/libSafeMobile/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/libSafeMobile/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..a78bb0d
Binary files /dev/null and b/libSafeMobile/src/main/res/mipmap-hdpi/ic_launcher_foreground.png differ
diff --git a/libSafeMobile/src/main/res/mipmap-hdpi/ic_launcher_round.png b/libSafeMobile/src/main/res/mipmap-hdpi/ic_launcher_round.png
new file mode 100644
index 0000000..fd5b6e5
Binary files /dev/null and b/libSafeMobile/src/main/res/mipmap-hdpi/ic_launcher_round.png differ
diff --git a/libSafeMobile/src/main/res/mipmap-mdpi/ic_launcher.png b/libSafeMobile/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 0000000..e4405e2
Binary files /dev/null and b/libSafeMobile/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/libSafeMobile/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/libSafeMobile/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..6041008
Binary files /dev/null and b/libSafeMobile/src/main/res/mipmap-mdpi/ic_launcher_foreground.png differ
diff --git a/libSafeMobile/src/main/res/mipmap-mdpi/ic_launcher_round.png b/libSafeMobile/src/main/res/mipmap-mdpi/ic_launcher_round.png
new file mode 100644
index 0000000..e9786e1
Binary files /dev/null and b/libSafeMobile/src/main/res/mipmap-mdpi/ic_launcher_round.png differ
diff --git a/libSafeMobile/src/main/res/mipmap-xhdpi/ic_launcher.png b/libSafeMobile/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 0000000..40d6401
Binary files /dev/null and b/libSafeMobile/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/libSafeMobile/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/libSafeMobile/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..3a57106
Binary files /dev/null and b/libSafeMobile/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png differ
diff --git a/libSafeMobile/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/libSafeMobile/src/main/res/mipmap-xhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..1a56618
Binary files /dev/null and b/libSafeMobile/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ
diff --git a/libSafeMobile/src/main/res/mipmap-xxhdpi/ic_launcher.png b/libSafeMobile/src/main/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 0000000..ee1fcaf
Binary files /dev/null and b/libSafeMobile/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/libSafeMobile/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/libSafeMobile/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..155231f
Binary files /dev/null and b/libSafeMobile/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png differ
diff --git a/libSafeMobile/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/libSafeMobile/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..f69d17d
Binary files /dev/null and b/libSafeMobile/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ
diff --git a/libSafeMobile/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/libSafeMobile/src/main/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 0000000..9ef1d44
Binary files /dev/null and b/libSafeMobile/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/libSafeMobile/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/libSafeMobile/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..6e27db5
Binary files /dev/null and b/libSafeMobile/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ
diff --git a/libSafeMobile/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/libSafeMobile/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..51186bc
Binary files /dev/null and b/libSafeMobile/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ
diff --git a/safeDispatch/src/main/AndroidManifest.xml b/safeDispatch/src/main/AndroidManifest.xml
index 7e09470..14cf37f 100644
--- a/safeDispatch/src/main/AndroidManifest.xml
+++ b/safeDispatch/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     package="com.safemobile.dispatch">
 
     <!-- require OpenGL ES version 2 for Google Maps -->
@@ -26,7 +25,7 @@
 
     <application
         android:configChanges="orientation"
-        android:icon="@drawable/ic_launcher"
+        android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:screenOrientation="landscape"
         android:theme="@style/AppTheme">
diff --git a/safeDispatch/src/main/ic_launcher-playstore.png b/safeDispatch/src/main/ic_launcher-playstore.png
new file mode 100644
index 0000000..a867291
Binary files /dev/null and b/safeDispatch/src/main/ic_launcher-playstore.png differ
diff --git a/safeDispatch/src/main/java/com/safemobile/dispatch/RadioActivity.java b/safeDispatch/src/main/java/com/safemobile/dispatch/RadioActivity.java
index 30f59e5..edf82b5 100644
--- a/safeDispatch/src/main/java/com/safemobile/dispatch/RadioActivity.java
+++ b/safeDispatch/src/main/java/com/safemobile/dispatch/RadioActivity.java
@@ -673,10 +673,10 @@ public class RadioActivity extends Activity {
 		dialog.setCancelable(true);
 		dialog.setCanceledOnTouchOutside(true);
 
-		TextView text = (TextView) dialog.findViewById(R.id.text);	
-		ImageView image = (ImageView) dialog.findViewById(R.id.image);
+		TextView text = dialog.findViewById(R.id.text);
+		ImageView image = dialog.findViewById(R.id.image);
 		
-		image.setImageResource(R.drawable.ic_launcher);
+		image.setImageResource(R.mipmap.ic_launcher);
 		text.setText(errorMsg);
 		dialog.show();
 	}
diff --git a/safeDispatch/src/main/java/com/safemobile/dispatch/RecordingsActivity.java b/safeDispatch/src/main/java/com/safemobile/dispatch/RecordingsActivity.java
index c22f103..39d4049 100644
--- a/safeDispatch/src/main/java/com/safemobile/dispatch/RecordingsActivity.java
+++ b/safeDispatch/src/main/java/com/safemobile/dispatch/RecordingsActivity.java
@@ -184,10 +184,10 @@ public class RecordingsActivity extends Activity {
 		dialog.setCancelable(true);
 		dialog.setCanceledOnTouchOutside(true);
 
-		TextView text = (TextView) dialog.findViewById(R.id.text);	
-		ImageView image = (ImageView) dialog.findViewById(R.id.image);
+		TextView text = dialog.findViewById(R.id.text);
+		ImageView image = dialog.findViewById(R.id.image);
 		
-		image.setImageResource(R.drawable.ic_launcher);
+		image.setImageResource(R.mipmap.ic_launcher);
 		text.setText(errorMsg);
 		dialog.show();
 	}
diff --git a/safeDispatch/src/main/java/com/safemobile/dispatch/TabLayoutActivity.java b/safeDispatch/src/main/java/com/safemobile/dispatch/TabLayoutActivity.java
index b051213..1e31c99 100644
--- a/safeDispatch/src/main/java/com/safemobile/dispatch/TabLayoutActivity.java
+++ b/safeDispatch/src/main/java/com/safemobile/dispatch/TabLayoutActivity.java
@@ -321,7 +321,7 @@ public class TabLayoutActivity extends AbstractSDParentActivity{
 		// add radio tab
 		intent[6] = new Intent(context, AbstractEmptyActivity.class);
 		tabspecs[6] = tabHost.newTabSpec("SafeMobile")
-				.setIndicator("SafeMobile", res.getDrawable(AppParams.DEMO ? R.drawable.icon_demo : R.drawable.ic_launcher))
+				.setIndicator("SafeMobile", res.getDrawable(AppParams.DEMO ? R.drawable.icon_demo : R.mipmap.ic_launcher))
 				.setContent(intent[6]);
 
 		// add history tab
@@ -616,7 +616,7 @@ public class TabLayoutActivity extends AbstractSDParentActivity{
 			dialog.setTitle(AppParams.DEMO ? getString(R.string.app_name_demo) : getString(R.string.app_name));
 			dialog.setContentView(R.layout.dialog);
 			ImageView image = dialog.findViewById(R.id.image);
-			image.setImageResource(AppParams.DEMO ? R.drawable.icon_demo : R.drawable.ic_launcher);
+			image.setImageResource(AppParams.DEMO ? R.drawable.icon_demo : R.mipmap.ic_launcher);
 			TextView text = dialog.findViewById(R.id.text);
 			TextView text2 = dialog.findViewById(R.id.text2);
 			text.setText(getString(R.string.version) + "1.0.8");
diff --git a/safeDispatch/src/main/res/drawable-hdpi/ic_launcher.png b/safeDispatch/src/main/res/drawable-hdpi/ic_launcher.png
deleted file mode 100644
index 63d2d68..0000000
Binary files a/safeDispatch/src/main/res/drawable-hdpi/ic_launcher.png and /dev/null differ
diff --git a/safeDispatch/src/main/res/drawable-hdpi/safedispatch.jpg b/safeDispatch/src/main/res/drawable-hdpi/safedispatch.jpg
deleted file mode 100644
index db0172f..0000000
Binary files a/safeDispatch/src/main/res/drawable-hdpi/safedispatch.jpg and /dev/null differ
diff --git a/safeDispatch/src/main/res/drawable-hdpi/safedispatch3.jpg b/safeDispatch/src/main/res/drawable-hdpi/safedispatch3.jpg
deleted file mode 100644
index 7c4dc91..0000000
Binary files a/safeDispatch/src/main/res/drawable-hdpi/safedispatch3.jpg and /dev/null differ
diff --git a/safeDispatch/src/main/res/drawable-hdpi/safedispatch_logo.jpg b/safeDispatch/src/main/res/drawable-hdpi/safedispatch_logo.jpg
deleted file mode 100644
index 058a2a0..0000000
Binary files a/safeDispatch/src/main/res/drawable-hdpi/safedispatch_logo.jpg and /dev/null differ
diff --git a/safeDispatch/src/main/res/drawable-hdpi/safedispatch_logo.png b/safeDispatch/src/main/res/drawable-hdpi/safedispatch_logo.png
new file mode 100644
index 0000000..e26e96a
Binary files /dev/null and b/safeDispatch/src/main/res/drawable-hdpi/safedispatch_logo.png differ
diff --git a/safeDispatch/src/main/res/layout/dialog.xml b/safeDispatch/src/main/res/layout/dialog.xml
index 85d3e79..59a5863 100644
--- a/safeDispatch/src/main/res/layout/dialog.xml
+++ b/safeDispatch/src/main/res/layout/dialog.xml
@@ -11,7 +11,7 @@
                android:layout_height="wrap_content"
                android:layout_marginRight="10dp"
                android:layout_gravity="center_vertical"
-               android:src="@drawable/ic_launcher"
+               android:src="@mipmap/ic_launcher"
                />
    <LinearLayout 
    			  android:layout_width="wrap_content"
diff --git a/safeDispatch/src/main/res/layout/dialog_login.xml b/safeDispatch/src/main/res/layout/dialog_login.xml
index f8e50ab..681d913 100644
--- a/safeDispatch/src/main/res/layout/dialog_login.xml
+++ b/safeDispatch/src/main/res/layout/dialog_login.xml
@@ -24,7 +24,7 @@
 	               android:layout_height="wrap_content"
 	               android:layout_marginRight="10dp"
 	               android:layout_gravity="center_vertical"
-	               android:src="@drawable/ic_launcher"
+	               android:src="@mipmap/ic_launcher"
 	               android:contentDescription="image for dialog"
 	               />
 	   <LinearLayout 
diff --git a/safeDispatch/src/main/res/layout/spinner.xml b/safeDispatch/src/main/res/layout/spinner.xml
index 8d33e07..b1f3f07 100644
--- a/safeDispatch/src/main/res/layout/spinner.xml
+++ b/safeDispatch/src/main/res/layout/spinner.xml
@@ -7,7 +7,7 @@
 			android:id="@+id/icon"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:src="@drawable/ic_launcher"
+			android:src="@mipmap/ic_launcher"
 			android:paddingLeft="5dp"
 			android:paddingRight="5dp"
 			android:paddingTop="5dp"
diff --git a/safeDispatch/src/main/res/layout/tabhistory.xml b/safeDispatch/src/main/res/layout/tabhistory.xml
index d322f9e..e0d5f79 100644
--- a/safeDispatch/src/main/res/layout/tabhistory.xml
+++ b/safeDispatch/src/main/res/layout/tabhistory.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="fill_parent" android:layout_height="fill_parent"
-	android:id="@+id/tab1Layout" android:orientation="horizontal"
+	android:layout_width="fill_parent"
+	android:layout_height="fill_parent"
+	android:id="@+id/tab1Layout"
+	android:orientation="horizontal"
 	style="?bg">
 	
 	<RelativeLayout
diff --git a/safeDispatch/src/main/res/values/ic_launcher_background.xml b/safeDispatch/src/main/res/values/ic_launcher_background.xml
new file mode 100644
index 0000000..c5d5899
--- /dev/null
+++ b/safeDispatch/src/main/res/values/ic_launcher_background.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">#FFFFFF</color>
+</resources>
\ No newline at end of file
diff --git a/safeDispatch/src/main/res/values/strings.xml b/safeDispatch/src/main/res/values/strings.xml
index f415089..621a89e 100644
--- a/safeDispatch/src/main/res/values/strings.xml
+++ b/safeDispatch/src/main/res/values/strings.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string name="app_name">SafeMobile Dispatch</string>
-    <string name="app_name_demo">SafeMobile Dispatch Demo</string>
+    <string name="app_name">SafeDispatch Mobile</string>
+    <string name="app_name_demo">SafeDispatch Mobile Demo</string>
     <string name="app_name_radiopod">RadioPod</string>
     <string name="app_name_radiopad">RadioPad</string>
     <string name="app_name_radiopodd">RadioPod</string>
diff --git a/safeDispatch/src/main/res/values/styles.xml b/safeDispatch/src/main/res/values/styles.xml
index ffcc73b..6e651d5 100644
--- a/safeDispatch/src/main/res/values/styles.xml
+++ b/safeDispatch/src/main/res/values/styles.xml
@@ -82,7 +82,7 @@
 	
 	<style name="mainBackground_sd">
 		<item name="android:orientation">vertical</item>
-    	<item name="android:background">@drawable/safedispatch</item>
+    	<item name="android:background">@drawable/safedispatch_logo</item>
     	<item name="android:scaleType">centerInside</item>
 	</style>
 	
@@ -138,7 +138,7 @@
 	</style>
 	
 	<style name="bg_sd">
-	    <item name="android:background">@drawable/safedispatch</item>
+	    <item name="android:background">@drawable/safedispatch_logo</item>
 	</style>
 	
 	 <style name="header_sd">
@@ -155,7 +155,7 @@
 	
 	<style name="mainBackground_hy">
 		<item name="android:orientation">vertical</item>
-    	<item name="android:background">@drawable/safedispatch</item>
+    	<item name="android:background">@drawable/safedispatch_logo</item>
     	<item name="android:scaleType">centerInside</item>
 	</style>
 	
@@ -211,7 +211,7 @@
 	</style>
 	
 	<style name="bg_hy">
-	    <item name="android:background">@drawable/safedispatch</item>
+	    <item name="android:background">@drawable/safedispatch_logo</item>
 	</style>
 	
 	 <style name="header_hy">
@@ -228,7 +228,7 @@
 	
 	<style name="mainBackground_vi">
 		<item name="android:orientation">vertical</item>
-    	<item name="android:background">@drawable/safedispatch</item>
+    	<item name="android:background">@drawable/safedispatch_logo</item>
     	<item name="android:scaleType">centerInside</item>
 	</style>
 	
@@ -285,7 +285,7 @@
 	</style>
 	
 	<style name="bg_vi">
-	    <item name="android:background">@drawable/safedispatch</item>
+	    <item name="android:background">@drawable/safedispatch_logo</item>
 	</style>
 	
 	 <style name="header_vi">