diff --git a/play-services-core/src/main/res/drawable-hdpi/ic_gamepad.png b/play-services-core/src/main/res/drawable-hdpi/ic_gamepad.png
new file mode 100755
index 00000000..43167f99
Binary files /dev/null and b/play-services-core/src/main/res/drawable-hdpi/ic_gamepad.png differ
diff --git a/play-services-core/src/main/res/drawable-hdpi/ic_magnify.png b/play-services-core/src/main/res/drawable-hdpi/ic_magnify.png
new file mode 100755
index 00000000..861b40db
Binary files /dev/null and b/play-services-core/src/main/res/drawable-hdpi/ic_magnify.png differ
diff --git a/play-services-core/src/main/res/drawable-mdpi/ic_gamepad.png b/play-services-core/src/main/res/drawable-mdpi/ic_gamepad.png
new file mode 100755
index 00000000..e7626864
Binary files /dev/null and b/play-services-core/src/main/res/drawable-mdpi/ic_gamepad.png differ
diff --git a/play-services-core/src/main/res/drawable-mdpi/ic_magnify.png b/play-services-core/src/main/res/drawable-mdpi/ic_magnify.png
new file mode 100755
index 00000000..fedd0c62
Binary files /dev/null and b/play-services-core/src/main/res/drawable-mdpi/ic_magnify.png differ
diff --git a/play-services-core/src/main/res/drawable-xhdpi/ic_gamepad.png b/play-services-core/src/main/res/drawable-xhdpi/ic_gamepad.png
new file mode 100755
index 00000000..a7b21f88
Binary files /dev/null and b/play-services-core/src/main/res/drawable-xhdpi/ic_gamepad.png differ
diff --git a/play-services-core/src/main/res/drawable-xhdpi/ic_magnify.png b/play-services-core/src/main/res/drawable-xhdpi/ic_magnify.png
new file mode 100755
index 00000000..5713a86f
Binary files /dev/null and b/play-services-core/src/main/res/drawable-xhdpi/ic_magnify.png differ
diff --git a/play-services-core/src/main/res/drawable-xhdpi/proprietary_auth_gls_ic_google_minitab_selected.png b/play-services-core/src/main/res/drawable-xhdpi/proprietary_auth_gls_ic_google_minitab_selected.png
new file mode 100755
index 00000000..5f376841
Binary files /dev/null and b/play-services-core/src/main/res/drawable-xhdpi/proprietary_auth_gls_ic_google_minitab_selected.png differ
diff --git a/play-services-core/src/main/res/drawable-xhdpi/proprietary_auth_gls_ic_google_selected.png b/play-services-core/src/main/res/drawable-xhdpi/proprietary_auth_gls_ic_google_selected.png
new file mode 100755
index 00000000..e23dc238
Binary files /dev/null and b/play-services-core/src/main/res/drawable-xhdpi/proprietary_auth_gls_ic_google_selected.png differ
diff --git a/play-services-core/src/main/res/drawable-xxhdpi/ic_gamepad.png b/play-services-core/src/main/res/drawable-xxhdpi/ic_gamepad.png
new file mode 100755
index 00000000..556abb12
Binary files /dev/null and b/play-services-core/src/main/res/drawable-xxhdpi/ic_gamepad.png differ
diff --git a/play-services-core/src/main/res/drawable-xxhdpi/ic_magnify.png b/play-services-core/src/main/res/drawable-xxhdpi/ic_magnify.png
new file mode 100755
index 00000000..d9f75bc7
Binary files /dev/null and b/play-services-core/src/main/res/drawable-xxhdpi/ic_magnify.png differ
diff --git a/play-services-core/src/main/res/drawable-xxxhdpi/ic_magnify.png b/play-services-core/src/main/res/drawable-xxxhdpi/ic_magnify.png
new file mode 100755
index 00000000..28456073
Binary files /dev/null and b/play-services-core/src/main/res/drawable-xxxhdpi/ic_magnify.png differ
diff --git a/play-services-core/src/main/res/drawable/dots_horizontal.xml b/play-services-core/src/main/res/drawable/dots_horizontal.xml
new file mode 100755
index 00000000..4110aed7
--- /dev/null
+++ b/play-services-core/src/main/res/drawable/dots_horizontal.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="#000000"
+        android:pathData="M16,12A2,2 0 0,1 18,10A2,2 0 0,1 20,12A2,2 0 0,1 18,14A2,2 0 0,1 16,12M10,12A2,2
+0 0,1 12,10A2,2 0 0,1 14,12A2,2 0 0,1 12,14A2,2 0 0,1 10,12M4,12A2,2 0 0,1
+6,10A2,2 0 0,1 8,12A2,2 0 0,1 6,14A2,2 0 0,1 4,12Z" />
+</vector>
diff --git a/play-services-core/src/main/res/drawable/ic_certificate.xml b/play-services-core/src/main/res/drawable/ic_certificate.xml
new file mode 100755
index 00000000..780e4db4
--- /dev/null
+++ b/play-services-core/src/main/res/drawable/ic_certificate.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorAccent"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="#000000"
+        android:pathData="M4,3C2.89,3 2,3.89 2,5V15A2,2 0 0,0 4,17H12V22L15,19L18,22V17H20A2,2 0 0,0
+22,15V8L22,6V5A2,2 0 0,0
+20,3H16V3H4M12,5L15,7L18,5V8.5L21,10L18,11.5V15L15,13L12,15V11.5L9,10L12,8.5V5M4,5H9V7H4V5M4,9H7V11H4V9M4,13H9V15H4V13Z" />
+</vector>
diff --git a/play-services-core/src/main/res/drawable/ic_plusone_medium.xml b/play-services-core/src/main/res/drawable/ic_plusone_medium.xml
new file mode 100755
index 00000000..f7433017
--- /dev/null
+++ b/play-services-core/src/main/res/drawable/ic_plusone_medium.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (C) 2013-2017 microG Project Team
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<selector />
\ No newline at end of file
diff --git a/play-services-core/src/main/res/drawable/ic_plusone_small.xml b/play-services-core/src/main/res/drawable/ic_plusone_small.xml
new file mode 100755
index 00000000..f7433017
--- /dev/null
+++ b/play-services-core/src/main/res/drawable/ic_plusone_small.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (C) 2013-2017 microG Project Team
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<selector />
\ No newline at end of file
diff --git a/play-services-core/src/main/res/drawable/ic_plusone_standard.xml b/play-services-core/src/main/res/drawable/ic_plusone_standard.xml
new file mode 100755
index 00000000..f7433017
--- /dev/null
+++ b/play-services-core/src/main/res/drawable/ic_plusone_standard.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (C) 2013-2017 microG Project Team
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<selector />
\ No newline at end of file
diff --git a/play-services-core/src/main/res/drawable/ic_plusone_tall.xml b/play-services-core/src/main/res/drawable/ic_plusone_tall.xml
new file mode 100755
index 00000000..f7433017
--- /dev/null
+++ b/play-services-core/src/main/res/drawable/ic_plusone_tall.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (C) 2013-2017 microG Project Team
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<selector />
\ No newline at end of file
diff --git a/play-services-core/src/main/res/layout/ask_gcm.xml b/play-services-core/src/main/res/layout/ask_gcm.xml
old mode 100644
new mode 100755
diff --git a/play-services-core/src/main/res/layout/ask_permission.xml b/play-services-core/src/main/res/layout/ask_permission.xml
old mode 100644
new mode 100755
index 44801f8a..6ef04c35
--- a/play-services-core/src/main/res/layout/ask_permission.xml
+++ b/play-services-core/src/main/res/layout/ask_permission.xml
@@ -75,7 +75,7 @@
             android:padding="10dp">
 
             <ImageView
