diff --git a/library/build.gradle b/library/build.gradle
index 0830d96..fe3c589 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 22
+    compileSdkVersion 23
     buildToolsVersion "22.0.1"
 
     lintOptions {
@@ -10,7 +10,7 @@ android {
 
     defaultConfig {
         minSdkVersion 14
-        targetSdkVersion 22
+        targetSdkVersion 23
         versionCode 1
         versionName "1.0"
     }
diff --git a/library/src/main/java/com/wnafee/vector/MorphButton.java b/library/src/main/java/com/wnafee/vector/MorphButton.java
index fe684c5..e00758d 100644
--- a/library/src/main/java/com/wnafee/vector/MorphButton.java
+++ b/library/src/main/java/com/wnafee/vector/MorphButton.java
@@ -194,7 +194,7 @@ private void updateDrawable(Drawable d, MorphState state) {
         if (d != null) {
             d.setCallback(this);
             //TODO: Adjust layout direction
-//            d.setLayoutDirection(getLayoutDirection());
+//            d.setSupportLayoutDirection(getSupportLayoutDirection());
             if (d.isStateful()) {
                 d.setState(getDrawableState());
             }
diff --git a/library/src/main/java/com/wnafee/vector/compat/AnimatedVectorDrawable.java b/library/src/main/java/com/wnafee/vector/compat/AnimatedVectorDrawable.java
index 4539c4f..1982918 100644
--- a/library/src/main/java/com/wnafee/vector/compat/AnimatedVectorDrawable.java
+++ b/library/src/main/java/com/wnafee/vector/compat/AnimatedVectorDrawable.java
@@ -152,8 +152,8 @@ public boolean setVisible(boolean visible, boolean restart) {
         return super.setVisible(visible, restart);
     }
 
-    public void setLayoutDirection(int layoutDirection) {
-        mAnimatedVectorState.mVectorDrawable.setLayoutDirection(layoutDirection);
+    public boolean setSupportLayoutDirection(int layoutDirection) {
+        return mAnimatedVectorState.mVectorDrawable.setSupportLayoutDirection(layoutDirection);
     }
 
     @Override
diff --git a/library/src/main/java/com/wnafee/vector/compat/DrawableCompat.java b/library/src/main/java/com/wnafee/vector/compat/DrawableCompat.java
index 68eaae0..21998eb 100644
--- a/library/src/main/java/com/wnafee/vector/compat/DrawableCompat.java
+++ b/library/src/main/java/com/wnafee/vector/compat/DrawableCompat.java
@@ -22,12 +22,15 @@
 import android.graphics.PorterDuffColorFilter;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
+import android.os.Build;
 import android.support.annotation.NonNull;
 import android.util.AttributeSet;
+import android.util.LayoutDirection;
+import android.view.View;
 
 public abstract class DrawableCompat extends Drawable {
 
-    int mLayoutDirection;
+    int mSupportLayoutDirection;
 
     public static abstract class ConstantStateCompat extends ConstantState {
 
@@ -77,14 +80,20 @@ public void getHotspotBounds(Rect outRect) {
         outRect.set(getBounds());
     }
 
-    public int getLayoutDirection() {
-        return mLayoutDirection;
+    public int getSupportLayoutDirection() {
+        return mSupportLayoutDirection;
     }
 
-    public void setLayoutDirection(int layoutDirection) {
-        if (getLayoutDirection() != layoutDirection) {
-            mLayoutDirection = layoutDirection;
+    public boolean setSupportLayoutDirection(int layoutDirection) {
+        if (getSupportLayoutDirection() != layoutDirection) {
+            mSupportLayoutDirection = layoutDirection;
+
+//            if (Build.VERSION.SDK_INT > Build.VERSION_CODES.LOLLIPOP_MR1) {
+//                return onLayoutDirectionChanged(mSupportLayoutDirection);
+//            }
         }
+
+        return false;
     }
 
     /**
diff --git a/library/src/main/java/com/wnafee/vector/compat/VectorDrawable.java b/library/src/main/java/com/wnafee/vector/compat/VectorDrawable.java
index 51d1aaa..0857729 100644
--- a/library/src/main/java/com/wnafee/vector/compat/VectorDrawable.java
+++ b/library/src/main/java/com/wnafee/vector/compat/VectorDrawable.java
@@ -503,7 +503,7 @@ void setAllowCaching(boolean allowCaching) {
     }
 
     private boolean needMirroring() {
-        return isAutoMirrored() && getLayoutDirection() == 1; // 1 is for LayoutDirection.RTL
+        return isAutoMirrored() && getSupportLayoutDirection() == 1; // 1 is for LayoutDirection.RTL
     }
 
     @Override