diff --git a/.idea/misc.xml b/.idea/misc.xml
index f3d13dd7..635999df 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="EntryPointsManager">
-    <entry_points version="2.0" />
-  </component>
   <component name="NullableNotNullManager">
     <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
     <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
@@ -27,7 +24,7 @@
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/build.gradle b/app/build.gradle
index 7ecc4299..d5550357 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -22,6 +22,9 @@ android {
         gplay {
         }
     }
+    lintOptions {
+        abortOnError false
+    }
 }
 
 repositories {
@@ -31,10 +34,10 @@ repositories {
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
     testCompile 'junit:junit:4.12'
-    compile 'com.android.support:appcompat-v7:23.3.0'
-    compile 'com.android.support:design:23.3.0'
+    compile 'com.android.support:appcompat-v7:25.0.0'
+    compile 'com.android.support:design:25.0.0'
     compile 'com.google.zxing:core:3.0.1'
-    compile 'com.android.support:support-v4:23.3.0'
+    compile 'com.android.support:support-v4:25.0.0'
     compile 'com.github.ctodobom:OpenCV-3.1.0-Android:9e00ee4218ca0c9e60a905c9f09bf499f9dc5115'
     compile 'us.feras.mdv:markdownview:1.1.0'
     compile 'com.github.ctodobom:drag-select-recyclerview:0.3.4.ctodobom.sections'
diff --git a/app/src/main/res/layout/activity_open_note_scanner.xml b/app/src/main/res/layout/activity_open_note_scanner.xml
index a80c1e9c..255c63eb 100644
--- a/app/src/main/res/layout/activity_open_note_scanner.xml
+++ b/app/src/main/res/layout/activity_open_note_scanner.xml
@@ -148,7 +148,7 @@
                     app:fabSize="mini"
                     app:borderWidth="0dp"
                     app:elevation="0sp"
-                    android:src="@drawable/abc_ic_menu_moreoverflow_mtrl_alpha"
+                    android:src="@drawable/abc_ic_menu_overflow_material"
                     android:layout_alignParentRight="true"
                     android:backgroundTint="#A060FF60"
                     android:tint="#ffffff"
@@ -237,7 +237,7 @@
                     android:layout_height="match_parent"
                     android:layout_weight="1"
                     android:scaleType="centerInside"
-                    android:src="@drawable/abc_ic_clear_mtrl_alpha"
+                    android:src="@drawable/abc_ic_clear_material"
                     android:gravity="center"
                     android:enabled="true"
                     android:tint="#ffffff"/>