-                android:src="@mipmap/ic_launcher"
+                android:src="@mipmap/ic_core_service_app"
                 android:id="@+id/app_icon"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent" />
diff --git a/play-services-core/src/main/res/layout/ask_permission_list_entry.xml b/play-services-core/src/main/res/layout/ask_permission_list_entry.xml
old mode 100644
new mode 100755
diff --git a/play-services-core/src/main/res/layout/device_registration_fragment.xml b/play-services-core/src/main/res/layout/device_registration_fragment.xml
old mode 100644
new mode 100755
diff --git a/play-services-core/src/main/res/layout/games_info.xml b/play-services-core/src/main/res/layout/games_info.xml
new file mode 100755
index 00000000..972dc179
--- /dev/null
+++ b/play-services-core/src/main/res/layout/games_info.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2013-2017 microG Project Team
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:orientation="vertical">
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:paddingTop="10dp"
+        android:text="@string/games_title"
+        android:textColor="?attr/colorPrimary"/>
+
+    <View
+        android:id="@+id/no_progress_bar"
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:layout_marginBottom="10dp"
+        android:layout_marginTop="10dp"
+        android:background="@color/dialog_border_color"/>
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:paddingTop="15dp">
+
+        <FrameLayout
+            android:layout_width="64dp"
+            android:layout_height="64dp"
+            android:layout_marginEnd="-3dp"
+            android:layout_marginRight="-3dp"
+            android:background="@drawable/circle_shape_background"
+            android:padding="10dp">
+
+            <ImageView
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:src="@drawable/ic_gamepad"/>
+        </FrameLayout>
+
+        <FrameLayout
+            android:layout_width="64dp"
+            android:layout_height="64dp"
+            android:layout_marginLeft="-3dp"
+            android:layout_marginStart="-3dp"
+            android:background="@drawable/circle_shape_background"
+            android:padding="10dp">
+
+            <ImageView
+                android:id="@+id/app_icon"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:src="@mipmap/ic_core_service_app"/>
+        </FrameLayout>
+    </LinearLayout>
+
+    <TextView
+        android:id="@+id/title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:padding="15dp"
+        android:text="@string/games_info_title"
+        android:textColor="?attr/colorAccent"
+        android:textSize="18sp"/>
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:padding="10dp"
+        android:text="@string/games_info_content"/>
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="end"
+        android:orientation="horizontal"
+        android:paddingBottom="5dp"
+        android:paddingLeft="10dp"
+        android:paddingRight="10dp">
+
+        <Button
+            android:id="@android:id/button1"
+            style="?attr/buttonBarButtonStyle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@android:string/ok"/>
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/play-services-core/src/main/res/layout/list_no_item.xml b/play-services-core/src/main/res/layout/list_no_item.xml
old mode 100644
new mode 100755
diff --git a/play-services-core/src/main/res/layout/login_assistant.xml b/play-services-core/src/main/res/layout/login_assistant.xml
old mode 100644
new mode 100755
diff --git a/play-services-core/src/main/res/layout/login_assistant_loading.xml b/play-services-core/src/main/res/layout/login_assistant_loading.xml
old mode 100644
new mode 100755
diff --git a/play-services-core/src/main/res/layout/pick_place.xml b/play-services-core/src/main/res/layout/pick_place.xml
new file mode 100755
index 00000000..5c74e847
--- /dev/null
+++ b/play-services-core/src/main/res/layout/pick_place.xml
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2013-2017 microG Project Team
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:orientation="vertical">
+
+    <include layout="@layout/toolbar"/>
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="0dip"
+        android:layout_weight="1">
+
+<!--        <org.microg.gms.maps.vtm.BackendMapView
+            android:id="@+id/map"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"/>
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:paddingBottom="41dip"
+            android:src="@drawable/maps_default_marker"/>-->
+    </RelativeLayout>
+
+    <LinearLayout
+        android:id="@+id/place_picker_select"
+        android:layout_width="fill_parent"
+        android:layout_height="72dp"
+        android:background="?attr/selectableItemBackground"
+        android:clickable="true"
+        android:orientation="horizontal">
+
+        <ImageView
+            android:id="@+id/place_picker_icon"
+            android:layout_width="32.0dip"
+            android:layout_height="72dp"
+            android:layout_gravity="top"
+            android:layout_marginEnd="16.0dip"
+            android:layout_marginLeft="16.0dip"
+            android:layout_marginRight="16.0dip"
+            android:layout_marginStart="16.0dip"
+            android:src="@drawable/ic_map_marker"/>
+
+        <FrameLayout
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent">
+
+            <TextView
+                android:id="@+id/place_picker_title"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="top"
+                android:layout_marginTop="12.0dip"
+                android:ellipsize="end"
+                android:maxLines="1"
+                android:text="@string/place_picker_select_title"
+                android:textAppearance="?android:textAppearanceMedium"
+                android:textColor="?attr/colorAccent"/>
+
+            <TextView
+                android:id="@+id/place_picker_info"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="top"
+                android:layout_marginTop="36.0dip"
+                android:ellipsize="end"
+                android:lines="1"
+                android:text="(0.0000000, 0.0000000)"
+                android:textAppearance="?android:textAppearanceSmall"/>
+        </FrameLayout>
+    </LinearLayout>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="2dp"
+        android:background="#7f7f7f7f"/>
+
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:background="#fff1f1f1"
+        android:focusable="false"
+        android:orientation="vertical"
+        android:paddingLeft="8.0dip"
+        android:paddingRight="8.0dip">
+
+        <TextView
+            android:id="@id/title"
+            android:layout_width="fill_parent"
+            android:layout_height="40.0dip"
+            android:gravity="center_vertical"
+            android:paddingLeft="8.0dip"
+            android:text="@string/place_picker_nearby_places"
+            android:textAllCaps="true"
+            android:textAppearance="?android:textAppearanceSmall"
+            android:textColor="#ff7f7f7f"
+            android:textStyle="bold"/>
+
+        <RelativeLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal">
+
+            <TextView
+                android:id="@+id/hint"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:padding="16.0dip"
+                android:text="Can't load nearby places."
+                android:textAppearance="?android:textAppearanceLarge"
+                android:textColor="#ff7f7f7f"/>
+        </RelativeLayout>
+    </LinearLayout>
+
+</LinearLayout>
diff --git a/play-services-core/src/main/res/layout/preference_category_no_label.xml b/play-services-core/src/main/res/layout/preference_category_no_label.xml
old mode 100644
new mode 100755
diff --git a/play-services-core/src/main/res/layout/preference_progress_bar.xml b/play-services-core/src/main/res/layout/preference_progress_bar.xml
old mode 100644
new mode 100755
diff --git a/play-services-core/src/main/res/layout/preference_switch_bar.xml b/play-services-core/src/main/res/layout/preference_switch_bar.xml
old mode 100644
new mode 100755
diff --git a/play-services-core/src/main/res/layout/push_notification_app_fragment.xml b/play-services-core/src/main/res/layout/push_notification_app_fragment.xml
old mode 100644
new mode 100755
diff --git a/play-services-core/src/main/res/layout/push_notification_fragment.xml b/play-services-core/src/main/res/layout/push_notification_fragment.xml
old mode 100644
new mode 100755
diff --git a/play-services-core/src/main/res/layout/safety_net_fragment.xml b/play-services-core/src/main/res/layout/safety_net_fragment.xml
old mode 100644
new mode 100755
diff --git a/play-services-core/src/main/res/layout/settings_root_activity.xml b/play-services-core/src/main/res/layout/settings_root_activity.xml
old mode 100644
new mode 100755
diff --git a/play-services-core/src/main/res/menu/pick_place.xml b/play-services-core/src/main/res/menu/pick_place.xml
new file mode 100755
index 00000000..52fda1f5
--- /dev/null
+++ b/play-services-core/src/main/res/menu/pick_place.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2013-2017 microG Project Team
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<menu xmlns:tools="http://schemas.android.com/tools"
+      xmlns:android="http://schemas.android.com/apk/res/android"
+      xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/menu_action_search"
+        android:icon="@drawable/ic_magnify"
+        android:title="@android:string/search_go"
+        app:actionViewClass="android.support.v7.widget.SearchView"
+        app:showAsAction="ifRoom|collapseActionView"
+        tools:ignore="AppCompatResource"/>
+</menu>
\ No newline at end of file
diff --git a/play-services-core/src/main/res/mipmap-anydpi-v26/ic_microg_settings.xml b/play-services-core/src/main/res/mipmap-anydpi-v26/ic_microg_settings.xml
new file mode 100755
index 00000000..bcdc5a25
--- /dev/null
+++ b/play-services-core/src/main/res/mipmap-anydpi-v26/ic_microg_settings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon
+  xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@mipmap/ic_microg_background" />
+    <foreground android:drawable="@mipmap/ic_microg_foreground" />
+</adaptive-icon>
\ No newline at end of file
diff --git a/play-services-core/src/main/res/mipmap-hdpi/ic_core_service_app.png b/play-services-core/src/main/res/mipmap-hdpi/ic_core_service_app.png
new file mode 100755
index 00000000..47a7303a
Binary files /dev/null and b/play-services-core/src/main/res/mipmap-hdpi/ic_core_service_app.png differ
diff --git a/play-services-core/src/main/res/mipmap-hdpi/ic_microg_background.png b/play-services-core/src/main/res/mipmap-hdpi/ic_microg_background.png
new file mode 100755
index 00000000..503ae018
Binary files /dev/null and b/play-services-core/src/main/res/mipmap-hdpi/ic_microg_background.png differ
diff --git a/play-services-core/src/main/res/mipmap-hdpi/ic_microg_foreground.png b/play-services-core/src/main/res/mipmap-hdpi/ic_microg_foreground.png
new file mode 100755
index 00000000..9087dc6f
Binary files /dev/null and b/play-services-core/src/main/res/mipmap-hdpi/ic_microg_foreground.png differ
diff --git a/play-services-core/src/main/res/mipmap-hdpi/ic_microg_settings.png b/play-services-core/src/main/res/mipmap-hdpi/ic_microg_settings.png
new file mode 100755
index 00000000..4b32cbbf
Binary files /dev/null and b/play-services-core/src/main/res/mipmap-hdpi/ic_microg_settings.png differ
diff --git a/play-services-core/src/main/res/navigation/nav_settings.xml b/play-services-core/src/main/res/navigation/nav_settings.xml
old mode 100644
new mode 100755
diff --git a/play-services-core/src/main/res/xml/contact_syncadapter.xml b/play-services-core/src/main/res/xml/contact_syncadapter.xml
new file mode 100755
index 00000000..4106b1f3
--- /dev/null
+++ b/play-services-core/src/main/res/xml/contact_syncadapter.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2017 microG Project Team
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<sync-adapter xmlns:android="http://schemas.android.com/apk/res/android"
+              android:accountType="com.google"
+              android:contentAuthority="com.android.contacts"
+              android:userVisible="false"/>
\ No newline at end of file
diff --git a/play-services-core/src/main/res/xml/preferences_safetynet.xml b/play-services-core/src/main/res/xml/preferences_safetynet.xml
new file mode 100755
index 00000000..e0a2ed84
--- /dev/null
+++ b/play-services-core/src/main/res/xml/preferences_safetynet.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2017 microG Project Team
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <org.microg.tools.ui.LongTextPreference
+        android:icon="@drawable/ic_info_outline"
+        android:key="pref_snet_summary"
+        android:selectable="false"
+        android:summary="@string/snet_intro" />
+    <PreferenceCategory
+        android:title="@string/prefcat_test"
+        app:isPreferenceVisible="false">
+        <Preference
+            android:enabled="false"
+            android:key="pref_snet_run_attest"
+            android:summary="Not yet available"
+            android:title="@string/pref_snet_testdrive_title" />
+    </PreferenceCategory>
+</PreferenceScreen>
diff --git a/play-services-core/src/main/res/xml/preferences_snet_advanced.xml b/play-services-core/src/main/res/xml/preferences_snet_advanced.xml
new file mode 100755
index 00000000..e87859af
--- /dev/null
+++ b/play-services-core/src/main/res/xml/preferences_snet_advanced.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2017 microG Project Team
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+    <PreferenceCategory android:title="@string/prefcat_operation_mode">
+        <org.microg.tools.ui.RadioButtonPreference
+            android:checked="true"
+            android:key="snet_official"
+            android:summary="@string/pref_snet_status_official_summary"
+            android:title="@string/pref_snet_status_official_title"/>
+        <org.microg.tools.ui.RadioButtonPreference
+            android:checked="false"
+            android:enabled="false"
+            android:key="snet_self_signed"
+            android:summary="@string/pref_snet_self_signed_summary"
+            android:title="@string/pref_snet_self_signed_title"/>
+        <org.microg.tools.ui.RadioButtonPreference
+            android:checked="false"
+            android:key="snet_third_party"
+            android:summary="@string/pref_snet_status_third_party_summary"
+            android:title="@string/pref_snet_status_third_party_title"/>
+        <EditTextPreference
+            android:dependency="snet_third_party"
+            android:hint="https://example.com/server?key=123"
+            android:key="snet_custom_url"
+            android:summary="@string/pref_snet_custom_url_summary"
+            android:title="@string/pref_snet_custom_url_title"/>
+    </PreferenceCategory>
+</PreferenceScreen>
\ No newline at end of file