diff --git a/api/build.gradle b/api/build.gradle
index 4c76294e..db480812 100755
--- a/api/build.gradle
+++ b/api/build.gradle
@@ -1,21 +1,20 @@
 apply plugin: 'com.android.library'
-apply plugin: 'com.neenbedankt.android-apt'
 apply plugin: 'jacoco-android'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.2"
+    compileSdkVersion 26
+    buildToolsVersion "25.0.3"
 
     defaultConfig {
         minSdkVersion 15
-        targetSdkVersion 25
+        targetSdkVersion 26
         versionCode 1
         versionName "1.0"
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
 
     packagingOptions {
@@ -40,26 +39,27 @@ dependencies {
     compile 'com.android.support:support-v4:25.2.0'
 
     // Raizlabs
-    apt 'com.raizlabs.android:DBFlow-Compiler:2.2.1'
-    compile "com.raizlabs.android:DBFlow-Core:2.2.1"
-    compile "com.raizlabs.android:DBFlow:2.2.1"
-
+    annotationProcessor 'com.raizlabs.android:DBFlow-Compiler:2.2.1'
+    implementation "com.raizlabs.android:DBFlow-Core:2.2.1"
+    implementation "com.raizlabs.android:DBFlow:2.2.1"
     // Jackson
-    compile 'com.fasterxml.jackson.core:jackson-databind:2.7.2'
-    compile 'com.fasterxml.jackson.core:jackson-core:2.7.2'
-    compile 'com.fasterxml.jackson.core:jackson-annotations:2.7.2'
-    compile 'com.fasterxml.jackson.datatype:jackson-datatype-joda:2.7.2'
+    implementation 'com.fasterxml.jackson.core:jackson-databind:2.7.2'
+    implementation 'com.fasterxml.jackson.core:jackson-core:2.7.2'
+    implementation 'com.fasterxml.jackson.core:jackson-annotations:2.7.2'
+    implementation 'com.fasterxml.jackson.datatype:jackson-datatype-joda:2.7.2'
 
     // Square
-    compile 'com.squareup.okhttp:okhttp-urlconnection:2.7.5'
-    compile 'com.squareup.okhttp:okhttp:2.7.5'
-    compile 'com.squareup.picasso:picasso:2.5.2'
-    compile 'com.squareup.retrofit:retrofit:1.9.0'
-    compile 'com.squareup.retrofit:converter-jackson:1.9.0'
-    compile 'com.squareup:otto:1.3.8'
+    implementation 'com.squareup.okhttp3:okhttp-urlconnection:3.9.0'
+    implementation 'com.squareup.okhttp3:okhttp:3.14.1'
+    implementation 'com.squareup.picasso:picasso:2.5.2'
+    implementation 'com.squareup.retrofit:retrofit:1.9.0'
+    implementation 'com.squareup.retrofit:converter-jackson:1.9.0'
+    implementation 'com.squareup:otto:1.3.8'
 
     // Other
-    compile 'joda-time:joda-time:2.9.2'
+    implementation 'joda-time:joda-time:2.9.2'
+    implementation 'com.jakewharton.picasso:picasso2-okhttp3-downloader:1.1.0'
+    implementation 'com.jakewharton.retrofit:retrofit1-okhttp3-client:1.1.0'
 
     // Java test dependencies
     testCompile "junit:junit:4.12"
diff --git a/api/src/main/java/org/hisp/dhis/android/dashboard/api/controllers/DhisController.java b/api/src/main/java/org/hisp/dhis/android/dashboard/api/controllers/DhisController.java
index 148e6a66..f5ce530d 100755
--- a/api/src/main/java/org/hisp/dhis/android/dashboard/api/controllers/DhisController.java
+++ b/api/src/main/java/org/hisp/dhis/android/dashboard/api/controllers/DhisController.java
@@ -33,7 +33,6 @@
 import android.content.Context;
 
 import com.raizlabs.android.dbflow.config.FlowManager;
-import com.squareup.okhttp.HttpUrl;
 
 import org.hisp.dhis.android.dashboard.api.models.UserAccount;
 import org.hisp.dhis.android.dashboard.api.models.meta.Credentials;
@@ -49,6 +48,8 @@
 
 import java.io.IOException;
 
+import okhttp3.HttpUrl;
+
 public class DhisController {
     private static DhisController mDhisController;
     private Session mSession;
diff --git a/api/src/main/java/org/hisp/dhis/android/dashboard/api/controllers/MapController.java b/api/src/main/java/org/hisp/dhis/android/dashboard/api/controllers/MapController.java
index 15dd75c1..153147fb 100644
--- a/api/src/main/java/org/hisp/dhis/android/dashboard/api/controllers/MapController.java
+++ b/api/src/main/java/org/hisp/dhis/android/dashboard/api/controllers/MapController.java
@@ -1,30 +1,16 @@
 package org.hisp.dhis.android.dashboard.api.controllers;
 
 import static org.hisp.dhis.android.dashboard.api.models.BaseIdentifiableObject.merge;
-import static org.hisp.dhis.android.dashboard.api.models.BaseIdentifiableObject.toMap;
 import static org.hisp.dhis.android.dashboard.api.utils.NetworkUtils.unwrapResponse;
 
-import android.content.Context;
-import android.net.Uri;
-import android.widget.ImageView;
-
 import com.raizlabs.android.dbflow.sql.language.Select;
-import com.squareup.okhttp.HttpUrl;
-import com.squareup.picasso.NetworkPolicy;
-import com.squareup.picasso.Picasso;
-
-import org.hisp.dhis.android.dashboard.api.models.Dashboard;
-import org.hisp.dhis.android.dashboard.api.models.DashboardElement;
-import org.hisp.dhis.android.dashboard.api.models.DashboardItem;
 import org.hisp.dhis.android.dashboard.api.models.DataMap;
 import org.hisp.dhis.android.dashboard.api.models.meta.DbOperation;
 import org.hisp.dhis.android.dashboard.api.network.APIException;
-import org.hisp.dhis.android.dashboard.api.network.BaseMapLayerDhisTransformation;
 import org.hisp.dhis.android.dashboard.api.network.DhisApi;
 import org.hisp.dhis.android.dashboard.api.persistence.preferences.DateTimeManager;
 import org.hisp.dhis.android.dashboard.api.persistence.preferences.ResourceType;
 import org.hisp.dhis.android.dashboard.api.utils.DbUtils;
-import org.hisp.dhis.android.dashboard.api.utils.PicassoProvider;
 import org.joda.time.DateTime;
 
 import java.util.HashMap;
@@ -33,6 +19,8 @@
 import java.util.Map;
 import java.util.Queue;
 
+import okhttp3.HttpUrl;
+
 public class MapController {
     private DhisApi mDhisApi;
 
diff --git a/api/src/main/java/org/hisp/dhis/android/dashboard/api/controllers/UserController.java b/api/src/main/java/org/hisp/dhis/android/dashboard/api/controllers/UserController.java
index 00a1c2ef..ce361779 100755
--- a/api/src/main/java/org/hisp/dhis/android/dashboard/api/controllers/UserController.java
+++ b/api/src/main/java/org/hisp/dhis/android/dashboard/api/controllers/UserController.java
@@ -27,7 +27,6 @@
 package org.hisp.dhis.android.dashboard.api.controllers;
 
 import com.raizlabs.android.dbflow.sql.language.Delete;
-import com.squareup.okhttp.HttpUrl;
 
 import org.hisp.dhis.android.dashboard.api.models.Dashboard;
 import org.hisp.dhis.android.dashboard.api.models.DashboardElement;
@@ -49,6 +48,8 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import okhttp3.HttpUrl;
+
 /**
  * @author Araz Abishov <araz.abishov.gsoc@gmail.com>.
  */
diff --git a/api/src/main/java/org/hisp/dhis/android/dashboard/api/models/meta/Session.java b/api/src/main/java/org/hisp/dhis/android/dashboard/api/models/meta/Session.java
index ee94fca1..a85de263 100755
--- a/api/src/main/java/org/hisp/dhis/android/dashboard/api/models/meta/Session.java
+++ b/api/src/main/java/org/hisp/dhis/android/dashboard/api/models/meta/Session.java
@@ -28,7 +28,8 @@
 
 package org.hisp.dhis.android.dashboard.api.models.meta;
 
-import com.squareup.okhttp.HttpUrl;
+
+import okhttp3.HttpUrl;
 
 public final class Session {
     private final HttpUrl serverUrl;
diff --git a/api/src/main/java/org/hisp/dhis/android/dashboard/api/network/RepoManager.java b/api/src/main/java/org/hisp/dhis/android/dashboard/api/network/RepoManager.java
index c06a851c..45024626 100755
--- a/api/src/main/java/org/hisp/dhis/android/dashboard/api/network/RepoManager.java
+++ b/api/src/main/java/org/hisp/dhis/android/dashboard/api/network/RepoManager.java
@@ -28,18 +28,13 @@
 
 package org.hisp.dhis.android.dashboard.api.network;
 
-import static com.squareup.okhttp.Credentials.basic;
 
 import android.content.Context;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 
-import com.squareup.okhttp.Cache;
-import com.squareup.okhttp.HttpUrl;
-import com.squareup.okhttp.Interceptor;
-import com.squareup.okhttp.OkHttpClient;
-import com.squareup.okhttp.Request;
-import com.squareup.okhttp.Response;
+
+import com.jakewharton.retrofit.Ok3Client;
 
 import org.hisp.dhis.android.dashboard.api.controllers.DhisController;
 import org.hisp.dhis.android.dashboard.api.models.meta.Credentials;
@@ -50,6 +45,12 @@
 import java.net.HttpURLConnection;
 import java.util.concurrent.TimeUnit;
 
+import okhttp3.Cache;
+import okhttp3.HttpUrl;
+import okhttp3.Interceptor;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
 import retrofit.ErrorHandler;
 import retrofit.RequestInterceptor;
 import retrofit.RestAdapter;
@@ -58,6 +59,8 @@
 import retrofit.converter.Converter;
 import retrofit.converter.JacksonConverter;
 
+import static okhttp3.Credentials.basic;
+
 
 public final class RepoManager {
     static final int DEFAULT_CONNECT_TIMEOUT_MILLIS = 15 * 1000; // 15s
@@ -69,7 +72,7 @@ private RepoManager() {
     }
 
     public static DhisApi createService(HttpUrl serverUrl, Credentials credentials,
-            final Context context) {
+                                        final Context context) {
         RestAdapter restAdapter = new RestAdapter.Builder()
                 .setEndpoint(provideServerUrl(serverUrl))
                 .setConverter(provideJacksonConverter())
@@ -91,19 +94,17 @@ private static Converter provideJacksonConverter() {
         return new JacksonConverter(ObjectMapperProvider.getInstance());
     }
 
-    private static OkClient provideOkClient(Credentials credentials, Context context) {
-        return new OkClient(provideOkHttpClient(credentials, context));
+    private static Ok3Client provideOkClient(Credentials credentials, Context context) {
+        return new Ok3Client(provideOkHttpClient(credentials, context));
     }
 
     public static OkHttpClient provideOkHttpClient(Credentials credentials, Context context) {
-
-        OkHttpClient client = new OkHttpClient();
-        client.interceptors().add(provideInterceptor(credentials));
-        client.setConnectTimeout(DEFAULT_CONNECT_TIMEOUT_MILLIS, TimeUnit.MILLISECONDS);
-        client.setReadTimeout(DEFAULT_READ_TIMEOUT_MILLIS, TimeUnit.MILLISECONDS);
-        client.setWriteTimeout(DEFAULT_WRITE_TIMEOUT_MILLIS, TimeUnit.MILLISECONDS);
-        client.setCache(provideCache(context));
-        return client;
+        return new OkHttpClient().newBuilder()
+                .addInterceptor(provideInterceptor(credentials))
+                .connectTimeout(DEFAULT_CONNECT_TIMEOUT_MILLIS, TimeUnit.MILLISECONDS)
+                .readTimeout(DEFAULT_READ_TIMEOUT_MILLIS, TimeUnit.MILLISECONDS)
+                .writeTimeout(DEFAULT_WRITE_TIMEOUT_MILLIS, TimeUnit.MILLISECONDS)
+                .cache(provideCache(context)).build();
     }
 
     private static Cache provideCache(Context context) {
diff --git a/api/src/main/java/org/hisp/dhis/android/dashboard/api/persistence/loaders/DbLoader.java b/api/src/main/java/org/hisp/dhis/android/dashboard/api/persistence/loaders/DbLoader.java
index 7b5c160e..2c19adde 100755
--- a/api/src/main/java/org/hisp/dhis/android/dashboard/api/persistence/loaders/DbLoader.java
+++ b/api/src/main/java/org/hisp/dhis/android/dashboard/api/persistence/loaders/DbLoader.java
@@ -125,6 +125,7 @@ protected void onStartLoading() {
         }
 
         // Begin monitoring the underlying data source.
+
         registerObservers();
 
         if (takeContentChanged() || mData == null) {
diff --git a/api/src/main/java/org/hisp/dhis/android/dashboard/api/persistence/preferences/LastUpdatedManager.java b/api/src/main/java/org/hisp/dhis/android/dashboard/api/persistence/preferences/LastUpdatedManager.java
index 80fe31f6..a42fa23a 100755
--- a/api/src/main/java/org/hisp/dhis/android/dashboard/api/persistence/preferences/LastUpdatedManager.java
+++ b/api/src/main/java/org/hisp/dhis/android/dashboard/api/persistence/preferences/LastUpdatedManager.java
@@ -31,11 +31,11 @@
 import android.content.Context;
 import android.content.SharedPreferences;
 
-import com.squareup.okhttp.HttpUrl;
-
 import org.hisp.dhis.android.dashboard.api.models.meta.Credentials;
 import org.hisp.dhis.android.dashboard.api.models.meta.Session;
 
+import okhttp3.HttpUrl;
+
 import static org.hisp.dhis.android.dashboard.api.utils.Preconditions.isNull;
 
 public final class LastUpdatedManager {
diff --git a/api/src/main/java/org/hisp/dhis/android/dashboard/api/utils/PicassoProvider.java b/api/src/main/java/org/hisp/dhis/android/dashboard/api/utils/PicassoProvider.java
index f5d868a3..f91d3a2e 100755
--- a/api/src/main/java/org/hisp/dhis/android/dashboard/api/utils/PicassoProvider.java
+++ b/api/src/main/java/org/hisp/dhis/android/dashboard/api/utils/PicassoProvider.java
@@ -30,13 +30,14 @@
 
 import android.content.Context;
 
-import com.squareup.okhttp.OkHttpClient;
-import com.squareup.picasso.OkHttpDownloader;
+import com.jakewharton.picasso.OkHttp3Downloader;
 import com.squareup.picasso.Picasso;
 
 import org.hisp.dhis.android.dashboard.api.controllers.DhisController;
 import org.hisp.dhis.android.dashboard.api.network.RepoManager;
 
+import okhttp3.OkHttpClient;
+
 public final class PicassoProvider {
 
     private static Picasso mPicasso;
@@ -49,7 +50,7 @@ public static Picasso getInstance(Context context, boolean changeCredentials) {
             OkHttpClient client = RepoManager.provideOkHttpClient(
                     DhisController.getInstance().getUserCredentials(), context);
             mPicasso = new Picasso.Builder(context)
-                    .downloader(new OkHttpDownloader(client))
+                    .downloader(new OkHttp3Downloader(client))
                     .build();
             mPicasso.setIndicatorsEnabled(false);
             mPicasso.setLoggingEnabled(false);
diff --git a/app/build.gradle b/app/build.gradle
index 8c2ed721..5ff68ab4 100755
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -7,20 +7,21 @@ repositories {
 }
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.2"
+    compileSdkVersion 26
+    buildToolsVersion "25.0.3"
 
     defaultConfig {
         applicationId "org.hisp.dhis.android.dashboard_dev"
         minSdkVersion 15
-        targetSdkVersion 25
+        targetSdkVersion 26
         versionCode 11
         versionName "0.7.3"
+        multiDexEnabled true
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
 
     packagingOptions {
@@ -41,25 +42,32 @@ android {
 }
 
 dependencies {
-    compile project(':api')
-
+    implementation project(':api')
+    annotationProcessor 'com.raizlabs.android:DBFlow-Compiler:2.2.1'
+    implementation "com.raizlabs.android:DBFlow-Core:2.2.1"
+    implementation "com.raizlabs.android:DBFlow:2.2.1"
     // Google
-    compile 'com.android.support:recyclerview-v7:25.2.0'
-    compile 'com.android.support:appcompat-v7:25.2.0'
-    compile 'com.android.support:cardview-v7:25.2.0'
-    compile 'com.android.support:design:25.2.0'
-
+    implementation 'com.android.support:recyclerview-v7:26.1.0'
+    implementation 'com.android.support:appcompat-v7:26.1.0'
+    implementation 'com.android.support:cardview-v7:26.1.0'
+    implementation 'com.android.support:design:26.1.0'
     // Castorflex
-    compile 'com.github.castorflex.smoothprogressbar:library-circular:1.2.0'
-    compile 'com.github.castorflex.smoothprogressbar:library:1.1.0'
+    implementation 'com.github.castorflex.smoothprogressbar:library-circular:1.2.0'
+    implementation 'com.github.castorflex.smoothprogressbar:library:1.1.0'
 
     // Other
-    compile 'com.jakewharton:butterknife:7.0.1'
-    compile 'com.github.chrisbanes.photoview:library:1.2.4'
+    compile 'com.jakewharton:butterknife:8.4.0'
+    annotationProcessor 'com.jakewharton:butterknife-compiler:8.4.0'
+    implementation 'com.github.chrisbanes.photoview:library:1.2.4'
 
+    implementation 'com.squareup.okhttp3:okhttp-urlconnection:3.9.0'
+    implementation 'com.squareup.okhttp3:okhttp:3.14.1'
+    implementation 'com.squareup:otto:1.3.8'
+    implementation 'com.squareup.picasso:picasso:2.5.2'
+    implementation 'com.squareup.retrofit:retrofit:1.9.0'
     // Java test dependencies
     testCompile "junit:junit:4.10"
     compile('com.crashlytics.sdk.android:crashlytics:2.9.1@aar') {
-        transitive = true;
+        transitive = true
     }
 }
diff --git a/app/src/main/java/org/hisp/dhis/android/dashboard/DhisApplication.java b/app/src/main/java/org/hisp/dhis/android/dashboard/DhisApplication.java
index 454604db..b99a27eb 100755
--- a/app/src/main/java/org/hisp/dhis/android/dashboard/DhisApplication.java
+++ b/app/src/main/java/org/hisp/dhis/android/dashboard/DhisApplication.java
@@ -87,4 +87,6 @@ public void showApiExceptionMessage(APIException apiException) {
 
         }
     }
+
+
 }
diff --git a/app/src/main/java/org/hisp/dhis/android/dashboard/DhisService.java b/app/src/main/java/org/hisp/dhis/android/dashboard/DhisService.java
index 1988f14d..7774f688 100755
--- a/app/src/main/java/org/hisp/dhis/android/dashboard/DhisService.java
+++ b/app/src/main/java/org/hisp/dhis/android/dashboard/DhisService.java
@@ -32,8 +32,6 @@
 import android.os.Binder;
 import android.os.IBinder;
 
-import com.squareup.okhttp.HttpUrl;
-
 import org.hisp.dhis.android.dashboard.api.controllers.DhisController;
 import org.hisp.dhis.android.dashboard.api.job.Job;
 import org.hisp.dhis.android.dashboard.api.job.JobExecutor;
@@ -46,6 +44,8 @@
 import org.hisp.dhis.android.dashboard.api.utils.SyncStrategy;
 import org.hisp.dhis.android.dashboard.ui.events.UiEvent;
 
+import okhttp3.HttpUrl;
+
 /**
  * @author Araz Abishov <araz.abishov.gsoc@gmail.com>.
  */
diff --git a/app/src/main/java/org/hisp/dhis/android/dashboard/ui/activities/ConfirmUserActivity.java b/app/src/main/java/org/hisp/dhis/android/dashboard/ui/activities/ConfirmUserActivity.java
index 67f98ec0..d9566565 100755
--- a/app/src/main/java/org/hisp/dhis/android/dashboard/ui/activities/ConfirmUserActivity.java
+++ b/app/src/main/java/org/hisp/dhis/android/dashboard/ui/activities/ConfirmUserActivity.java
@@ -46,7 +46,7 @@
 import org.hisp.dhis.android.dashboard.api.persistence.preferences.ResourceType;
 import org.hisp.dhis.android.dashboard.ui.events.UiEvent;
 
-import butterknife.Bind;
+import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 import butterknife.OnTextChanged;
@@ -57,25 +57,25 @@
 public class ConfirmUserActivity extends BaseActivity {
     private static final String IS_LOADING = "state:isLoading";
 
-    @Bind(R.id.toolbar)
+    @BindView(R.id.toolbar)
     Toolbar mToolbar;
 
-    @Bind(R.id.progress_bar_circular_navy)
+    @BindView(R.id.progress_bar_circular_navy)
     CircularProgressBar mProgressBar;
 
-    @Bind(R.id.re_log_in_views_container)
+    @BindView(R.id.re_log_in_views_container)
     View mViewsContainer;
 
-    @Bind(R.id.username)
+    @BindView(R.id.username)
     EditText mUsername;
 
-    @Bind(R.id.password)
+    @BindView(R.id.password)
     EditText mPassword;
 
-    @Bind(R.id.re_log_in_button)
+    @BindView(R.id.re_log_in_button)
     Button mReLogIn;
 
-    @Bind(R.id.delete_and_log_out_button)
+    @BindView(R.id.delete_and_log_out_button)
     Button mLogOut;
 
     @Override
diff --git a/app/src/main/java/org/hisp/dhis/android/dashboard/ui/activities/DashboardElementDetailActivity.java b/app/src/main/java/org/hisp/dhis/android/dashboard/ui/activities/DashboardElementDetailActivity.java
index 4fb27bb2..4c94b1b9 100755
--- a/app/src/main/java/org/hisp/dhis/android/dashboard/ui/activities/DashboardElementDetailActivity.java
+++ b/app/src/main/java/org/hisp/dhis/android/dashboard/ui/activities/DashboardElementDetailActivity.java
@@ -51,7 +51,7 @@
 import org.hisp.dhis.android.dashboard.ui.fragments.MapImageViewFragment;
 import org.hisp.dhis.android.dashboard.ui.fragments.WebViewFragment;
 
-import butterknife.Bind;
+import butterknife.BindView;
 import butterknife.ButterKnife;
 
 public class DashboardElementDetailActivity extends BaseActivity {
@@ -59,7 +59,7 @@ public class DashboardElementDetailActivity extends BaseActivity {
     private static final String INTERPRETATION_ELEMENT_ID = "arg:interpretationElementId";
 
 
-    @Bind(R.id.toolbar)
+    @BindView(R.id.toolbar)
     Toolbar mToolbar;
 
     public static Intent newIntentForDashboardElement(Activity activity, long dashboardElementId) {
diff --git a/app/src/main/java/org/hisp/dhis/android/dashboard/ui/activities/LoginActivity.java b/app/src/main/java/org/hisp/dhis/android/dashboard/ui/activities/LoginActivity.java
index fa570087..b81bd04e 100755
--- a/app/src/main/java/org/hisp/dhis/android/dashboard/ui/activities/LoginActivity.java
+++ b/app/src/main/java/org/hisp/dhis/android/dashboard/ui/activities/LoginActivity.java
@@ -39,7 +39,6 @@
 import android.widget.Button;
 import android.widget.EditText;
 
-import com.squareup.okhttp.HttpUrl;
 import com.squareup.otto.Subscribe;
 
 import org.hisp.dhis.android.dashboard.R;
@@ -50,31 +49,32 @@
 import org.hisp.dhis.android.dashboard.api.persistence.preferences.ResourceType;
 import org.hisp.dhis.android.dashboard.api.utils.PicassoProvider;
 
-import butterknife.Bind;
+import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 import butterknife.OnTextChanged;
 import fr.castorflex.android.circularprogressbar.CircularProgressBar;
+import okhttp3.HttpUrl;
 
 public class LoginActivity extends BaseActivity {
     private static final String IS_LOADING = "state:isLoading";
 
-    @Bind(R.id.log_in_views_container)
+    @BindView(R.id.log_in_views_container)
     View mViewsContainer;
 
-    @Bind(R.id.progress_bar_circular_white)
+    @BindView(R.id.progress_bar_circular_white)
     CircularProgressBar mProgressBar;
 
-    @Bind(R.id.server_url)
+    @BindView(R.id.server_url)
     EditText mServerUrl;
 
-    @Bind(R.id.username)
+    @BindView(R.id.username)
     EditText mUsername;
 
-    @Bind(R.id.password)
+    @BindView(R.id.password)
     EditText mPassword;
 
-    @Bind(R.id.log_in_button)
+    @BindView(R.id.log_in_button)
     Button mLogInButton;
 
     @Override
diff --git a/app/src/main/java/org/hisp/dhis/android/dashboard/ui/activities/MenuActivity.java b/app/src/main/java/org/hisp/dhis/android/dashboard/ui/activities/MenuActivity.java
index c9c477b4..efa6b553 100755
--- a/app/src/main/java/org/hisp/dhis/android/dashboard/ui/activities/MenuActivity.java
+++ b/app/src/main/java/org/hisp/dhis/android/dashboard/ui/activities/MenuActivity.java
@@ -58,7 +58,7 @@
 import java.util.Arrays;
 import java.util.List;
 
-import butterknife.Bind;
+import butterknife.BindView;
 import butterknife.ButterKnife;
 
 import static org.hisp.dhis.android.dashboard.api.utils.Preconditions.isNull;
@@ -69,10 +69,10 @@ public class MenuActivity extends BaseActivity
 
     private static final int LOADER_ID = 589352;
 
-    @Bind(R.id.navigation_view)
+    @BindView(R.id.navigation_view)
     NavigationView mNavigationView;
 
-    @Bind(R.id.drawer_layout)
+    @BindView(R.id.drawer_layout)
     DrawerLayout mDrawerLayout;
 
     TextView mUsername;
diff --git a/app/src/main/java/org/hisp/dhis/android/dashboard/ui/adapters/AccountFieldAdapter.java b/app/src/main/java/org/hisp/dhis/android/dashboard/ui/adapters/AccountFieldAdapter.java
index 61fff752..64033b6a 100755
--- a/app/src/main/java/org/hisp/dhis/android/dashboard/ui/adapters/AccountFieldAdapter.java
+++ b/app/src/main/java/org/hisp/dhis/android/dashboard/ui/adapters/AccountFieldAdapter.java
@@ -10,7 +10,7 @@
 import org.hisp.dhis.android.dashboard.R;
 import org.hisp.dhis.android.dashboard.ui.models.Field;
 
-import butterknife.Bind;
+import butterknife.BindView;
 import butterknife.ButterKnife;
 
 /**
@@ -36,10 +36,10 @@ public void onBindViewHolder(FieldViewHolder holder, int position) {
     }
 
     public static class FieldViewHolder extends RecyclerView.ViewHolder {
-        @Bind(R.id.field_label_text_view)
+        @BindView(R.id.field_label_text_view)
         public TextView labelTextView;
 
-        @Bind(R.id.field_value_text_view)
+        @BindView(R.id.field_value_text_view)
         public TextView valueTextView;
 
         public FieldViewHolder(View itemView) {
diff --git a/app/src/main/java/org/hisp/dhis/android/dashboard/ui/adapters/DashboardItemAdapter.java b/app/src/main/java/org/hisp/dhis/android/dashboard/ui/adapters/DashboardItemAdapter.java
index b8649d3a..7be32e47 100755
--- a/app/src/main/java/org/hisp/dhis/android/dashboard/ui/adapters/DashboardItemAdapter.java
+++ b/app/src/main/java/org/hisp/dhis/android/dashboard/ui/adapters/DashboardItemAdapter.java
@@ -55,7 +55,8 @@
 
 import java.util.List;
 
-import butterknife.Bind;
+import butterknife.BindView;
+import butterknife.BindViews;
 import butterknife.ButterKnife;
 
 public class DashboardItemAdapter extends
@@ -733,7 +734,7 @@ public void set(View view, List<DashboardElement> elements, int index) {
         final OnListElementInternalClickListener onListElementInternalClickListener;
         final View itemElementsContainer;
 
-        @Bind({
+        @BindViews({
                 R.id.element_item_0,
                 R.id.element_item_1,
                 R.id.element_item_2,
@@ -745,7 +746,7 @@ public void set(View view, List<DashboardElement> elements, int index) {
         })
         List<TextView> elementItems;
 
-        @Bind({
+        @BindViews({
                 R.id.element_item_0_delete_button,
                 R.id.element_item_1_delete_button,
                 R.id.element_item_2_delete_button,
diff --git a/app/src/main/java/org/hisp/dhis/android/dashboard/ui/fragments/AboutUsFragment.java b/app/src/main/java/org/hisp/dhis/android/dashboard/ui/fragments/AboutUsFragment.java
index 44170b02..8368ff31 100644
--- a/app/src/main/java/org/hisp/dhis/android/dashboard/ui/fragments/AboutUsFragment.java
+++ b/app/src/main/java/org/hisp/dhis/android/dashboard/ui/fragments/AboutUsFragment.java
@@ -25,12 +25,12 @@
 import java.io.InputStreamReader;
 import java.util.Locale;
 
-import butterknife.Bind;
+import butterknife.BindView;
 import butterknife.ButterKnife;
 
 public class AboutUsFragment extends BaseFragment {
 
-    @Bind(R.id.toolbar)
+    @BindView(R.id.toolbar)
     Toolbar mToolbar;
 
     public static String getAppVersion() {
diff --git a/app/src/main/java/org/hisp/dhis/android/dashboard/ui/fragments/AccountFragment.java b/app/src/main/java/org/hisp/dhis/android/dashboard/ui/fragments/AccountFragment.java
index 0fae6a12..0436a7c8 100755
--- a/app/src/main/java/org/hisp/dhis/android/dashboard/ui/fragments/AccountFragment.java
+++ b/app/src/main/java/org/hisp/dhis/android/dashboard/ui/fragments/AccountFragment.java
@@ -51,7 +51,7 @@
 import java.util.Arrays;
 import java.util.List;
 
-import butterknife.Bind;
+import butterknife.BindView;
 import butterknife.ButterKnife;
 
 /**
@@ -60,10 +60,10 @@
 public final class AccountFragment extends BaseFragment implements LoaderCallbacks<List<Field>> {
     private static final int LOADER_ID = 66756123;
 
-    @Bind(R.id.toolbar)
+    @BindView(R.id.toolbar)
     Toolbar mToolbar;
 
-    @Bind(R.id.recycler_view)
+    @BindView(R.id.recycler_view)
     RecyclerView mRecyclerView;
 
     AccountFieldAdapter mAdapter;
diff --git a/app/src/main/java/org/hisp/dhis/android/dashboard/ui/fragments/MapImageViewFragment.java b/app/src/main/java/org/hisp/dhis/android/dashboard/ui/fragments/MapImageViewFragment.java
index dad2382f..18e4cb3b 100755
--- a/app/src/main/java/org/hisp/dhis/android/dashboard/ui/fragments/MapImageViewFragment.java
+++ b/app/src/main/java/org/hisp/dhis/android/dashboard/ui/fragments/MapImageViewFragment.java
@@ -40,7 +40,6 @@
 import android.view.ViewGroup;
 import android.widget.ImageView;
 
-import com.squareup.okhttp.HttpUrl;
 import com.squareup.picasso.MemoryPolicy;
 import com.squareup.picasso.NetworkPolicy;
 
@@ -49,6 +48,7 @@
 import org.hisp.dhis.android.dashboard.api.network.BaseMapLayerDhisTransformation;
 import org.hisp.dhis.android.dashboard.api.utils.PicassoProvider;
 
+import okhttp3.HttpUrl;
 import uk.co.senab.photoview.PhotoViewAttacher;
 
 public class MapImageViewFragment extends BaseFragment {
diff --git a/app/src/main/java/org/hisp/dhis/android/dashboard/ui/fragments/SettingsFragment.java b/app/src/main/java/org/hisp/dhis/android/dashboard/ui/fragments/SettingsFragment.java
index c9748dec..8d057634 100755
--- a/app/src/main/java/org/hisp/dhis/android/dashboard/ui/fragments/SettingsFragment.java
+++ b/app/src/main/java/org/hisp/dhis/android/dashboard/ui/fragments/SettingsFragment.java
@@ -19,7 +19,7 @@
 import org.hisp.dhis.android.dashboard.ui.events.UiEvent;
 import org.hisp.dhis.android.dashboard.ui.views.FontEditText;
 
-import butterknife.Bind;
+import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 
@@ -27,7 +27,7 @@
  * Created by arazabishov on 7/27/15.
  */
 public final class SettingsFragment extends BaseFragment {
-    @Bind(R.id.toolbar)
+    @BindView(R.id.toolbar)
     Toolbar mToolbar;
     FontEditText widthEditText;
     FontEditText heightEditText;
diff --git a/app/src/main/java/org/hisp/dhis/android/dashboard/ui/fragments/WebViewFragment.java b/app/src/main/java/org/hisp/dhis/android/dashboard/ui/fragments/WebViewFragment.java
index cfc03cb1..a580fd79 100755
--- a/app/src/main/java/org/hisp/dhis/android/dashboard/ui/fragments/WebViewFragment.java
+++ b/app/src/main/java/org/hisp/dhis/android/dashboard/ui/fragments/WebViewFragment.java
@@ -62,7 +62,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import butterknife.Bind;
+import butterknife.BindView;
 import butterknife.ButterKnife;
 import retrofit.mime.TypedInput;
 
@@ -71,10 +71,10 @@ public class WebViewFragment extends BaseFragment {
     private Context mContext;
     private static final String DASHBOARD_TYPE = "dashboardType";
 
-    @Bind(R.id.web_view_content)
+    @BindView(R.id.web_view_content)
     WebView mWebView;
 
-    @Bind(R.id.container_layout_progress_bar)
+    @BindView(R.id.container_layout_progress_bar)
     View mProgressBarContainer;
 
     public static WebViewFragment newInstance(String id, String dashboardType) {
diff --git a/app/src/main/java/org/hisp/dhis/android/dashboard/ui/fragments/dashboard/DashboardAddFragment.java b/app/src/main/java/org/hisp/dhis/android/dashboard/ui/fragments/dashboard/DashboardAddFragment.java
index d7efc879..d4904cf1 100755
--- a/app/src/main/java/org/hisp/dhis/android/dashboard/ui/fragments/dashboard/DashboardAddFragment.java
+++ b/app/src/main/java/org/hisp/dhis/android/dashboard/ui/fragments/dashboard/DashboardAddFragment.java
@@ -48,7 +48,7 @@
 import org.hisp.dhis.android.dashboard.ui.events.UiEvent;
 import org.hisp.dhis.android.dashboard.ui.fragments.BaseDialogFragment;
 
-import butterknife.Bind;
+import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 
@@ -58,13 +58,13 @@
 public final class DashboardAddFragment extends BaseDialogFragment {
     private static final String TAG = DashboardAddFragment.class.getSimpleName();
 
-    @Bind(R.id.dialog_label)
+    @BindView(R.id.dialog_label)
     TextView mDialogLabel;
 
-    @Bind(R.id.dashboard_name)
+    @BindView(R.id.dashboard_name)
     EditText mDashboardName;
 
-    @Bind(R.id.text_input_dashboard_name)
+    @BindView(R.id.text_input_dashboard_name)
     TextInputLayout mTextInputLayout;
 
     @Override
diff --git a/app/src/main/java/org/hisp/dhis/android/dashboard/ui/fragments/dashboard/DashboardEmptyFragment.java b/app/src/main/java/org/hisp/dhis/android/dashboard/ui/fragments/dashboard/DashboardEmptyFragment.java
index 5671045a..c9afdccc 100755
--- a/app/src/main/java/org/hisp/dhis/android/dashboard/ui/fragments/dashboard/DashboardEmptyFragment.java
+++ b/app/src/main/java/org/hisp/dhis/android/dashboard/ui/fragments/dashboard/DashboardEmptyFragment.java
@@ -47,7 +47,7 @@
 import org.hisp.dhis.android.dashboard.api.utils.SyncStrategy;
 import org.hisp.dhis.android.dashboard.ui.fragments.BaseFragment;
 
-import butterknife.Bind;
+import butterknife.BindView;
 import butterknife.ButterKnife;
 import fr.castorflex.android.smoothprogressbar.SmoothProgressBar;
 
@@ -61,10 +61,10 @@ public class DashboardEmptyFragment extends BaseFragment implements View.OnClick
     public static final String TAG = DashboardEmptyFragment.class.getSimpleName();
     private static final String IS_LOADING = "state:isLoading";
 
-    @Bind(R.id.toolbar)
+    @BindView(R.id.toolbar)
     Toolbar mToolbar;
 
-    @Bind(R.id.progress_bar)
+    @BindView(R.id.progress_bar)
     SmoothProgressBar mProgressBar;
 
     private DhisController.ImageNetworkPolicy mImageNetworkPolicy =
diff --git a/app/src/main/java/org/hisp/dhis/android/dashboard/ui/fragments/dashboard/DashboardItemAddFragment.java b/app/src/main/java/org/hisp/dhis/android/dashboard/ui/fragments/dashboard/DashboardItemAddFragment.java
index 958616fe..dac58ec0 100755
--- a/app/src/main/java/org/hisp/dhis/android/dashboard/ui/fragments/dashboard/DashboardItemAddFragment.java
+++ b/app/src/main/java/org/hisp/dhis/android/dashboard/ui/fragments/dashboard/DashboardItemAddFragment.java
@@ -74,7 +74,7 @@
 import java.util.Collections;
 import java.util.List;
 
-import butterknife.Bind;
+import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 import butterknife.OnItemClick;
@@ -85,16 +85,16 @@ public class DashboardItemAddFragment extends BaseDialogFragment
     private static final String TAG = DashboardItemAddFragment.class.getSimpleName();
     private static final int LOADER_ID = 3451234;
 
-    @Bind(R.id.filter_options)
+    @BindView(R.id.filter_options)
     EditText mFilter;
 
-    @Bind(R.id.dialog_label)
+    @BindView(R.id.dialog_label)
     TextView mDialogLabel;
 
-    @Bind(R.id.simple_listview)
+    @BindView(R.id.simple_listview)
     ListView mListView;
 
-    @Bind(R.id.filter_resources)
+    @BindView(R.id.filter_resources)
     ImageView mFilterResources;
 
     PopupMenu mResourcesMenu;
diff --git a/app/src/main/java/org/hisp/dhis/android/dashboard/ui/fragments/dashboard/DashboardManageFragment.java b/app/src/main/java/org/hisp/dhis/android/dashboard/ui/fragments/dashboard/DashboardManageFragment.java
index 15fb8897..cd3a3ae7 100755
--- a/app/src/main/java/org/hisp/dhis/android/dashboard/ui/fragments/dashboard/DashboardManageFragment.java
+++ b/app/src/main/java/org/hisp/dhis/android/dashboard/ui/fragments/dashboard/DashboardManageFragment.java
@@ -54,7 +54,7 @@
 import org.hisp.dhis.android.dashboard.ui.events.UiEvent;
 import org.hisp.dhis.android.dashboard.ui.fragments.BaseDialogFragment;
 
-import butterknife.Bind;
+import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 import butterknife.OnFocusChange;
@@ -65,25 +65,25 @@
 public final class DashboardManageFragment extends BaseDialogFragment {
     private static final String TAG = DashboardManageFragment.class.getSimpleName();
 
-    @Bind(R.id.fragment_bar)
+    @BindView(R.id.fragment_bar)
     View mFragmentBar;
 
-    @Bind(R.id.fragment_bar_mode_editing)
+    @BindView(R.id.fragment_bar_mode_editing)
     View mFragmentBarEditingMode;
 
-    @Bind(R.id.dialog_label)
+    @BindView(R.id.dialog_label)
     TextView mDialogLabel;
 
-    @Bind(R.id.action_name)
+    @BindView(R.id.action_name)
     TextView mActionName;
 
-    @Bind(R.id.dashboard_name)
+    @BindView(R.id.dashboard_name)
     EditText mDashboardName;
 
-    @Bind(R.id.delete_dashboard_button)
+    @BindView(R.id.delete_dashboard_button)
     Button mDeleteButton;
 
-    @Bind(R.id.text_input_dashboard_name)
+    @BindView(R.id.text_input_dashboard_name)
     TextInputLayout mTextInputLayout;
 
     Dashboard mDashboard;
diff --git a/app/src/main/java/org/hisp/dhis/android/dashboard/ui/fragments/dashboard/DashboardViewPagerFragment.java b/app/src/main/java/org/hisp/dhis/android/dashboard/ui/fragments/dashboard/DashboardViewPagerFragment.java
index 47cea2c0..deb5070c 100755
--- a/app/src/main/java/org/hisp/dhis/android/dashboard/ui/fragments/dashboard/DashboardViewPagerFragment.java
+++ b/app/src/main/java/org/hisp/dhis/android/dashboard/ui/fragments/dashboard/DashboardViewPagerFragment.java
@@ -70,7 +70,7 @@
 import java.util.Collections;
 import java.util.List;
 
-import butterknife.Bind;
+import butterknife.BindView;
 import butterknife.ButterKnife;
 import fr.castorflex.android.smoothprogressbar.SmoothProgressBar;
 
@@ -82,16 +82,16 @@ public class DashboardViewPagerFragment extends BaseFragment
     static final String IS_LOADING = "state:isLoading";
     static final int LOADER_ID = 1233432;
 
-    @Bind(R.id.dashboard_tabs)
+    @BindView(R.id.dashboard_tabs)
     TabLayout mTabs;
 
-    @Bind(R.id.dashboard_view_pager)
+    @BindView(R.id.dashboard_view_pager)
     ViewPager mViewPager;
 
-    @Bind(R.id.toolbar)
+    @BindView(R.id.toolbar)
     Toolbar mToolbar;
 
-    @Bind(R.id.progress_bar)
+    @BindView(R.id.progress_bar)
     SmoothProgressBar mProgressBar;
 
     DashboardAdapter mDashboardAdapter;
diff --git a/app/src/main/java/org/hisp/dhis/android/dashboard/ui/fragments/interpretation/InterpretationCommentEditFragment.java b/app/src/main/java/org/hisp/dhis/android/dashboard/ui/fragments/interpretation/InterpretationCommentEditFragment.java
index 24b24eab..ef733512 100755
--- a/app/src/main/java/org/hisp/dhis/android/dashboard/ui/fragments/interpretation/InterpretationCommentEditFragment.java
+++ b/app/src/main/java/org/hisp/dhis/android/dashboard/ui/fragments/interpretation/InterpretationCommentEditFragment.java
@@ -47,7 +47,7 @@
 import org.hisp.dhis.android.dashboard.api.utils.SyncStrategy;
 import org.hisp.dhis.android.dashboard.ui.fragments.BaseDialogFragment;
 
-import butterknife.Bind;
+import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 
@@ -57,10 +57,10 @@
 public class InterpretationCommentEditFragment extends BaseDialogFragment {
     private static final String TAG = InterpretationCommentEditFragment.class.getSimpleName();
 
-    @Bind(R.id.interpretation_comment_edit_text)
+    @BindView(R.id.interpretation_comment_edit_text)
     EditText mCommentEditText;
 
-    @Bind(R.id.dialog_label)
+    @BindView(R.id.dialog_label)
     TextView mDialogLabel;
 
     InterpretationComment mInterpretationComment;
diff --git a/app/src/main/java/org/hisp/dhis/android/dashboard/ui/fragments/interpretation/InterpretationCommentsFragment.java b/app/src/main/java/org/hisp/dhis/android/dashboard/ui/fragments/interpretation/InterpretationCommentsFragment.java
index 036867a7..edaa2657 100755
--- a/app/src/main/java/org/hisp/dhis/android/dashboard/ui/fragments/interpretation/InterpretationCommentsFragment.java
+++ b/app/src/main/java/org/hisp/dhis/android/dashboard/ui/fragments/interpretation/InterpretationCommentsFragment.java
@@ -74,7 +74,7 @@
 import java.util.Collections;
 import java.util.List;
 
-import butterknife.Bind;
+import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 import butterknife.OnTextChanged;
@@ -88,16 +88,16 @@ public class InterpretationCommentsFragment extends BaseFragment
     private static final String INTERPRETATION_ID = "arg:interpretationId";
     private static final String EMPTY_FIELD = "";
 
-    @Bind(R.id.toolbar)
+    @BindView(R.id.toolbar)
     Toolbar mToolbar;
 
-    @Bind(R.id.recycler_view)
+    @BindView(R.id.recycler_view)
     RecyclerView mRecyclerView;
 
-    @Bind(R.id.interpretation_comment_edit_text)
+    @BindView(R.id.interpretation_comment_edit_text)
     EditText mNewCommentText;
 
-    @Bind(R.id.add_interpretation_comment_button)
+    @BindView(R.id.add_interpretation_comment_button)
     ImageView mAddNewComment;
 
     InterpretationCommentsAdapter mAdapter;
diff --git a/app/src/main/java/org/hisp/dhis/android/dashboard/ui/fragments/interpretation/InterpretationCreateFragment.java b/app/src/main/java/org/hisp/dhis/android/dashboard/ui/fragments/interpretation/InterpretationCreateFragment.java
index e0f773cc..2952d4c2 100755
--- a/app/src/main/java/org/hisp/dhis/android/dashboard/ui/fragments/interpretation/InterpretationCreateFragment.java
+++ b/app/src/main/java/org/hisp/dhis/android/dashboard/ui/fragments/interpretation/InterpretationCreateFragment.java
@@ -60,7 +60,7 @@
 
 import java.util.List;
 
-import butterknife.Bind;
+import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 
@@ -70,10 +70,10 @@
 public final class InterpretationCreateFragment extends BaseDialogFragment {
     private static final String TAG = InterpretationCreateFragment.class.getSimpleName();
 
-    @Bind(R.id.dialog_label)
+    @BindView(R.id.dialog_label)
     TextView mDialogLabel;
 
-    @Bind(R.id.interpretation_text)
+    @BindView(R.id.interpretation_text)
     EditText mInterpretationText;
 
     DashboardItem mDashboardItem;
diff --git a/app/src/main/java/org/hisp/dhis/android/dashboard/ui/fragments/interpretation/InterpretationEmptyFragment.java b/app/src/main/java/org/hisp/dhis/android/dashboard/ui/fragments/interpretation/InterpretationEmptyFragment.java
index c4518327..85f6aa75 100755
--- a/app/src/main/java/org/hisp/dhis/android/dashboard/ui/fragments/interpretation/InterpretationEmptyFragment.java
+++ b/app/src/main/java/org/hisp/dhis/android/dashboard/ui/fragments/interpretation/InterpretationEmptyFragment.java
@@ -21,7 +21,7 @@
 import org.hisp.dhis.android.dashboard.api.utils.SyncStrategy;
 import org.hisp.dhis.android.dashboard.ui.fragments.BaseFragment;
 
-import butterknife.Bind;
+import butterknife.BindView;
 import butterknife.ButterKnife;
 import fr.castorflex.android.smoothprogressbar.SmoothProgressBar;
 
@@ -32,10 +32,10 @@ public class InterpretationEmptyFragment extends BaseFragment implements View.On
     public static final String TAG = InterpretationEmptyFragment.class.getSimpleName();
     private static final String IS_LOADING = "state:isLoading";
 
-    @Bind(R.id.toolbar)
+    @BindView(R.id.toolbar)
     Toolbar mToolbar;
 
-    @Bind(R.id.progress_bar)
+    @BindView(R.id.progress_bar)
     SmoothProgressBar mProgressBar;
 
     private DhisController.ImageNetworkPolicy mImageNetworkPolicy =
diff --git a/app/src/main/java/org/hisp/dhis/android/dashboard/ui/fragments/interpretation/InterpretationFragment.java b/app/src/main/java/org/hisp/dhis/android/dashboard/ui/fragments/interpretation/InterpretationFragment.java
index 5f751a0d..b166fe7c 100755
--- a/app/src/main/java/org/hisp/dhis/android/dashboard/ui/fragments/interpretation/InterpretationFragment.java
+++ b/app/src/main/java/org/hisp/dhis/android/dashboard/ui/fragments/interpretation/InterpretationFragment.java
@@ -76,7 +76,7 @@
 import java.util.Collections;
 import java.util.List;
 
-import butterknife.Bind;
+import butterknife.BindView;
 import butterknife.ButterKnife;
 import fr.castorflex.android.smoothprogressbar.SmoothProgressBar;
 
@@ -89,13 +89,13 @@ public final class InterpretationFragment extends BaseFragment
     private static final int LOADER_ID = 23452435;
     private static final String IS_LOADING = "state:isLoading";
 
-    @Bind(R.id.progress_bar)
+    @BindView(R.id.progress_bar)
     SmoothProgressBar mProgressBar;
 
-    @Bind(R.id.recycler_view)
+    @BindView(R.id.recycler_view)
     RecyclerView mRecyclerView;
 
-    @Bind(R.id.toolbar)
+    @BindView(R.id.toolbar)
     Toolbar mToolbar;
 
     InterpretationAdapter mAdapter;
diff --git a/app/src/main/java/org/hisp/dhis/android/dashboard/ui/fragments/interpretation/InterpretationTextEditFragment.java b/app/src/main/java/org/hisp/dhis/android/dashboard/ui/fragments/interpretation/InterpretationTextEditFragment.java
index 15dfddab..a4a349d0 100755
--- a/app/src/main/java/org/hisp/dhis/android/dashboard/ui/fragments/interpretation/InterpretationTextEditFragment.java
+++ b/app/src/main/java/org/hisp/dhis/android/dashboard/ui/fragments/interpretation/InterpretationTextEditFragment.java
@@ -47,7 +47,7 @@
 import org.hisp.dhis.android.dashboard.ui.events.UiEvent;
 import org.hisp.dhis.android.dashboard.ui.fragments.BaseDialogFragment;
 
-import butterknife.Bind;
+import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 
@@ -57,10 +57,10 @@
 public final class InterpretationTextEditFragment extends BaseDialogFragment {
     private static final String TAG = InterpretationTextEditFragment.class.getSimpleName();
 
-    @Bind(R.id.dialog_label)
+    @BindView(R.id.dialog_label)
     TextView mDialogLabel;
 
-    @Bind(R.id.interpretation_text)
+    @BindView(R.id.interpretation_text)
     EditText mInterpretationText;
 
     Interpretation mInterpretation;
diff --git a/app/src/main/java/org/hisp/dhis/android/dashboard/ui/fragments/interpretation/InterpretationTextFragment.java b/app/src/main/java/org/hisp/dhis/android/dashboard/ui/fragments/interpretation/InterpretationTextFragment.java
index 4de5273d..0524ac45 100755
--- a/app/src/main/java/org/hisp/dhis/android/dashboard/ui/fragments/interpretation/InterpretationTextFragment.java
+++ b/app/src/main/java/org/hisp/dhis/android/dashboard/ui/fragments/interpretation/InterpretationTextFragment.java
@@ -44,7 +44,7 @@
 import org.hisp.dhis.android.dashboard.api.models.Interpretation;
 import org.hisp.dhis.android.dashboard.api.models.Interpretation$Table;
 
-import butterknife.Bind;
+import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 
@@ -54,10 +54,10 @@
 public final class InterpretationTextFragment extends DialogFragment {
     private static final String TAG = InterpretationTextFragment.class.getSimpleName();
 
-    @Bind(R.id.dialog_label)
+    @BindView(R.id.dialog_label)
     TextView mDialogLabel;
 
-    @Bind(R.id.interpretation_text)
+    @BindView(R.id.interpretation_text)
     TextView mInterpretationText;
 
     Interpretation mInterpretation;
diff --git a/build.gradle b/build.gradle
index 575ecab7..c0301e5b 100755
--- a/build.gradle
+++ b/build.gradle
@@ -2,18 +2,29 @@ buildscript {
     repositories {
         jcenter()
         maven { url 'https://maven.fabric.io/public' }
+        maven {
+            url 'https://maven.google.com/'
+            name 'Google'
+        }
+        google()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.0'
-        classpath 'com.neenbedankt.gradle.plugins:android-apt:1.4'
-        classpath 'com.dicedmelon.gradle:jacoco-android:0.1.1'
-        classpath 'io.fabric.tools:gradle:1.+'
+        classpath 'com.android.tools.build:gradle:3.1.3'
+        classpath ('com.dicedmelon.gradle:jacoco-android:0.1.1'){
+            exclude group: 'org.codehaus.groovy', module: 'groovy-all'
+        }
+        classpath 'io.fabric.tools:gradle:1.27.1'
+        classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
     }
 }
 
 allprojects {
     repositories {
         jcenter()
+        maven {
+            url 'https://maven.google.com/'
+            name 'Google'
+        }
     }
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index b603d611..fd8db4a1 100755
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Mar 10 10:41:32 CET 2017
+#Fri Apr 12 12:13:09 CEST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4.1-all.zip