diff --git a/app/build.gradle b/app/build.gradle
index 1bf210f4..156d0c18 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,15 +1,15 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 24
+    compileSdkVersion 25
     buildToolsVersion '24.0.2'
 
     defaultConfig {
         applicationId "no.nordicsemi.android.nrftoolbox"
         minSdkVersion 18
-        targetSdkVersion 24
-        versionCode 52
-        versionName "2.0.0"
+        targetSdkVersion 25
+        versionCode 53
+        versionName "2.1.0"
     }
     buildTypes {
         release {
@@ -32,8 +32,8 @@ android {
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     compile 'com.google.android.gms:play-services-wearable:9.2.0'
-    compile 'com.android.support:appcompat-v7:24.2.1'
-    compile 'com.android.support:design:24.2.1'
+    compile 'com.android.support:appcompat-v7:25.0.0'
+    compile 'com.android.support:design:25.0.0'
     compile 'no.nordicsemi.android.support.v18:scanner:0.2.0'
     compile 'no.nordicsemi.android:log:2.0.0'
     compile('org.simpleframework:simple-xml:2.7.1') {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index ba0b5038..ded3617d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -39,6 +39,7 @@
 		android:fullBackupContent="true"
 		android:allowBackup="true"
 		android:icon="@mipmap/ic_launcher"
+		android:roundIcon="@mipmap/ic_launcher_round"
 		android:label="@string/app_name"
 		android:theme="@style/AppTheme" >
 
@@ -55,6 +56,10 @@
 
 				<category android:name="android.intent.category.LAUNCHER" />
 			</intent-filter>
+
+			<meta-data android:name="android.app.shortcuts"
+				android:resource="@xml/shortcuts" />
+
 			<intent-filter>
 				<action android:name="android.nfc.action.NDEF_DISCOVERED" />
 
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
new file mode 100644
index 00000000..36918277
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_shortcut_dfu.png b/app/src/main/res/mipmap-hdpi/ic_shortcut_dfu.png
new file mode 100644
index 00000000..958e987e
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_shortcut_dfu.png differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_shortcut_uart.png b/app/src/main/res/mipmap-hdpi/ic_shortcut_uart.png
new file mode 100644
index 00000000..dc07e780
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_shortcut_uart.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
new file mode 100644
index 00000000..b796f783
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_shortcut_dfu.png b/app/src/main/res/mipmap-mdpi/ic_shortcut_dfu.png
new file mode 100644
index 00000000..cda3b2d2
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_shortcut_dfu.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_shortcut_uart.png b/app/src/main/res/mipmap-mdpi/ic_shortcut_uart.png
new file mode 100644
index 00000000..a01497e0
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_shortcut_uart.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
new file mode 100644
index 00000000..03179647
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_shortcut_dfu.png b/app/src/main/res/mipmap-xhdpi/ic_shortcut_dfu.png
new file mode 100644
index 00000000..59df3ca3
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_shortcut_dfu.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_shortcut_uart.png b/app/src/main/res/mipmap-xhdpi/ic_shortcut_uart.png
new file mode 100644
index 00000000..8f5da1bd
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_shortcut_uart.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
new file mode 100644
index 00000000..bc4bb725
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_shortcut_dfu.png b/app/src/main/res/mipmap-xxhdpi/ic_shortcut_dfu.png
new file mode 100644
index 00000000..47878609
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_shortcut_dfu.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_shortcut_uart.png b/app/src/main/res/mipmap-xxhdpi/ic_shortcut_uart.png
new file mode 100644
index 00000000..518fae36
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_shortcut_uart.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
new file mode 100644
index 00000000..14840400
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_shortcut_dfu.png b/app/src/main/res/mipmap-xxxhdpi/ic_shortcut_dfu.png
new file mode 100644
index 00000000..734786dc
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_shortcut_dfu.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_shortcut_uart.png b/app/src/main/res/mipmap-xxxhdpi/ic_shortcut_uart.png
new file mode 100644
index 00000000..2db6168b
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_shortcut_uart.png differ
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7b9fd9ac..90607f16 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -25,6 +25,11 @@
 	<string name="app_name">nRF Toolbox</string>
 	<string name="font_path">fonts/trebucbd.ttf</string>
 	<string name="normal_font_path">fonts/trebuc.ttf</string>
+
+	<string name="shortcut_dfu_short">DFU</string>
+	<string name="shortcut_dfu_long">Device Firmware Update</string>
+	<string name="shortcut_uart_short">UART</string>
+	<string name="shortcut_uart_long">Nordic UART Service</string>
 	
 	<string name="ok">OK</string>
 	<string name="yes">Yes</string>
diff --git a/app/src/main/res/xml-v25/shortcuts.xml b/app/src/main/res/xml-v25/shortcuts.xml
new file mode 100644
index 00000000..6ff63eef
--- /dev/null
+++ b/app/src/main/res/xml-v25/shortcuts.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (c) 2016, Nordic Semiconductor
+  ~ All rights reserved.
+  ~
+  ~ Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+  ~
+  ~ 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+  ~
+  ~ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the
+  ~ documentation and/or other materials provided with the distribution.
+  ~
+  ~ 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this
+  ~ software without specific prior written permission.
+  ~
+  ~ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+  ~ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+  ~ HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+  ~ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+  ~ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+  ~ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  -->
+
+<shortcuts xmlns:android="http://schemas.android.com/apk/res/android">
+	<shortcut
+		android:shortcutId="shortcut_dfu"
+		android:enabled="true"
+		android:icon="@mipmap/ic_shortcut_dfu"
+		android:shortcutShortLabel="@string/shortcut_dfu_short"
+		android:shortcutLongLabel="@string/shortcut_dfu_long"
+		android:shortcutDisabledMessage="@string/shortcut_dfu_short">
+		<intent
+			android:action="android.intent.action.VIEW"
+			android:targetPackage="no.nordicsemi.android.nrftoolbox"
+			android:targetClass="no.nordicsemi.android.nrftoolbox.FeaturesActivity" />
+		<intent
+			android:action="android.intent.action.VIEW"
+			android:targetPackage="no.nordicsemi.android.nrftoolbox"
+			android:targetClass="no.nordicsemi.android.nrftoolbox.dfu.DfuActivity" />
+		<categories android:name="android.shortcut.conversation" />
+	</shortcut>
+	<shortcut
+		android:shortcutId="shortcut_uart"
+		android:enabled="true"
+		android:icon="@mipmap/ic_shortcut_uart"
+		android:shortcutShortLabel="@string/shortcut_uart_short"
+		android:shortcutLongLabel="@string/shortcut_uart_long"
+		android:shortcutDisabledMessage="@string/shortcut_uart_short">
+		<intent
+			android:action="android.intent.action.VIEW"
+			android:targetPackage="no.nordicsemi.android.nrftoolbox"
+			android:targetClass="no.nordicsemi.android.nrftoolbox.FeaturesActivity" />
+		<intent
+			android:action="android.intent.action.VIEW"
+			android:targetPackage="no.nordicsemi.android.nrftoolbox"
+			android:targetClass="no.nordicsemi.android.nrftoolbox.uart.UARTActivity" />
+		<categories android:name="android.shortcut.conversation" />
+	</shortcut>
+	<!-- Specify more shortcuts here. -->
+</shortcuts>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 573f4fd6..ef7ae5ac 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.1'
+        classpath 'com.android.tools.build:gradle:2.2.2'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/wear/build.gradle b/wear/build.gradle
index d9ef187c..2f345e1f 100644
--- a/wear/build.gradle
+++ b/wear/build.gradle
@@ -1,15 +1,15 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 24
+    compileSdkVersion 25
     buildToolsVersion "24.0.2"
 
     defaultConfig {
         applicationId "no.nordicsemi.android.nrftoolbox"
         minSdkVersion 20
-        targetSdkVersion 24
-        versionCode 52
-        versionName "2.0.0"
+        targetSdkVersion 25
+        versionCode 53
+        versionName "2.1.0"
     }
     buildTypes {
         release {
diff --git a/wear/src/main/AndroidManifest.xml b/wear/src/main/AndroidManifest.xml
index f08e4a88..66de8b6b 100644
--- a/wear/src/main/AndroidManifest.xml
+++ b/wear/src/main/AndroidManifest.xml
@@ -34,6 +34,7 @@
 		android:allowBackup="true"
 		android:fullBackupContent="true"
 		android:icon="@mipmap/ic_launcher"
+		android:roundIcon="@mipmap/ic_launcher_round"
 		android:label="@string/app_name"
 		android:theme="@android:style/Theme.DeviceDefault.Light">
 
diff --git a/wear/src/main/res/mipmap-hdpi/ic_launcher.png b/wear/src/main/res/mipmap-hdpi/ic_launcher.png
index 628705f7..5411d634 100644
Binary files a/wear/src/main/res/mipmap-hdpi/ic_launcher.png and b/wear/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/wear/src/main/res/mipmap-hdpi/ic_launcher_round.png b/wear/src/main/res/mipmap-hdpi/ic_launcher_round.png
new file mode 100644
index 00000000..36918277
Binary files /dev/null and b/wear/src/main/res/mipmap-hdpi/ic_launcher_round.png differ
diff --git a/wear/src/main/res/mipmap-mdpi/ic_launcher.png b/wear/src/main/res/mipmap-mdpi/ic_launcher.png
index 8f8df29d..13c703a7 100644
Binary files a/wear/src/main/res/mipmap-mdpi/ic_launcher.png and b/wear/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/wear/src/main/res/mipmap-mdpi/ic_launcher_round.png b/wear/src/main/res/mipmap-mdpi/ic_launcher_round.png
new file mode 100644
index 00000000..b796f783
Binary files /dev/null and b/wear/src/main/res/mipmap-mdpi/ic_launcher_round.png differ
diff --git a/wear/src/main/res/mipmap-xhdpi/ic_launcher.png b/wear/src/main/res/mipmap-xhdpi/ic_launcher.png
index b253a292..4df1aa1a 100644
Binary files a/wear/src/main/res/mipmap-xhdpi/ic_launcher.png and b/wear/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/wear/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/wear/src/main/res/mipmap-xhdpi/ic_launcher_round.png
new file mode 100644
index 00000000..03179647
Binary files /dev/null and b/wear/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ
diff --git a/wear/src/main/res/mipmap-xxhdpi/ic_launcher.png b/wear/src/main/res/mipmap-xxhdpi/ic_launcher.png
index d282a9af..152dec98 100644
Binary files a/wear/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/wear/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/wear/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/wear/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
new file mode 100644
index 00000000..bc4bb725
Binary files /dev/null and b/wear/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ
diff --git a/wear/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/wear/src/main/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 00000000..e04c2802
Binary files /dev/null and b/wear/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/wear/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/wear/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
new file mode 100644
index 00000000..14840400
Binary files /dev/null and b/wear/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