diff --git a/app/build.gradle b/app/build.gradle
index f6d6a669e..eb41e8e38 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,7 @@ buildscript {
   }
 
   dependencies {
-    classpath 'com.android.tools.build:gradle:3.1.0'
+    classpath 'com.android.tools.build:gradle:3.1.4'
     classpath 'com.testdroid:gradle:1.5.0'
     classpath 'org.apache.httpcomponents:httpclient-android:4.3.3'
   }
@@ -50,7 +50,7 @@ dependencies {
   implementation "com.android.support:cardview-v7:$supportLibraryVersion"
   implementation 'com.android.support:multidex:1.0.2'
 
-  compile 'com.android.support.constraint:constraint-layout:1.0.2'
+  implementation 'com.android.support.constraint:constraint-layout:1.0.2'
 
   androidTestImplementation 'com.android.support.test.uiautomator:uiautomator-v18:2.1.3'
 
@@ -68,7 +68,7 @@ dependencies {
     exclude group: 'com.android.support', module: 'recyclerview-v7'
   }
 
-  androidTestCompile('com.schibsted.spain:barista:2.4.0') {
+  androidTestImplementation('com.schibsted.spain:barista:2.4.0') {
     exclude group: 'com.android.support'
   }
 
diff --git a/app/src/main/res/layout/search.xml b/app/src/main/res/layout/search.xml
index 8c912124f..847938591 100644
--- a/app/src/main/res/layout/search.xml
+++ b/app/src/main/res/layout/search.xml
@@ -15,12 +15,12 @@
       xmlns:app="http://schemas.android.com/apk/res-auto"
       android:id="@+id/toolbar_layout"
       android:layout_width="match_parent"
-      android:layout_height="?actionBarSize">
+      android:layout_height="?android:attr/actionBarSize">
 
       <android.support.v7.widget.Toolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
-        android:layout_height="?actionBarSize"
+        android:layout_height="?android:attr/actionBarSize"
         android:background="?colorPrimaryDark"
         app:popupTheme="@style/AppTheme.PopupOverlay"
         app:theme="@style/AppTheme.AppBarOverlay" />
diff --git a/build.gradle b/build.gradle
index 2707b85f6..3d9a8cb45 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
       google()
   }
   dependencies {
-      classpath 'com.android.tools.build:gradle:3.1.0'
+      classpath 'com.android.tools.build:gradle:3.1.4'
 
     // NOTE: Do not place your application dependencies here; they belong
     // in the individual module build.gradle files
diff --git a/gradle.properties b/gradle.properties
index c232e1ce8..e3a75b87f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,4 @@
 android.enableD8=true
 android.enableD8.desugaring=true
+org.gradle.configureondemand=false
 org.gradle.jvmargs=-Xmx4096m