diff --git a/app/build.gradle b/app/build.gradle
index 3aead1e..b45d6a8 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,4 +1,5 @@
 apply plugin: 'com.android.application'
+apply plugin: 'android-apt'
 
 android {
     compileSdkVersion 23
@@ -28,7 +29,9 @@ android {
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     compile 'com.android.support:appcompat-v7:23.3.0'
-    compile 'com.jakewharton:butterknife:7.0.1'
+    compile 'com.jakewharton:butterknife:8.0.1'
+
+    apt 'com.jakewharton:butterknife-compiler:8.0.1'
 }
 
 def Properties props = new Properties()
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 9f53b88..25ea334 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -15,16 +15,3 @@
 #-keepclassmembers class fqcn.of.javascript.interface.for.webview {
 #   public *;
 #}
-
-# Butterknife
--keep class butterknife.** { *; }
--dontwarn butterknife.internal.**
--keep class **$$ViewBinder { *; }
-
--keepclasseswithmembernames class * {
-    @butterknife.* <fields>;
-}
-
--keepclasseswithmembernames class * {
-    @butterknife.* <methods>;
-}
diff --git a/app/src/main/java/com/simplemobiletools/flashlight/AboutActivity.java b/app/src/main/java/com/simplemobiletools/flashlight/AboutActivity.java
index 8a45206..86b499a 100644
--- a/app/src/main/java/com/simplemobiletools/flashlight/AboutActivity.java
+++ b/app/src/main/java/com/simplemobiletools/flashlight/AboutActivity.java
@@ -9,13 +9,13 @@ import android.widget.TextView;
 
 import java.util.Calendar;
 
-import butterknife.Bind;
+import butterknife.BindView;
 import butterknife.ButterKnife;
 
 public class AboutActivity extends AppCompatActivity {
-    @Bind(R.id.about_copyright) TextView copyright;
-    @Bind(R.id.about_version) TextView version;
-    @Bind(R.id.about_email) TextView emailTV;
+    @BindView(R.id.about_copyright) TextView copyright;
+    @BindView(R.id.about_version) TextView version;
+    @BindView(R.id.about_email) TextView emailTV;
     private Resources res;
 
     @Override
diff --git a/app/src/main/java/com/simplemobiletools/flashlight/MainActivity.java b/app/src/main/java/com/simplemobiletools/flashlight/MainActivity.java
index 298996b..f434478 100644
--- a/app/src/main/java/com/simplemobiletools/flashlight/MainActivity.java
+++ b/app/src/main/java/com/simplemobiletools/flashlight/MainActivity.java
@@ -6,21 +6,24 @@ import android.support.v7.app.AppCompatActivity;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
-import android.view.View;
 import android.view.WindowManager;
 import android.widget.ImageView;
 import android.widget.Toast;
 
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+
 public class MainActivity extends AppCompatActivity implements MyCamera {
-    private ImageView toggleBtn;
+    @BindView(R.id.toggle_btn) ImageView toggleBtn;
     private MyCameraImpl cameraImpl;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
+        ButterKnife.bind(this);
 
-        setupToggleButton();
         setupCameraImpl();
     }
 
@@ -48,14 +51,9 @@ public class MainActivity extends AppCompatActivity implements MyCamera {
         cameraImpl.toggleFlashlight();
     }
 
-    private void setupToggleButton() {
-        toggleBtn = (ImageView) findViewById(R.id.toggle_btn);
-        toggleBtn.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                cameraImpl.toggleFlashlight();
-            }
-        });
+    @OnClick(R.id.toggle_btn)
+    public void toggleFlashlight() {
+        cameraImpl.toggleFlashlight();
     }
 
     @Override
diff --git a/build.gradle b/build.gradle
index 03bced9..cc19335 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,6 +6,7 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:2.1.0'
+        classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files