diff --git a/build.sbt b/build.sbt
index 1cceb2e5..eaa0bbc3 100644
--- a/build.sbt
+++ b/build.sbt
@@ -26,19 +26,19 @@ resolvers += Resolver.jcenterRepo
resolvers += "JRAF" at "http://JRAF.org/static/maven/2"
+useSupportVectors
+
libraryDependencies ++= Seq(
"dnsjava" % "dnsjava" % "2.1.7",
"com.github.kevinsawicki" % "http-request" % "6.0",
"eu.chainfire" % "libsuperuser" % "1.0.0.201602271131",
"net.glxn.qrgen" % "android" % "2.0",
- "com.google.android.gms" % "play-services-base" % "9.0.2",
- "com.google.android.gms" % "play-services-ads" % "9.0.2",
- "com.google.android.gms" % "play-services-analytics" % "9.0.2",
+ "com.google.android.gms" % "play-services-ads" % "9.2.0",
+ "com.google.android.gms" % "play-services-analytics" % "9.2.0",
"com.android.support" % "design" % "24.0.0",
"com.android.support" % "gridlayout-v7" % "24.0.0",
"com.android.support" % "cardview-v7" % "24.0.0",
"com.github.jorgecastilloprz" % "fabprogresscircle" % "1.01",
- "com.j256.ormlite" % "ormlite-core" % "4.48",
"com.j256.ormlite" % "ormlite-android" % "4.48",
"com.twofortyfouram" % "android-plugin-api-for-locale" % "1.0.2",
"com.github.clans" % "fab" % "1.6.4",
diff --git a/project/plugins.sbt b/project/plugins.sbt
index cbd39814..b214e4ef 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,3 +1,5 @@
addSbtPlugin("org.scala-android" % "sbt-android" % "1.6.5")
addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.1.10")
+
+addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.8.2")
diff --git a/src/main/res/drawable/ic_action_settings.xml b/src/main/res/drawable-anydpi-v21/ic_action_settings.xml
similarity index 100%
rename from src/main/res/drawable/ic_action_settings.xml
rename to src/main/res/drawable-anydpi-v21/ic_action_settings.xml
diff --git a/src/main/res/drawable/ic_navigation_close.xml b/src/main/res/drawable-anydpi-v21/ic_navigation_close.xml
similarity index 100%
rename from src/main/res/drawable/ic_navigation_close.xml
rename to src/main/res/drawable-anydpi-v21/ic_navigation_close.xml
diff --git a/src/main/res/drawable-hdpi/ic_action_settings.png b/src/main/res/drawable-hdpi/ic_action_settings.png
new file mode 100644
index 00000000..a78cfe5f
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_action_settings.png differ
diff --git a/src/main/res/drawable-hdpi/ic_navigation_close.png b/src/main/res/drawable-hdpi/ic_navigation_close.png
new file mode 100644
index 00000000..4102501f
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_navigation_close.png differ
diff --git a/src/main/res/drawable-mdpi/ic_action_settings.png b/src/main/res/drawable-mdpi/ic_action_settings.png
new file mode 100644
index 00000000..f5b2196b
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_action_settings.png differ
diff --git a/src/main/res/drawable-mdpi/ic_navigation_close.png b/src/main/res/drawable-mdpi/ic_navigation_close.png
new file mode 100644
index 00000000..4fc92933
Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_navigation_close.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_action_settings.png b/src/main/res/drawable-xhdpi/ic_action_settings.png
new file mode 100644
index 00000000..cee3e464
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_action_settings.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_navigation_close.png b/src/main/res/drawable-xhdpi/ic_navigation_close.png
new file mode 100644
index 00000000..dd18e165
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_navigation_close.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_action_settings.png b/src/main/res/drawable-xxhdpi/ic_action_settings.png
new file mode 100644
index 00000000..2fecd6fd
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_action_settings.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_navigation_close.png b/src/main/res/drawable-xxhdpi/ic_navigation_close.png
new file mode 100644
index 00000000..d0d6235f
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_navigation_close.png differ
diff --git a/src/main/res/layout/layout_main.xml b/src/main/res/layout/layout_main.xml
index 07bba7a1..9200de0f 100644
--- a/src/main/res/layout/layout_main.xml
+++ b/src/main/res/layout/layout_main.xml
@@ -66,7 +66,7 @@
diff --git a/src/main/res/layout/layout_profiles.xml b/src/main/res/layout/layout_profiles.xml
index 573c492d..d5f3a7e3 100644
--- a/src/main/res/layout/layout_profiles.xml
+++ b/src/main/res/layout/layout_profiles.xml
@@ -27,7 +27,6 @@
android:id="@+id/fab_manual_add"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:src="@drawable/ic_content_create"
app:fab_colorNormal="@color/material_accent_500"
app:fab_colorPressed="@color/material_accent_700"
app:fab_colorRipple="@android:color/white"
@@ -38,7 +37,6 @@
android:id="@+id/fab_qrcode_add"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:src="@drawable/ic_image_camera_alt"
app:fab_colorNormal="@color/material_accent_500"
app:fab_colorPressed="@color/material_accent_700"
app:fab_colorRipple="@android:color/white"
@@ -49,7 +47,6 @@
android:id="@+id/fab_nfc_add"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:src="@drawable/ic_device_nfc"
app:fab_colorNormal="@color/material_accent_500"
app:fab_colorPressed="@color/material_accent_700"
app:fab_colorRipple="@android:color/white"
@@ -60,7 +57,6 @@
android:id="@+id/fab_import_add"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:src="@drawable/ic_content_paste"
app:fab_colorNormal="@color/material_accent_500"
app:fab_colorPressed="@color/material_accent_700"
app:fab_colorRipple="@android:color/white"
diff --git a/src/main/res/layout/layout_profiles_item.xml b/src/main/res/layout/layout_profiles_item.xml
index 434cbccb..53b667dd 100644
--- a/src/main/res/layout/layout_profiles_item.xml
+++ b/src/main/res/layout/layout_profiles_item.xml
@@ -1,6 +1,7 @@