diff --git a/RTEditor-Demo/build.gradle b/RTEditor-Demo/build.gradle
index 3d3ce3a9..f425196a 100644
--- a/RTEditor-Demo/build.gradle
+++ b/RTEditor-Demo/build.gradle
@@ -17,13 +17,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 24
-    buildToolsVersion '24.0.2'
+    compileSdkVersion 25
+    buildToolsVersion '25.0.0'
 
     defaultConfig {
         applicationId "com.onegravity.rteditor.demo"
         minSdkVersion 14
-        targetSdkVersion 24
+        targetSdkVersion 25
         versionCode 11
         versionName "1.3.2"
     }
diff --git a/RTEditor-Demo/src/main/AndroidManifest.xml b/RTEditor-Demo/src/main/AndroidManifest.xml
index 73716cf4..acd6f01f 100644
--- a/RTEditor-Demo/src/main/AndroidManifest.xml
+++ b/RTEditor-Demo/src/main/AndroidManifest.xml
@@ -15,17 +15,17 @@
   limitations under the License.
   -->
 
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.onegravity.rteditor.demo">
+<manifest package="com.onegravity.rteditor.demo"
+          xmlns:android="http://schemas.android.com/apk/res/android">
 
     <supports-screens
         android:anyDensity="true"
         android:largeScreens="true"
         android:normalScreens="true"
         android:smallScreens="true"
-        android:xlargeScreens="true" />
+        android:xlargeScreens="true"/>
 
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
 
     <application
         android:name="com.onegravity.rteditor.demo.RTApplication"
@@ -37,19 +37,24 @@
             android:name="com.onegravity.rteditor.demo.RTEditorActivity">
 
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />/>
+                <action android:name="android.intent.action.MAIN"/>
+
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>/>
             </intent-filter>
 
         </activity>
 
         <activity
             android:name="com.onegravity.rteditor.demo.RTEditorActivityWithFragment">
+        </activity>
+
+        <activity
+            android:name="com.onegravity.rteditor.demo.RTEditorPreview">
 
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.EMBED" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.EMBED"/>
             </intent-filter>
 
         </activity>
diff --git a/RTEditor-Demo/src/main/java/com/onegravity/rteditor/demo/RTEditorActivity.java b/RTEditor-Demo/src/main/java/com/onegravity/rteditor/demo/RTEditorActivity.java
index bdbca178..9f8584de 100644
--- a/RTEditor-Demo/src/main/java/com/onegravity/rteditor/demo/RTEditorActivity.java
+++ b/RTEditor-Demo/src/main/java/com/onegravity/rteditor/demo/RTEditorActivity.java
@@ -258,6 +258,11 @@ public boolean onOptionsItemSelected(MenuItem item) {
         } else if (itemId == R.id.editor_fragment) {
             startAndFinish(RTEditorActivityWithFragment.class);
             return true;
+        } else if (itemId == R.id.editor_preview) {
+            Intent i = new Intent(this, RTEditorPreview.class);
+            i.putExtra("text", mRTMessageField.getText(RTFormat.HTML) + "\n" +
+                    mRTSignatureField.getText(RTFormat.HTML));
+            startActivity(i);
         }
         return false;
     }
diff --git a/RTEditor-Demo/src/main/java/com/onegravity/rteditor/demo/RTEditorActivityWithFragment.java b/RTEditor-Demo/src/main/java/com/onegravity/rteditor/demo/RTEditorActivityWithFragment.java
index 6e1fdc29..0c6d9704 100644
--- a/RTEditor-Demo/src/main/java/com/onegravity/rteditor/demo/RTEditorActivityWithFragment.java
+++ b/RTEditor-Demo/src/main/java/com/onegravity/rteditor/demo/RTEditorActivityWithFragment.java
@@ -200,6 +200,11 @@ public boolean onOptionsItemSelected(MenuItem item) {
         } else if (itemId == R.id.editor_activity) {
             startAndFinish(RTEditorActivity.class);
             return true;
+        } else if (itemId == R.id.editor_preview) {
+            Intent i = new Intent(this, RTEditorPreview.class);
+            i.putExtra("text", mFragment.getMessage() + "\n" +
+                    mFragment.getSignature());
+            startActivity(i);
         }
         return false;
     }
diff --git a/RTEditor-Demo/src/main/java/com/onegravity/rteditor/demo/RTEditorPreview.java b/RTEditor-Demo/src/main/java/com/onegravity/rteditor/demo/RTEditorPreview.java
new file mode 100644
index 00000000..2519dba1
--- /dev/null
+++ b/RTEditor-Demo/src/main/java/com/onegravity/rteditor/demo/RTEditorPreview.java
@@ -0,0 +1,26 @@
+package com.onegravity.rteditor.demo;
+
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+import android.util.Log;
+import android.webkit.WebView;
+
+public class RTEditorPreview extends AppCompatActivity {
+
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.rte_preview);
+
+        WebView webView = (WebView) findViewById(R.id.webView);
+
+        String html = getIntent().getStringExtra("text");
+        html = html.replaceAll("<img src=\"", "<img src=\"file://");
+
+        webView.loadDataWithBaseURL("", html, "text/html", "UTF-8", "");
+    }
+
+}
+
+
diff --git a/RTEditor-Demo/src/main/res/layout/horizontal_separator.xml b/RTEditor-Demo/src/main/res/layout/horizontal_separator.xml
index 64002dc0..4e8af87a 100644
--- a/RTEditor-Demo/src/main/res/layout/horizontal_separator.xml
+++ b/RTEditor-Demo/src/main/res/layout/horizontal_separator.xml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <View
diff --git a/RTEditor-Demo/src/main/res/layout/rte_content.xml b/RTEditor-Demo/src/main/res/layout/rte_content.xml
index cf06ce5f..882e4fe7 100644
--- a/RTEditor-Demo/src/main/res/layout/rte_content.xml
+++ b/RTEditor-Demo/src/main/res/layout/rte_content.xml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <LinearLayout
diff --git a/RTEditor-Demo/src/main/res/layout/rte_demo_1.xml b/RTEditor-Demo/src/main/res/layout/rte_demo_1.xml
index e84d8cb8..2bb02796 100644
--- a/RTEditor-Demo/src/main/res/layout/rte_demo_1.xml
+++ b/RTEditor-Demo/src/main/res/layout/rte_demo_1.xml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <RelativeLayout
diff --git a/RTEditor-Demo/src/main/res/layout/rte_demo_2.xml b/RTEditor-Demo/src/main/res/layout/rte_demo_2.xml
index 678538ab..7292f493 100644
--- a/RTEditor-Demo/src/main/res/layout/rte_demo_2.xml
+++ b/RTEditor-Demo/src/main/res/layout/rte_demo_2.xml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <RelativeLayout
diff --git a/RTEditor-Demo/src/main/res/layout/rte_demo_with_fragment.xml b/RTEditor-Demo/src/main/res/layout/rte_demo_with_fragment.xml
index 3cbc95fc..d87a96e8 100644
--- a/RTEditor-Demo/src/main/res/layout/rte_demo_with_fragment.xml
+++ b/RTEditor-Demo/src/main/res/layout/rte_demo_with_fragment.xml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <FrameLayout
diff --git a/RTEditor-Demo/src/main/res/layout/rte_preview.xml b/RTEditor-Demo/src/main/res/layout/rte_preview.xml
new file mode 100644
index 00000000..b211dcd5
--- /dev/null
+++ b/RTEditor-Demo/src/main/res/layout/rte_preview.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <WebView
+        android:id="@+id/webView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/RTEditor-Demo/src/main/res/menu/main_menu.xml b/RTEditor-Demo/src/main/res/menu/main_menu.xml
index 12f7c13d..7572e61c 100644
--- a/RTEditor-Demo/src/main/res/menu/main_menu.xml
+++ b/RTEditor-Demo/src/main/res/menu/main_menu.xml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <menu
@@ -63,4 +65,11 @@
         android:title="@string/menu_activity"
         app:showAsAction="never"/>
 
+    <item
+        android:id="@+id/editor_preview"
+        android:alphabeticShortcut="p"
+        android:orderInCategory="7"
+        android:title="@string/menu_preview"
+        app:showAsAction="never"/>
+
 </menu>
diff --git a/RTEditor-Demo/src/main/res/values-v21/theme.xml b/RTEditor-Demo/src/main/res/values-v21/theme.xml
index 6c31e415..367f99c6 100644
--- a/RTEditor-Demo/src/main/res/values-v21/theme.xml
+++ b/RTEditor-Demo/src/main/res/values-v21/theme.xml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
diff --git a/RTEditor-Demo/src/main/res/values/attrs.xml b/RTEditor-Demo/src/main/res/values/attrs.xml
index b3ca58a8..0f3ac058 100644
--- a/RTEditor-Demo/src/main/res/values/attrs.xml
+++ b/RTEditor-Demo/src/main/res/values/attrs.xml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <resources>
diff --git a/RTEditor-Demo/src/main/res/values/colors.xml b/RTEditor-Demo/src/main/res/values/colors.xml
index 0f58f9fb..696eedb8 100644
--- a/RTEditor-Demo/src/main/res/values/colors.xml
+++ b/RTEditor-Demo/src/main/res/values/colors.xml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2016 Emanuel Moecklin
   ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
   ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
   ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
   -->
 <resources>
     <!-- Light Colors -->
diff --git a/RTEditor-Demo/src/main/res/values/strings.xml b/RTEditor-Demo/src/main/res/values/strings.xml
index 5f44d81c..5d0b913f 100644
--- a/RTEditor-Demo/src/main/res/values/strings.xml
+++ b/RTEditor-Demo/src/main/res/values/strings.xml
@@ -1,17 +1,19 @@
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <resources>
@@ -32,6 +34,7 @@
     <string name="menu_split_toolbar">Split toolbar</string>
     <string name="menu_fragment">Use Fragment</string>
     <string name="menu_activity">Use Activity</string>
+    <string name="menu_preview">Preview in WebView</string>
 
     <string name="save_as">Save as…</string>
     <string name="save_as_success">Text saved as %s</string>
diff --git a/RTEditor-Demo/src/main/res/values/theme.xml b/RTEditor-Demo/src/main/res/values/theme.xml
index 0e38baff..0267bdbb 100644
--- a/RTEditor-Demo/src/main/res/values/theme.xml
+++ b/RTEditor-Demo/src/main/res/values/theme.xml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
diff --git a/RTEditor-Toolbar/build.gradle b/RTEditor-Toolbar/build.gradle
index 8d3113d7..64269f4d 100644
--- a/RTEditor-Toolbar/build.gradle
+++ b/RTEditor-Toolbar/build.gradle
@@ -17,12 +17,12 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 24
-    buildToolsVersion '24.0.2'
+    compileSdkVersion 25
+    buildToolsVersion '25.0.0'
 
     defaultConfig {
         minSdkVersion 14
-        targetSdkVersion 24
+        targetSdkVersion 25
     }
 
     buildTypes {
diff --git a/RTEditor-Toolbar/src/main/java/com/onegravity/rteditor/toolbar/HorizontalRTToolbar.java b/RTEditor-Toolbar/src/main/java/com/onegravity/rteditor/toolbar/HorizontalRTToolbar.java
index e3d984a8..db294cfc 100644
--- a/RTEditor-Toolbar/src/main/java/com/onegravity/rteditor/toolbar/HorizontalRTToolbar.java
+++ b/RTEditor-Toolbar/src/main/java/com/onegravity/rteditor/toolbar/HorizontalRTToolbar.java
@@ -23,6 +23,7 @@
 import android.graphics.Color;
 import android.text.Layout;
 import android.util.AttributeSet;
+import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
@@ -152,8 +153,10 @@ protected void onFinishInflate() {
 
         initImageButton(R.id.toolbar_inc_indent);
         initImageButton(R.id.toolbar_dec_indent);
+        initImageButton(R.id.toolbar_barcode);
         initImageButton(R.id.toolbar_link);
         initImageButton(R.id.toolbar_image);
+        initImageButton(R.id.toolbar_gif);
         initImageButton(R.id.toolbar_undo);
         initImageButton(R.id.toolbar_redo);
         initImageButton(R.id.toolbar_clear);
@@ -422,8 +425,7 @@ public void setFont(RTTypeface typeface) {
                         break;
                     }
                 }
-            }
-            else {
+            } else {
                 mFontAdapter.setSelectedItem(0);
                 mFont.setSelection(0);
             }
@@ -533,6 +535,7 @@ public void onColorChanged(int color) {
                             mListener.onEffectSelected(Effects.FONTCOLOR, color);
                         }
                     }
+
                     @Override
                     public void onDialogClosing() {
                         mPickerId = -1;
@@ -561,6 +564,7 @@ public void onColorChanged(int color) {
                             mListener.onEffectSelected(Effects.BGCOLOR, color);
                         }
                     }
+
                     public void onDialogClosing() {
                         mPickerId = -1;
                     }
@@ -582,109 +586,77 @@ public void onClick(View v) {
             if (id == R.id.toolbar_bold) {
                 mBold.setChecked(!mBold.isChecked());
                 mListener.onEffectSelected(Effects.BOLD, mBold.isChecked());
-            }
-
-            else if (id == R.id.toolbar_italic) {
+            } else if (id == R.id.toolbar_italic) {
                 mItalic.setChecked(!mItalic.isChecked());
                 mListener.onEffectSelected(Effects.ITALIC, mItalic.isChecked());
-            }
-
-            else if (id == R.id.toolbar_underline) {
+            } else if (id == R.id.toolbar_underline) {
                 mUnderline.setChecked(!mUnderline.isChecked());
                 mListener.onEffectSelected(Effects.UNDERLINE, mUnderline.isChecked());
-            }
-
-            else if (id == R.id.toolbar_strikethrough) {
+            } else if (id == R.id.toolbar_strikethrough) {
                 mStrikethrough.setChecked(!mStrikethrough.isChecked());
                 mListener.onEffectSelected(Effects.STRIKETHROUGH, mStrikethrough.isChecked());
-            }
-
-            else if (id == R.id.toolbar_superscript) {
+            } else if (id == R.id.toolbar_superscript) {
                 mSuperscript.setChecked(!mSuperscript.isChecked());
                 mListener.onEffectSelected(Effects.SUPERSCRIPT, mSuperscript.isChecked());
                 if (mSuperscript.isChecked() && mSubscript != null) {
                     mSubscript.setChecked(false);
                     mListener.onEffectSelected(Effects.SUBSCRIPT, mSubscript.isChecked());
                 }
-            }
-
-            else if (id == R.id.toolbar_subscript) {
+            } else if (id == R.id.toolbar_subscript) {
                 mSubscript.setChecked(!mSubscript.isChecked());
                 mListener.onEffectSelected(Effects.SUBSCRIPT, mSubscript.isChecked());
                 if (mSubscript.isChecked() && mSuperscript != null) {
                     mSuperscript.setChecked(false);
                     mListener.onEffectSelected(Effects.SUPERSCRIPT, mSuperscript.isChecked());
                 }
-            }
-
-            else if (id == R.id.toolbar_align_left) {
+            } else if (id == R.id.toolbar_align_left) {
                 if (mAlignLeft != null) mAlignLeft.setChecked(true);
                 if (mAlignCenter != null) mAlignCenter.setChecked(false);
                 if (mAlignRight != null) mAlignRight.setChecked(false);
                 mListener.onEffectSelected(Effects.ALIGNMENT, Layout.Alignment.ALIGN_NORMAL);
-            }
-
-            else if (id == R.id.toolbar_align_center) {
+            } else if (id == R.id.toolbar_align_center) {
                 if (mAlignLeft != null) mAlignLeft.setChecked(false);
                 if (mAlignCenter != null) mAlignCenter.setChecked(true);
                 if (mAlignRight != null) mAlignRight.setChecked(false);
                 mListener.onEffectSelected(Effects.ALIGNMENT, Layout.Alignment.ALIGN_CENTER);
-            }
-
-            else if (id == R.id.toolbar_align_right) {
+            } else if (id == R.id.toolbar_align_right) {
                 if (mAlignLeft != null) mAlignLeft.setChecked(false);
                 if (mAlignCenter != null) mAlignCenter.setChecked(false);
                 if (mAlignRight != null) mAlignRight.setChecked(true);
                 mListener.onEffectSelected(Effects.ALIGNMENT, Layout.Alignment.ALIGN_OPPOSITE);
-            }
-
-            else if (id == R.id.toolbar_bullet) {
+            } else if (id == R.id.toolbar_bullet) {
                 mBullet.setChecked(!mBullet.isChecked());
                 boolean isChecked = mBullet.isChecked();
                 mListener.onEffectSelected(Effects.BULLET, isChecked);
                 if (isChecked && mNumber != null) {
                     mNumber.setChecked(false);    // numbers will be removed by the NumberEffect.applyToSelection
                 }
-            }
-
-            else if (id == R.id.toolbar_number) {
+            } else if (id == R.id.toolbar_number) {
                 mNumber.setChecked(!mNumber.isChecked());
                 boolean isChecked = mNumber.isChecked();
                 mListener.onEffectSelected(Effects.NUMBER, isChecked);
                 if (isChecked && mBullet != null) {
                     mBullet.setChecked(false);    // bullets will be removed by the BulletEffect.applyToSelection
                 }
-            }
-
-            else if (id == R.id.toolbar_inc_indent) {
+            } else if (id == R.id.toolbar_inc_indent) {
                 mListener.onEffectSelected(Effects.INDENTATION, Helper.getLeadingMarging());
-            }
-
-            else if (id == R.id.toolbar_dec_indent) {
+            } else if (id == R.id.toolbar_dec_indent) {
                 mListener.onEffectSelected(Effects.INDENTATION, -Helper.getLeadingMarging());
-            }
-
-            else if (id == R.id.toolbar_link) {
+            } else if (id == R.id.toolbar_link) {
                 mListener.onCreateLink();
-            }
-
-            else if (id == R.id.toolbar_image) {
+            } else if (id == R.id.toolbar_barcode) {
+                mListener.onInsertBarcode();
+            } else if (id == R.id.toolbar_image) {
                 mListener.onPickImage();
-            }
-
-            else if (id == R.id.toolbar_image_capture) {
+            } else if (id == R.id.toolbar_gif) {
+                mListener.onPickGif();
+            } else if (id == R.id.toolbar_image_capture) {
                 mListener.onCaptureImage();
-            }
-
-            else if (id == R.id.toolbar_clear) {
+            } else if (id == R.id.toolbar_clear) {
                 mListener.onClearFormatting();
-            }
-
-            else if (id == R.id.toolbar_undo) {
+            } else if (id == R.id.toolbar_undo) {
                 mListener.onUndo();
-            }
-
-            else if (id == R.id.toolbar_redo) {
+            } else if (id == R.id.toolbar_redo) {
                 mListener.onRedo();
             }
         }
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_align_center_dark.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_align_center_dark.png
deleted file mode 100644
index 411c789e..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_align_center_dark.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_align_center_dark_checked.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_align_center_dark_checked.png
deleted file mode 100644
index 60389443..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_align_center_dark_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_align_center_dark_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_align_center_dark_pressed.png
deleted file mode 100644
index 29a46e0b..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_align_center_dark_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_align_center_light.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_align_center_light.png
deleted file mode 100644
index 995b6b9a..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_align_center_light.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_align_center_light_checked.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_align_center_light_checked.png
deleted file mode 100644
index 60389443..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_align_center_light_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_align_center_light_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_align_center_light_pressed.png
deleted file mode 100644
index 29a46e0b..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_align_center_light_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_align_left_dark.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_align_left_dark.png
deleted file mode 100644
index 048312e9..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_align_left_dark.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_align_left_dark_checked.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_align_left_dark_checked.png
deleted file mode 100644
index e3d49044..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_align_left_dark_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_align_left_dark_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_align_left_dark_pressed.png
deleted file mode 100644
index bdfe5abc..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_align_left_dark_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_align_left_light.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_align_left_light.png
deleted file mode 100644
index a25b5e3b..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_align_left_light.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_align_left_light_checked.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_align_left_light_checked.png
deleted file mode 100644
index e3d49044..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_align_left_light_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_align_left_light_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_align_left_light_pressed.png
deleted file mode 100644
index bdfe5abc..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_align_left_light_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_align_right_dark.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_align_right_dark.png
deleted file mode 100644
index 77e40284..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_align_right_dark.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_align_right_dark_checked.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_align_right_dark_checked.png
deleted file mode 100644
index 50b8cd81..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_align_right_dark_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_align_right_dark_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_align_right_dark_pressed.png
deleted file mode 100644
index f1c465b2..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_align_right_dark_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_align_right_light.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_align_right_light.png
deleted file mode 100644
index dca6681f..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_align_right_light.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_align_right_light_checked.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_align_right_light_checked.png
deleted file mode 100644
index 50b8cd81..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_align_right_light_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_align_right_light_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_align_right_light_pressed.png
deleted file mode 100644
index f1c465b2..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_align_right_light_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_bgcolor_dark.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_bgcolor_dark.png
deleted file mode 100644
index 781553cd..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_bgcolor_dark.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_bgcolor_dark_checked.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_bgcolor_dark_checked.png
deleted file mode 100644
index e4391d10..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_bgcolor_dark_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_bgcolor_dark_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_bgcolor_dark_pressed.png
deleted file mode 100644
index c564cac4..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_bgcolor_dark_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_bgcolor_light.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_bgcolor_light.png
deleted file mode 100644
index 42e1f3a3..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_bgcolor_light.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_bgcolor_light_checked.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_bgcolor_light_checked.png
deleted file mode 100644
index e4391d10..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_bgcolor_light_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_bgcolor_light_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_bgcolor_light_pressed.png
deleted file mode 100644
index c564cac4..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_bgcolor_light_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_bold_dark.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_bold_dark.png
deleted file mode 100644
index 006385e0..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_bold_dark.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_bold_dark_checked.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_bold_dark_checked.png
deleted file mode 100644
index 3a68b2ef..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_bold_dark_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_bold_dark_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_bold_dark_pressed.png
deleted file mode 100644
index 38fa7c93..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_bold_dark_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_bold_light.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_bold_light.png
deleted file mode 100644
index 916b7ae8..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_bold_light.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_bold_light_checked.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_bold_light_checked.png
deleted file mode 100644
index 3a68b2ef..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_bold_light_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_bold_light_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_bold_light_pressed.png
deleted file mode 100644
index 38fa7c93..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_bold_light_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_bullet_dark.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_bullet_dark.png
deleted file mode 100644
index 61a33f00..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_bullet_dark.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_bullet_dark_checked.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_bullet_dark_checked.png
deleted file mode 100644
index 4e0e6129..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_bullet_dark_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_bullet_dark_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_bullet_dark_pressed.png
deleted file mode 100644
index 9255fdd7..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_bullet_dark_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_bullet_light.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_bullet_light.png
deleted file mode 100644
index 07d622d9..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_bullet_light.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_bullet_light_checked.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_bullet_light_checked.png
deleted file mode 100644
index 4e0e6129..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_bullet_light_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_bullet_light_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_bullet_light_pressed.png
deleted file mode 100644
index 9255fdd7..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_bullet_light_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_capture_dark.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_capture_dark.png
deleted file mode 100644
index b0000b0a..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_capture_dark.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_capture_dark_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_capture_dark_pressed.png
deleted file mode 100644
index b5456bbd..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_capture_dark_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_capture_light.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_capture_light.png
deleted file mode 100644
index 1dd93e84..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_capture_light.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_capture_light_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_capture_light_pressed.png
deleted file mode 100644
index b5456bbd..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_capture_light_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_clear_dark.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_clear_dark.png
deleted file mode 100644
index 7890a4ee..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_clear_dark.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_clear_dark_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_clear_dark_pressed.png
deleted file mode 100644
index e05261e1..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_clear_dark_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_clear_light.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_clear_light.png
deleted file mode 100644
index 78298748..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_clear_light.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_clear_light_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_clear_light_pressed.png
deleted file mode 100644
index f16f8efb..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_clear_light_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_dec_indent_dark.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_dec_indent_dark.png
deleted file mode 100644
index d4802686..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_dec_indent_dark.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_dec_indent_dark_checked.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_dec_indent_dark_checked.png
deleted file mode 100644
index 36a52b05..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_dec_indent_dark_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_dec_indent_dark_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_dec_indent_dark_pressed.png
deleted file mode 100644
index 5a517c32..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_dec_indent_dark_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_dec_indent_light.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_dec_indent_light.png
deleted file mode 100644
index 83d87291..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_dec_indent_light.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_dec_indent_light_checked.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_dec_indent_light_checked.png
deleted file mode 100644
index 36a52b05..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_dec_indent_light_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_dec_indent_light_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_dec_indent_light_pressed.png
deleted file mode 100644
index 5a517c32..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_dec_indent_light_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_fontcolor_dark.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_fontcolor_dark.png
deleted file mode 100644
index 6c113554..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_fontcolor_dark.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_fontcolor_dark_checked.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_fontcolor_dark_checked.png
deleted file mode 100644
index 2bd115b9..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_fontcolor_dark_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_fontcolor_dark_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_fontcolor_dark_pressed.png
deleted file mode 100644
index 400cbf83..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_fontcolor_dark_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_fontcolor_light.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_fontcolor_light.png
deleted file mode 100644
index 20dcf2c2..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_fontcolor_light.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_fontcolor_light_checked.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_fontcolor_light_checked.png
deleted file mode 100644
index 2bd115b9..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_fontcolor_light_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_fontcolor_light_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_fontcolor_light_pressed.png
deleted file mode 100644
index 400cbf83..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_fontcolor_light_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_fontsize_dark.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_fontsize_dark.png
deleted file mode 100644
index 23fec90a..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_fontsize_dark.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_fontsize_dark_checked.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_fontsize_dark_checked.png
deleted file mode 100644
index 9c55310f..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_fontsize_dark_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_fontsize_dark_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_fontsize_dark_pressed.png
deleted file mode 100644
index 94fcd68f..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_fontsize_dark_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_fontsize_light.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_fontsize_light.png
deleted file mode 100644
index cff18dc2..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_fontsize_light.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_fontsize_light_checked.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_fontsize_light_checked.png
deleted file mode 100644
index 9c55310f..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_fontsize_light_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_fontsize_light_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_fontsize_light_pressed.png
deleted file mode 100644
index 94fcd68f..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_fontsize_light_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_image_dark.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_image_dark.png
deleted file mode 100644
index e1f50554..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_image_dark.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_image_dark_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_image_dark_pressed.png
deleted file mode 100644
index 80155550..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_image_dark_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_image_light.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_image_light.png
deleted file mode 100644
index 34871a42..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_image_light.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_image_light_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_image_light_pressed.png
deleted file mode 100644
index 80155550..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_image_light_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_inc_indent_dark.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_inc_indent_dark.png
deleted file mode 100644
index fdb0d580..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_inc_indent_dark.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_inc_indent_dark_checked.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_inc_indent_dark_checked.png
deleted file mode 100644
index cd445833..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_inc_indent_dark_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_inc_indent_dark_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_inc_indent_dark_pressed.png
deleted file mode 100644
index fc99cf7a..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_inc_indent_dark_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_inc_indent_light.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_inc_indent_light.png
deleted file mode 100644
index 944fa6e9..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_inc_indent_light.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_inc_indent_light_checked.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_inc_indent_light_checked.png
deleted file mode 100644
index cd445833..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_inc_indent_light_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_inc_indent_light_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_inc_indent_light_pressed.png
deleted file mode 100644
index fc99cf7a..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_inc_indent_light_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_italic_dark.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_italic_dark.png
deleted file mode 100644
index 7087d0d8..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_italic_dark.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_italic_dark_checked.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_italic_dark_checked.png
deleted file mode 100644
index 82be43bd..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_italic_dark_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_italic_dark_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_italic_dark_pressed.png
deleted file mode 100644
index 1e38a428..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_italic_dark_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_italic_light.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_italic_light.png
deleted file mode 100644
index 054ebc0e..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_italic_light.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_italic_light_checked.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_italic_light_checked.png
deleted file mode 100644
index 82be43bd..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_italic_light_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_italic_light_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_italic_light_pressed.png
deleted file mode 100644
index 1e38a428..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_italic_light_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_link_dark.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_link_dark.png
deleted file mode 100644
index 658edb95..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_link_dark.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_link_dark_checked.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_link_dark_checked.png
deleted file mode 100644
index 395d4a75..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_link_dark_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_link_dark_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_link_dark_pressed.png
deleted file mode 100644
index 8e39659d..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_link_dark_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_link_light.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_link_light.png
deleted file mode 100644
index 5ab59a40..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_link_light.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_link_light_checked.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_link_light_checked.png
deleted file mode 100644
index 395d4a75..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_link_light_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_link_light_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_link_light_pressed.png
deleted file mode 100644
index 8e39659d..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_link_light_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_number_dark.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_number_dark.png
deleted file mode 100644
index 5fc42f2f..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_number_dark.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_number_dark_checked.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_number_dark_checked.png
deleted file mode 100644
index e38096df..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_number_dark_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_number_dark_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_number_dark_pressed.png
deleted file mode 100644
index cfccadc5..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_number_dark_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_number_light.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_number_light.png
deleted file mode 100644
index e67f9f9c..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_number_light.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_number_light_checked.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_number_light_checked.png
deleted file mode 100644
index 1553b89d..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_number_light_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_number_light_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_number_light_pressed.png
deleted file mode 100644
index 0af86852..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_number_light_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_redo_dark.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_redo_dark.png
deleted file mode 100644
index c70a0b73..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_redo_dark.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_redo_dark_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_redo_dark_pressed.png
deleted file mode 100644
index 5ddc22d5..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_redo_dark_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_redo_light.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_redo_light.png
deleted file mode 100644
index 9f84d2a9..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_redo_light.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_redo_light_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_redo_light_pressed.png
deleted file mode 100644
index 95736544..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_redo_light_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_strikethrough_dark.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_strikethrough_dark.png
deleted file mode 100644
index 665c9618..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_strikethrough_dark.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_strikethrough_dark_checked.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_strikethrough_dark_checked.png
deleted file mode 100644
index aa95fe34..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_strikethrough_dark_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_strikethrough_dark_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_strikethrough_dark_pressed.png
deleted file mode 100644
index 9213f4c7..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_strikethrough_dark_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_strikethrough_light.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_strikethrough_light.png
deleted file mode 100644
index c0f84713..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_strikethrough_light.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_strikethrough_light_checked.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_strikethrough_light_checked.png
deleted file mode 100644
index aa95fe34..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_strikethrough_light_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_strikethrough_light_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_strikethrough_light_pressed.png
deleted file mode 100644
index 9213f4c7..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_strikethrough_light_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_subscript_dark.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_subscript_dark.png
deleted file mode 100644
index 4190b6b8..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_subscript_dark.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_subscript_dark_checked.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_subscript_dark_checked.png
deleted file mode 100644
index 9fb261ec..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_subscript_dark_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_subscript_dark_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_subscript_dark_pressed.png
deleted file mode 100644
index 99bd9831..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_subscript_dark_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_subscript_light.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_subscript_light.png
deleted file mode 100644
index 04abf8c7..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_subscript_light.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_subscript_light_checked.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_subscript_light_checked.png
deleted file mode 100644
index 9fb261ec..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_subscript_light_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_subscript_light_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_subscript_light_pressed.png
deleted file mode 100644
index 99bd9831..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_subscript_light_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_superscript_dark.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_superscript_dark.png
deleted file mode 100644
index c1e83f3e..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_superscript_dark.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_superscript_dark_checked.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_superscript_dark_checked.png
deleted file mode 100644
index db6ee17d..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_superscript_dark_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_superscript_dark_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_superscript_dark_pressed.png
deleted file mode 100644
index 49ab08af..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_superscript_dark_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_superscript_light.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_superscript_light.png
deleted file mode 100644
index 4f025857..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_superscript_light.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_superscript_light_checked.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_superscript_light_checked.png
deleted file mode 100644
index db6ee17d..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_superscript_light_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_superscript_light_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_superscript_light_pressed.png
deleted file mode 100644
index 49ab08af..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_superscript_light_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_typeface_dark.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_typeface_dark.png
deleted file mode 100644
index e8d693ad..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_typeface_dark.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_typeface_dark_checked.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_typeface_dark_checked.png
deleted file mode 100644
index 5ea8598d..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_typeface_dark_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_typeface_dark_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_typeface_dark_pressed.png
deleted file mode 100644
index a55d6fce..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_typeface_dark_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_typeface_light.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_typeface_light.png
deleted file mode 100644
index 0ab653c4..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_typeface_light.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_typeface_light_checked.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_typeface_light_checked.png
deleted file mode 100644
index 5ea8598d..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_typeface_light_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_typeface_light_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_typeface_light_pressed.png
deleted file mode 100644
index a55d6fce..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_typeface_light_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_underline_dark.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_underline_dark.png
deleted file mode 100644
index e1f5759f..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_underline_dark.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_underline_dark_checked.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_underline_dark_checked.png
deleted file mode 100644
index bcccd2cc..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_underline_dark_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_underline_dark_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_underline_dark_pressed.png
deleted file mode 100644
index 29a98b6d..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_underline_dark_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_underline_light.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_underline_light.png
deleted file mode 100644
index 0416ebbc..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_underline_light.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_underline_light_checked.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_underline_light_checked.png
deleted file mode 100644
index bcccd2cc..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_underline_light_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_underline_light_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_underline_light_pressed.png
deleted file mode 100644
index 29a98b6d..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_underline_light_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_undo_dark.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_undo_dark.png
deleted file mode 100644
index c6edd3ce..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_undo_dark.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_undo_dark_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_undo_dark_pressed.png
deleted file mode 100644
index 86416eb5..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_undo_dark_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_undo_light.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_undo_light.png
deleted file mode 100644
index 30e36fff..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_undo_light.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_undo_light_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_undo_light_pressed.png
deleted file mode 100644
index bb009f67..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-hdpi/ic_toolbar_undo_light_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_align_center_dark.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_align_center_dark.png
deleted file mode 100644
index 6777045e..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_align_center_dark.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_align_center_dark_checked.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_align_center_dark_checked.png
deleted file mode 100644
index 0a11f166..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_align_center_dark_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_align_center_dark_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_align_center_dark_pressed.png
deleted file mode 100644
index 477413d9..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_align_center_dark_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_align_center_light.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_align_center_light.png
deleted file mode 100644
index 4217f3d0..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_align_center_light.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_align_center_light_checked.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_align_center_light_checked.png
deleted file mode 100644
index 0a11f166..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_align_center_light_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_align_center_light_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_align_center_light_pressed.png
deleted file mode 100644
index 477413d9..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_align_center_light_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_align_left_dark.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_align_left_dark.png
deleted file mode 100644
index 64c02035..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_align_left_dark.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_align_left_dark_checked.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_align_left_dark_checked.png
deleted file mode 100644
index ddaaac67..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_align_left_dark_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_align_left_dark_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_align_left_dark_pressed.png
deleted file mode 100644
index 5380dc0b..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_align_left_dark_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_align_left_light.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_align_left_light.png
deleted file mode 100644
index 0c2d483a..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_align_left_light.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_align_left_light_checked.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_align_left_light_checked.png
deleted file mode 100644
index ddaaac67..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_align_left_light_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_align_left_light_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_align_left_light_pressed.png
deleted file mode 100644
index 5380dc0b..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_align_left_light_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_align_right_dark.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_align_right_dark.png
deleted file mode 100644
index cb18714c..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_align_right_dark.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_align_right_dark_checked.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_align_right_dark_checked.png
deleted file mode 100644
index 40e8eff4..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_align_right_dark_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_align_right_dark_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_align_right_dark_pressed.png
deleted file mode 100644
index ed5b3615..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_align_right_dark_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_align_right_light.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_align_right_light.png
deleted file mode 100644
index cfc3b1fa..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_align_right_light.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_align_right_light_checked.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_align_right_light_checked.png
deleted file mode 100644
index 40e8eff4..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_align_right_light_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_align_right_light_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_align_right_light_pressed.png
deleted file mode 100644
index ed5b3615..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_align_right_light_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_bgcolor_dark.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_bgcolor_dark.png
deleted file mode 100644
index 40fd3b22..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_bgcolor_dark.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_bgcolor_dark_checked.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_bgcolor_dark_checked.png
deleted file mode 100644
index 3d582835..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_bgcolor_dark_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_bgcolor_dark_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_bgcolor_dark_pressed.png
deleted file mode 100644
index f651a7f0..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_bgcolor_dark_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_bgcolor_light.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_bgcolor_light.png
deleted file mode 100644
index bc9d9e4c..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_bgcolor_light.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_bgcolor_light_checked.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_bgcolor_light_checked.png
deleted file mode 100644
index 3d582835..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_bgcolor_light_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_bgcolor_light_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_bgcolor_light_pressed.png
deleted file mode 100644
index f651a7f0..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_bgcolor_light_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_bold_dark.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_bold_dark.png
deleted file mode 100644
index e0465b84..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_bold_dark.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_bold_dark_checked.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_bold_dark_checked.png
deleted file mode 100644
index bfed4bd0..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_bold_dark_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_bold_dark_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_bold_dark_pressed.png
deleted file mode 100644
index 4e5ec59d..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_bold_dark_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_bold_light.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_bold_light.png
deleted file mode 100644
index a620299a..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_bold_light.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_bold_light_checked.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_bold_light_checked.png
deleted file mode 100644
index 46ecd7de..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_bold_light_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_bold_light_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_bold_light_pressed.png
deleted file mode 100644
index 59c77403..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_bold_light_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_bullet_dark.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_bullet_dark.png
deleted file mode 100644
index 99888125..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_bullet_dark.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_bullet_dark_checked.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_bullet_dark_checked.png
deleted file mode 100644
index 584c83df..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_bullet_dark_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_bullet_dark_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_bullet_dark_pressed.png
deleted file mode 100644
index 76173ef1..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_bullet_dark_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_bullet_light.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_bullet_light.png
deleted file mode 100644
index 769dc2d4..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_bullet_light.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_bullet_light_checked.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_bullet_light_checked.png
deleted file mode 100644
index 584c83df..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_bullet_light_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_bullet_light_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_bullet_light_pressed.png
deleted file mode 100644
index 76173ef1..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_bullet_light_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_capture_dark.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_capture_dark.png
deleted file mode 100644
index 2b0bb066..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_capture_dark.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_capture_dark_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_capture_dark_pressed.png
deleted file mode 100644
index 33522aa4..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_capture_dark_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_capture_light.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_capture_light.png
deleted file mode 100644
index 3b796bb1..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_capture_light.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_capture_light_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_capture_light_pressed.png
deleted file mode 100644
index 33522aa4..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_capture_light_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_clear_dark.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_clear_dark.png
deleted file mode 100644
index ff9d6e5f..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_clear_dark.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_clear_dark_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_clear_dark_pressed.png
deleted file mode 100644
index 345315e5..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_clear_dark_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_clear_light.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_clear_light.png
deleted file mode 100644
index a634b75e..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_clear_light.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_clear_light_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_clear_light_pressed.png
deleted file mode 100644
index 33c465d4..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_clear_light_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_dec_indent_dark.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_dec_indent_dark.png
deleted file mode 100644
index 0cd4bfcf..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_dec_indent_dark.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_dec_indent_dark_checked.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_dec_indent_dark_checked.png
deleted file mode 100644
index a65c3566..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_dec_indent_dark_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_dec_indent_dark_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_dec_indent_dark_pressed.png
deleted file mode 100644
index 57b0102a..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_dec_indent_dark_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_dec_indent_light.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_dec_indent_light.png
deleted file mode 100644
index cd77207d..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_dec_indent_light.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_dec_indent_light_checked.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_dec_indent_light_checked.png
deleted file mode 100644
index a65c3566..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_dec_indent_light_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_dec_indent_light_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_dec_indent_light_pressed.png
deleted file mode 100644
index 57b0102a..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_dec_indent_light_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_fontcolor_dark.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_fontcolor_dark.png
deleted file mode 100644
index f86023c9..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_fontcolor_dark.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_fontcolor_dark_checked.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_fontcolor_dark_checked.png
deleted file mode 100644
index 5e57c194..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_fontcolor_dark_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_fontcolor_dark_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_fontcolor_dark_pressed.png
deleted file mode 100644
index da155e04..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_fontcolor_dark_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_fontcolor_light.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_fontcolor_light.png
deleted file mode 100644
index 63384710..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_fontcolor_light.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_fontcolor_light_checked.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_fontcolor_light_checked.png
deleted file mode 100644
index 5e57c194..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_fontcolor_light_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_fontcolor_light_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_fontcolor_light_pressed.png
deleted file mode 100644
index da155e04..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_fontcolor_light_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_fontsize_dark.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_fontsize_dark.png
deleted file mode 100644
index 7eae9e1b..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_fontsize_dark.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_fontsize_dark_checked.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_fontsize_dark_checked.png
deleted file mode 100644
index 486eae21..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_fontsize_dark_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_fontsize_dark_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_fontsize_dark_pressed.png
deleted file mode 100644
index 8cfbc3b2..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_fontsize_dark_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_fontsize_light.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_fontsize_light.png
deleted file mode 100644
index bb5fddd6..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_fontsize_light.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_fontsize_light_checked.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_fontsize_light_checked.png
deleted file mode 100644
index 486eae21..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_fontsize_light_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_fontsize_light_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_fontsize_light_pressed.png
deleted file mode 100644
index 8cfbc3b2..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_fontsize_light_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_image_dark.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_image_dark.png
deleted file mode 100644
index 5df3d9e4..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_image_dark.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_image_dark_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_image_dark_pressed.png
deleted file mode 100644
index 198e5668..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_image_dark_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_image_light.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_image_light.png
deleted file mode 100644
index 1dc9dcb6..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_image_light.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_image_light_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_image_light_pressed.png
deleted file mode 100644
index 198e5668..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_image_light_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_inc_indent_dark.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_inc_indent_dark.png
deleted file mode 100644
index 4f8f07b4..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_inc_indent_dark.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_inc_indent_dark_checked.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_inc_indent_dark_checked.png
deleted file mode 100644
index 4a89cdc0..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_inc_indent_dark_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_inc_indent_dark_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_inc_indent_dark_pressed.png
deleted file mode 100644
index 237789ee..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_inc_indent_dark_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_inc_indent_light.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_inc_indent_light.png
deleted file mode 100644
index 2828b0d7..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_inc_indent_light.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_inc_indent_light_checked.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_inc_indent_light_checked.png
deleted file mode 100644
index 4a89cdc0..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_inc_indent_light_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_inc_indent_light_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_inc_indent_light_pressed.png
deleted file mode 100644
index 237789ee..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_inc_indent_light_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_italic_dark.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_italic_dark.png
deleted file mode 100644
index d778a249..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_italic_dark.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_italic_dark_checked.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_italic_dark_checked.png
deleted file mode 100644
index 19a913d4..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_italic_dark_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_italic_dark_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_italic_dark_pressed.png
deleted file mode 100644
index 55b24588..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_italic_dark_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_italic_light.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_italic_light.png
deleted file mode 100644
index a258fe01..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_italic_light.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_italic_light_checked.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_italic_light_checked.png
deleted file mode 100644
index 19a913d4..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_italic_light_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_italic_light_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_italic_light_pressed.png
deleted file mode 100644
index 55b24588..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_italic_light_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_link_dark.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_link_dark.png
deleted file mode 100644
index af63e834..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_link_dark.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_link_dark_checked.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_link_dark_checked.png
deleted file mode 100644
index 8a4876c9..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_link_dark_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_link_dark_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_link_dark_pressed.png
deleted file mode 100644
index d4782f8f..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_link_dark_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_link_light.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_link_light.png
deleted file mode 100644
index 6bb2c1db..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_link_light.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_link_light_checked.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_link_light_checked.png
deleted file mode 100644
index bf43f00e..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_link_light_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_link_light_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_link_light_pressed.png
deleted file mode 100644
index 4180f2e3..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_link_light_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_number_dark.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_number_dark.png
deleted file mode 100644
index 693f2a80..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_number_dark.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_number_dark_checked.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_number_dark_checked.png
deleted file mode 100644
index 94b9305a..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_number_dark_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_number_dark_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_number_dark_pressed.png
deleted file mode 100644
index 04680aa8..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_number_dark_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_number_light.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_number_light.png
deleted file mode 100644
index 37ba5292..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_number_light.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_number_light_checked.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_number_light_checked.png
deleted file mode 100644
index 0ae61e4e..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_number_light_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_number_light_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_number_light_pressed.png
deleted file mode 100644
index f0bd095b..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_number_light_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_redo_dark.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_redo_dark.png
deleted file mode 100644
index 38ec3c27..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_redo_dark.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_redo_dark_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_redo_dark_pressed.png
deleted file mode 100644
index 174ab758..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_redo_dark_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_redo_light.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_redo_light.png
deleted file mode 100644
index bdb5f488..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_redo_light.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_redo_light_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_redo_light_pressed.png
deleted file mode 100644
index 1a8fe7e4..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_redo_light_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_strikethrough_dark.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_strikethrough_dark.png
deleted file mode 100644
index e36dea52..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_strikethrough_dark.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_strikethrough_dark_checked.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_strikethrough_dark_checked.png
deleted file mode 100644
index 6da9001d..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_strikethrough_dark_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_strikethrough_dark_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_strikethrough_dark_pressed.png
deleted file mode 100644
index 34935fe4..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_strikethrough_dark_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_strikethrough_light.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_strikethrough_light.png
deleted file mode 100644
index 70771732..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_strikethrough_light.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_strikethrough_light_checked.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_strikethrough_light_checked.png
deleted file mode 100644
index 2d1e2972..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_strikethrough_light_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_strikethrough_light_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_strikethrough_light_pressed.png
deleted file mode 100644
index 43e5b764..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_strikethrough_light_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_subscript_dark.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_subscript_dark.png
deleted file mode 100644
index 0737376a..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_subscript_dark.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_subscript_dark_checked.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_subscript_dark_checked.png
deleted file mode 100644
index 162161b7..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_subscript_dark_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_subscript_dark_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_subscript_dark_pressed.png
deleted file mode 100644
index 5d0c0e91..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_subscript_dark_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_subscript_light.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_subscript_light.png
deleted file mode 100644
index a23a6494..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_subscript_light.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_subscript_light_checked.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_subscript_light_checked.png
deleted file mode 100644
index 162161b7..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_subscript_light_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_subscript_light_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_subscript_light_pressed.png
deleted file mode 100644
index 5d0c0e91..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_subscript_light_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_superscript_dark.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_superscript_dark.png
deleted file mode 100644
index 88452c1b..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_superscript_dark.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_superscript_dark_checked.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_superscript_dark_checked.png
deleted file mode 100644
index 71219ceb..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_superscript_dark_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_superscript_dark_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_superscript_dark_pressed.png
deleted file mode 100644
index e2079afe..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_superscript_dark_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_superscript_light.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_superscript_light.png
deleted file mode 100644
index b75f8bfb..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_superscript_light.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_superscript_light_checked.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_superscript_light_checked.png
deleted file mode 100644
index 71219ceb..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_superscript_light_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_superscript_light_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_superscript_light_pressed.png
deleted file mode 100644
index e2079afe..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_superscript_light_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_typeface_dark.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_typeface_dark.png
deleted file mode 100644
index a4e62b62..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_typeface_dark.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_typeface_dark_checked.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_typeface_dark_checked.png
deleted file mode 100644
index 6e613d37..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_typeface_dark_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_typeface_dark_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_typeface_dark_pressed.png
deleted file mode 100644
index 00d15f6d..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_typeface_dark_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_typeface_light.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_typeface_light.png
deleted file mode 100644
index 48dce855..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_typeface_light.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_typeface_light_checked.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_typeface_light_checked.png
deleted file mode 100644
index 6e613d37..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_typeface_light_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_typeface_light_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_typeface_light_pressed.png
deleted file mode 100644
index 00d15f6d..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_typeface_light_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_underline_dark.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_underline_dark.png
deleted file mode 100644
index f644ab52..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_underline_dark.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_underline_dark_checked.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_underline_dark_checked.png
deleted file mode 100644
index 4f6c9ac2..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_underline_dark_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_underline_dark_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_underline_dark_pressed.png
deleted file mode 100644
index ee458581..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_underline_dark_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_underline_light.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_underline_light.png
deleted file mode 100644
index f5b3e3a0..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_underline_light.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_underline_light_checked.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_underline_light_checked.png
deleted file mode 100644
index 7509a25c..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_underline_light_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_underline_light_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_underline_light_pressed.png
deleted file mode 100644
index 28557421..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_underline_light_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_undo_dark.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_undo_dark.png
deleted file mode 100644
index 6a26d623..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_undo_dark.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_undo_dark_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_undo_dark_pressed.png
deleted file mode 100644
index 493ed647..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_undo_dark_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_undo_light.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_undo_light.png
deleted file mode 100644
index 60700b3e..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_undo_light.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_undo_light_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_undo_light_pressed.png
deleted file mode 100644
index 27b48d92..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-ldpi/ic_toolbar_undo_light_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_align_center_dark.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_align_center_dark.png
deleted file mode 100644
index 391003d3..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_align_center_dark.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_align_center_dark_checked.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_align_center_dark_checked.png
deleted file mode 100644
index fdca8168..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_align_center_dark_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_align_center_dark_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_align_center_dark_pressed.png
deleted file mode 100644
index 3dadabbb..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_align_center_dark_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_align_center_light.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_align_center_light.png
deleted file mode 100644
index 18795d80..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_align_center_light.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_align_center_light_checked.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_align_center_light_checked.png
deleted file mode 100644
index fdca8168..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_align_center_light_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_align_center_light_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_align_center_light_pressed.png
deleted file mode 100644
index 3dadabbb..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_align_center_light_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_align_left_dark.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_align_left_dark.png
deleted file mode 100644
index b6e279a8..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_align_left_dark.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_align_left_dark_checked.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_align_left_dark_checked.png
deleted file mode 100644
index eff111cd..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_align_left_dark_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_align_left_dark_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_align_left_dark_pressed.png
deleted file mode 100644
index d77492f2..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_align_left_dark_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_align_left_light.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_align_left_light.png
deleted file mode 100644
index 7b81f0f0..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_align_left_light.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_align_left_light_checked.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_align_left_light_checked.png
deleted file mode 100644
index eff111cd..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_align_left_light_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_align_left_light_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_align_left_light_pressed.png
deleted file mode 100644
index 8512cff5..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_align_left_light_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_align_right_dark.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_align_right_dark.png
deleted file mode 100644
index 4c2e36bc..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_align_right_dark.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_align_right_dark_checked.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_align_right_dark_checked.png
deleted file mode 100644
index e0b1d4c4..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_align_right_dark_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_align_right_dark_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_align_right_dark_pressed.png
deleted file mode 100644
index c2866723..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_align_right_dark_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_align_right_light.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_align_right_light.png
deleted file mode 100644
index 76b23770..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_align_right_light.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_align_right_light_checked.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_align_right_light_checked.png
deleted file mode 100644
index e0b1d4c4..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_align_right_light_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_align_right_light_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_align_right_light_pressed.png
deleted file mode 100644
index c2866723..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_align_right_light_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_bgcolor_dark.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_bgcolor_dark.png
deleted file mode 100644
index eb77dadc..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_bgcolor_dark.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_bgcolor_dark_checked.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_bgcolor_dark_checked.png
deleted file mode 100644
index 4573fe26..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_bgcolor_dark_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_bgcolor_dark_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_bgcolor_dark_pressed.png
deleted file mode 100644
index 65c152c5..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_bgcolor_dark_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_bgcolor_light.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_bgcolor_light.png
deleted file mode 100644
index 93dce496..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_bgcolor_light.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_bgcolor_light_checked.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_bgcolor_light_checked.png
deleted file mode 100644
index 4573fe26..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_bgcolor_light_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_bgcolor_light_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_bgcolor_light_pressed.png
deleted file mode 100644
index 65c152c5..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_bgcolor_light_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_bold_dark.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_bold_dark.png
deleted file mode 100644
index 5b340bdf..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_bold_dark.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_bold_dark_checked.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_bold_dark_checked.png
deleted file mode 100644
index 19f53e0f..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_bold_dark_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_bold_dark_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_bold_dark_pressed.png
deleted file mode 100644
index 9ebc2ead..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_bold_dark_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_bold_light.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_bold_light.png
deleted file mode 100644
index 444d029b..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_bold_light.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_bold_light_checked.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_bold_light_checked.png
deleted file mode 100644
index 19f53e0f..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_bold_light_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_bold_light_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_bold_light_pressed.png
deleted file mode 100644
index 9ebc2ead..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_bold_light_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_bullet_dark.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_bullet_dark.png
deleted file mode 100644
index f72dc4a5..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_bullet_dark.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_bullet_dark_checked.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_bullet_dark_checked.png
deleted file mode 100644
index 518df2ec..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_bullet_dark_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_bullet_dark_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_bullet_dark_pressed.png
deleted file mode 100644
index 2de920b4..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_bullet_dark_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_bullet_light.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_bullet_light.png
deleted file mode 100644
index 3ad23ffe..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_bullet_light.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_bullet_light_checked.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_bullet_light_checked.png
deleted file mode 100644
index 518df2ec..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_bullet_light_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_bullet_light_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_bullet_light_pressed.png
deleted file mode 100644
index 2de920b4..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_bullet_light_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_capture_dark.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_capture_dark.png
deleted file mode 100644
index 08901736..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_capture_dark.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_capture_dark_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_capture_dark_pressed.png
deleted file mode 100644
index 729a7c69..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_capture_dark_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_capture_light.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_capture_light.png
deleted file mode 100644
index 7f4d0ecb..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_capture_light.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_capture_light_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_capture_light_pressed.png
deleted file mode 100644
index 729a7c69..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_capture_light_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_clear_dark.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_clear_dark.png
deleted file mode 100644
index 5b6187dd..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_clear_dark.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_clear_dark_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_clear_dark_pressed.png
deleted file mode 100644
index 9a501241..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_clear_dark_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_clear_light.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_clear_light.png
deleted file mode 100644
index 47b03e20..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_clear_light.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_clear_light_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_clear_light_pressed.png
deleted file mode 100644
index 40431376..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_clear_light_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_dec_indent_dark.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_dec_indent_dark.png
deleted file mode 100644
index 26672c46..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_dec_indent_dark.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_dec_indent_dark_checked.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_dec_indent_dark_checked.png
deleted file mode 100644
index 00d9beae..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_dec_indent_dark_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_dec_indent_dark_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_dec_indent_dark_pressed.png
deleted file mode 100644
index 1c70046f..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_dec_indent_dark_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_dec_indent_light.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_dec_indent_light.png
deleted file mode 100644
index 704fd31a..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_dec_indent_light.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_dec_indent_light_checked.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_dec_indent_light_checked.png
deleted file mode 100644
index 00d9beae..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_dec_indent_light_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_dec_indent_light_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_dec_indent_light_pressed.png
deleted file mode 100644
index 1c70046f..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_dec_indent_light_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_fontcolor_dark.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_fontcolor_dark.png
deleted file mode 100644
index ede3b0c0..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_fontcolor_dark.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_fontcolor_dark_checked.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_fontcolor_dark_checked.png
deleted file mode 100644
index db6ceea4..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_fontcolor_dark_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_fontcolor_dark_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_fontcolor_dark_pressed.png
deleted file mode 100644
index 9a80a68c..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_fontcolor_dark_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_fontcolor_light.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_fontcolor_light.png
deleted file mode 100644
index d5b452b0..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_fontcolor_light.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_fontcolor_light_checked.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_fontcolor_light_checked.png
deleted file mode 100644
index db6ceea4..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_fontcolor_light_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_fontcolor_light_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_fontcolor_light_pressed.png
deleted file mode 100644
index 9a80a68c..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_fontcolor_light_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_fontsize_dark.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_fontsize_dark.png
deleted file mode 100644
index 8fe0801b..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_fontsize_dark.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_fontsize_dark_checked.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_fontsize_dark_checked.png
deleted file mode 100644
index 4c0854fb..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_fontsize_dark_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_fontsize_dark_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_fontsize_dark_pressed.png
deleted file mode 100644
index cf2d1e05..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_fontsize_dark_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_fontsize_light.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_fontsize_light.png
deleted file mode 100644
index edbc0a27..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_fontsize_light.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_fontsize_light_checked.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_fontsize_light_checked.png
deleted file mode 100644
index 4c0854fb..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_fontsize_light_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_fontsize_light_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_fontsize_light_pressed.png
deleted file mode 100644
index cf2d1e05..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_fontsize_light_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_image_dark.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_image_dark.png
deleted file mode 100644
index ce2d6225..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_image_dark.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_image_dark_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_image_dark_pressed.png
deleted file mode 100644
index 5873255b..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_image_dark_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_image_light.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_image_light.png
deleted file mode 100644
index 79cfff77..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_image_light.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_image_light_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_image_light_pressed.png
deleted file mode 100644
index 5873255b..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_image_light_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_inc_indent_dark.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_inc_indent_dark.png
deleted file mode 100644
index 28b16b98..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_inc_indent_dark.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_inc_indent_dark_checked.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_inc_indent_dark_checked.png
deleted file mode 100644
index d47802e1..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_inc_indent_dark_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_inc_indent_dark_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_inc_indent_dark_pressed.png
deleted file mode 100644
index 5ec350d0..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_inc_indent_dark_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_inc_indent_light.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_inc_indent_light.png
deleted file mode 100644
index c6060da2..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_inc_indent_light.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_inc_indent_light_checked.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_inc_indent_light_checked.png
deleted file mode 100644
index d47802e1..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_inc_indent_light_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_inc_indent_light_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_inc_indent_light_pressed.png
deleted file mode 100644
index 5ec350d0..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_inc_indent_light_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_italic_dark.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_italic_dark.png
deleted file mode 100644
index c28f8941..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_italic_dark.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_italic_dark_checked.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_italic_dark_checked.png
deleted file mode 100644
index e092536f..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_italic_dark_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_italic_dark_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_italic_dark_pressed.png
deleted file mode 100644
index 44e06711..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_italic_dark_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_italic_light.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_italic_light.png
deleted file mode 100644
index 73abcf1f..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_italic_light.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_italic_light_checked.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_italic_light_checked.png
deleted file mode 100644
index e092536f..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_italic_light_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_italic_light_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_italic_light_pressed.png
deleted file mode 100644
index 44e06711..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_italic_light_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_link_dark.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_link_dark.png
deleted file mode 100644
index 1c11528f..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_link_dark.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_link_dark_checked.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_link_dark_checked.png
deleted file mode 100644
index 0f2680c6..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_link_dark_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_link_dark_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_link_dark_pressed.png
deleted file mode 100644
index 402d8620..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_link_dark_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_link_light.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_link_light.png
deleted file mode 100644
index cac959a8..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_link_light.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_link_light_checked.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_link_light_checked.png
deleted file mode 100644
index 0f2680c6..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_link_light_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_link_light_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_link_light_pressed.png
deleted file mode 100644
index 402d8620..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_link_light_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_number_dark.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_number_dark.png
deleted file mode 100644
index 9ab988de..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_number_dark.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_number_dark_checked.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_number_dark_checked.png
deleted file mode 100644
index f00befc8..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_number_dark_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_number_dark_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_number_dark_pressed.png
deleted file mode 100644
index 16f5a598..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_number_dark_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_number_light.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_number_light.png
deleted file mode 100644
index 22415c05..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_number_light.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_number_light_checked.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_number_light_checked.png
deleted file mode 100644
index 48a9e46a..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_number_light_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_number_light_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_number_light_pressed.png
deleted file mode 100644
index 4fad5910..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_number_light_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_redo_dark.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_redo_dark.png
deleted file mode 100644
index c706321f..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_redo_dark.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_redo_dark_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_redo_dark_pressed.png
deleted file mode 100644
index dceaed8b..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_redo_dark_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_redo_light.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_redo_light.png
deleted file mode 100644
index d5b222fa..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_redo_light.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_redo_light_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_redo_light_pressed.png
deleted file mode 100644
index 2ccde754..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_redo_light_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_strikethrough_dark.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_strikethrough_dark.png
deleted file mode 100644
index a112c0b3..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_strikethrough_dark.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_strikethrough_dark_checked.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_strikethrough_dark_checked.png
deleted file mode 100644
index 71bdfb71..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_strikethrough_dark_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_strikethrough_dark_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_strikethrough_dark_pressed.png
deleted file mode 100644
index 172dc1cb..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_strikethrough_dark_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_strikethrough_light.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_strikethrough_light.png
deleted file mode 100644
index cacfacf9..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_strikethrough_light.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_strikethrough_light_checked.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_strikethrough_light_checked.png
deleted file mode 100644
index 71bdfb71..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_strikethrough_light_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_strikethrough_light_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_strikethrough_light_pressed.png
deleted file mode 100644
index 172dc1cb..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_strikethrough_light_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_subscript_dark.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_subscript_dark.png
deleted file mode 100644
index 1b1fa43a..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_subscript_dark.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_subscript_dark_checked.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_subscript_dark_checked.png
deleted file mode 100644
index 56dc69b9..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_subscript_dark_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_subscript_dark_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_subscript_dark_pressed.png
deleted file mode 100644
index 8c039d47..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_subscript_dark_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_subscript_light.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_subscript_light.png
deleted file mode 100644
index 9b9c4d13..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_subscript_light.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_subscript_light_checked.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_subscript_light_checked.png
deleted file mode 100644
index 56dc69b9..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_subscript_light_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_subscript_light_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_subscript_light_pressed.png
deleted file mode 100644
index 8c039d47..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_subscript_light_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_superscript_dark.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_superscript_dark.png
deleted file mode 100644
index 0241e6ae..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_superscript_dark.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_superscript_dark_checked.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_superscript_dark_checked.png
deleted file mode 100644
index d46bf6b4..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_superscript_dark_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_superscript_dark_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_superscript_dark_pressed.png
deleted file mode 100644
index de6c00ad..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_superscript_dark_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_superscript_light.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_superscript_light.png
deleted file mode 100644
index aabbd152..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_superscript_light.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_superscript_light_checked.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_superscript_light_checked.png
deleted file mode 100644
index d46bf6b4..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_superscript_light_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_superscript_light_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_superscript_light_pressed.png
deleted file mode 100644
index de6c00ad..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_superscript_light_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_typeface_dark.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_typeface_dark.png
deleted file mode 100644
index dfe28fcf..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_typeface_dark.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_typeface_dark_checked.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_typeface_dark_checked.png
deleted file mode 100644
index 391259ad..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_typeface_dark_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_typeface_dark_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_typeface_dark_pressed.png
deleted file mode 100644
index 481d8484..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_typeface_dark_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_typeface_light.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_typeface_light.png
deleted file mode 100644
index 7cc4d634..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_typeface_light.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_typeface_light_checked.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_typeface_light_checked.png
deleted file mode 100644
index 391259ad..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_typeface_light_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_typeface_light_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_typeface_light_pressed.png
deleted file mode 100644
index 481d8484..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_typeface_light_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_underline_dark.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_underline_dark.png
deleted file mode 100644
index bf45d9bd..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_underline_dark.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_underline_dark_checked.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_underline_dark_checked.png
deleted file mode 100644
index f19748ba..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_underline_dark_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_underline_dark_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_underline_dark_pressed.png
deleted file mode 100644
index 62250d06..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_underline_dark_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_underline_light.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_underline_light.png
deleted file mode 100644
index 9b34b5f2..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_underline_light.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_underline_light_checked.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_underline_light_checked.png
deleted file mode 100644
index f19748ba..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_underline_light_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_underline_light_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_underline_light_pressed.png
deleted file mode 100644
index 62250d06..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_underline_light_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_undo_dark.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_undo_dark.png
deleted file mode 100644
index 72091272..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_undo_dark.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_undo_dark_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_undo_dark_pressed.png
deleted file mode 100644
index 94f9a6cf..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_undo_dark_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_undo_light.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_undo_light.png
deleted file mode 100644
index b853b2bb..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_undo_light.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_undo_light_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_undo_light_pressed.png
deleted file mode 100644
index 1245febb..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-mdpi/ic_toolbar_undo_light_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_align_center_dark.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_align_center_dark.png
deleted file mode 100644
index 50dad805..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_align_center_dark.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_align_center_dark_checked.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_align_center_dark_checked.png
deleted file mode 100644
index 5bacfc80..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_align_center_dark_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_align_center_dark_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_align_center_dark_pressed.png
deleted file mode 100644
index e63fc936..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_align_center_dark_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_align_center_light.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_align_center_light.png
deleted file mode 100644
index 9ea5edd4..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_align_center_light.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_align_center_light_checked.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_align_center_light_checked.png
deleted file mode 100644
index 5bacfc80..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_align_center_light_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_align_center_light_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_align_center_light_pressed.png
deleted file mode 100644
index e63fc936..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_align_center_light_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_align_left_dark.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_align_left_dark.png
deleted file mode 100644
index ee5fbd58..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_align_left_dark.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_align_left_dark_checked.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_align_left_dark_checked.png
deleted file mode 100644
index 5e61ca48..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_align_left_dark_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_align_left_dark_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_align_left_dark_pressed.png
deleted file mode 100644
index 0352d8c4..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_align_left_dark_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_align_left_light.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_align_left_light.png
deleted file mode 100644
index b5b3565d..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_align_left_light.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_align_left_light_checked.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_align_left_light_checked.png
deleted file mode 100644
index 5e61ca48..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_align_left_light_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_align_left_light_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_align_left_light_pressed.png
deleted file mode 100644
index 0352d8c4..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_align_left_light_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_align_right_dark.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_align_right_dark.png
deleted file mode 100644
index 3462e89d..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_align_right_dark.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_align_right_dark_checked.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_align_right_dark_checked.png
deleted file mode 100644
index d5a55e62..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_align_right_dark_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_align_right_dark_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_align_right_dark_pressed.png
deleted file mode 100644
index dd669a57..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_align_right_dark_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_align_right_light.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_align_right_light.png
deleted file mode 100644
index 5e53dcbb..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_align_right_light.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_align_right_light_checked.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_align_right_light_checked.png
deleted file mode 100644
index d5a55e62..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_align_right_light_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_align_right_light_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_align_right_light_pressed.png
deleted file mode 100644
index dd669a57..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_align_right_light_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_bgcolor_dark.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_bgcolor_dark.png
deleted file mode 100644
index f6ce2fa8..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_bgcolor_dark.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_bgcolor_dark_checked.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_bgcolor_dark_checked.png
deleted file mode 100644
index b2b8ee04..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_bgcolor_dark_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_bgcolor_dark_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_bgcolor_dark_pressed.png
deleted file mode 100644
index 829f5aca..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_bgcolor_dark_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_bgcolor_light.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_bgcolor_light.png
deleted file mode 100644
index 4407b363..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_bgcolor_light.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_bgcolor_light_checked.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_bgcolor_light_checked.png
deleted file mode 100644
index b2b8ee04..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_bgcolor_light_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_bgcolor_light_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_bgcolor_light_pressed.png
deleted file mode 100644
index 829f5aca..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_bgcolor_light_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_bold_dark.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_bold_dark.png
deleted file mode 100644
index e763f60a..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_bold_dark.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_bold_dark_checked.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_bold_dark_checked.png
deleted file mode 100644
index b6d21a88..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_bold_dark_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_bold_dark_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_bold_dark_pressed.png
deleted file mode 100644
index 114f4470..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_bold_dark_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_bold_light.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_bold_light.png
deleted file mode 100644
index cf12215f..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_bold_light.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_bold_light_checked.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_bold_light_checked.png
deleted file mode 100644
index b6d21a88..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_bold_light_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_bold_light_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_bold_light_pressed.png
deleted file mode 100644
index 114f4470..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_bold_light_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_bullet_dark.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_bullet_dark.png
deleted file mode 100644
index 0259fdb4..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_bullet_dark.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_bullet_dark_checked.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_bullet_dark_checked.png
deleted file mode 100644
index 8327f6df..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_bullet_dark_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_bullet_dark_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_bullet_dark_pressed.png
deleted file mode 100644
index b5a35520..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_bullet_dark_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_bullet_light.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_bullet_light.png
deleted file mode 100644
index f31b9a2d..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_bullet_light.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_bullet_light_checked.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_bullet_light_checked.png
deleted file mode 100644
index 8327f6df..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_bullet_light_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_bullet_light_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_bullet_light_pressed.png
deleted file mode 100644
index b5a35520..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_bullet_light_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_capture_dark.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_capture_dark.png
deleted file mode 100644
index 32852602..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_capture_dark.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_capture_dark_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_capture_dark_pressed.png
deleted file mode 100644
index c3837c1f..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_capture_dark_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_capture_light.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_capture_light.png
deleted file mode 100644
index a3513a43..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_capture_light.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_capture_light_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_capture_light_pressed.png
deleted file mode 100644
index c3837c1f..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_capture_light_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_clear_dark.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_clear_dark.png
deleted file mode 100644
index 0fa4367e..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_clear_dark.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_clear_dark_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_clear_dark_pressed.png
deleted file mode 100644
index eadf9d17..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_clear_dark_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_clear_light.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_clear_light.png
deleted file mode 100644
index 5e414845..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_clear_light.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_clear_light_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_clear_light_pressed.png
deleted file mode 100644
index 157fda37..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_clear_light_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_dec_indent_dark.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_dec_indent_dark.png
deleted file mode 100644
index 3b0f5120..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_dec_indent_dark.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_dec_indent_dark_checked.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_dec_indent_dark_checked.png
deleted file mode 100644
index 6fbf36d2..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_dec_indent_dark_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_dec_indent_dark_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_dec_indent_dark_pressed.png
deleted file mode 100644
index fb847d16..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_dec_indent_dark_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_dec_indent_light.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_dec_indent_light.png
deleted file mode 100644
index fb984b98..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_dec_indent_light.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_dec_indent_light_checked.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_dec_indent_light_checked.png
deleted file mode 100644
index 6fbf36d2..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_dec_indent_light_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_dec_indent_light_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_dec_indent_light_pressed.png
deleted file mode 100644
index fb847d16..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_dec_indent_light_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_fontcolor_dark.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_fontcolor_dark.png
deleted file mode 100644
index 50bf010a..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_fontcolor_dark.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_fontcolor_dark_checked.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_fontcolor_dark_checked.png
deleted file mode 100644
index 4f701237..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_fontcolor_dark_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_fontcolor_dark_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_fontcolor_dark_pressed.png
deleted file mode 100644
index 8787274c..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_fontcolor_dark_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_fontcolor_light.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_fontcolor_light.png
deleted file mode 100644
index 3109beb3..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_fontcolor_light.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_fontcolor_light_checked.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_fontcolor_light_checked.png
deleted file mode 100644
index 4f701237..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_fontcolor_light_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_fontcolor_light_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_fontcolor_light_pressed.png
deleted file mode 100644
index 8787274c..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_fontcolor_light_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_fontsize_dark.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_fontsize_dark.png
deleted file mode 100644
index 4b49464f..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_fontsize_dark.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_fontsize_dark_checked.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_fontsize_dark_checked.png
deleted file mode 100644
index 8f73ce3f..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_fontsize_dark_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_fontsize_dark_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_fontsize_dark_pressed.png
deleted file mode 100644
index bb62630b..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_fontsize_dark_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_fontsize_light.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_fontsize_light.png
deleted file mode 100644
index 26153a89..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_fontsize_light.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_fontsize_light_checked.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_fontsize_light_checked.png
deleted file mode 100644
index 8f73ce3f..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_fontsize_light_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_fontsize_light_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_fontsize_light_pressed.png
deleted file mode 100644
index bb62630b..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_fontsize_light_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_image_dark.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_image_dark.png
deleted file mode 100644
index 0dd53ad6..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_image_dark.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_image_dark_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_image_dark_pressed.png
deleted file mode 100644
index 3ec59e32..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_image_dark_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_image_light.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_image_light.png
deleted file mode 100644
index 95b5716f..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_image_light.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_image_light_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_image_light_pressed.png
deleted file mode 100644
index 3ec59e32..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_image_light_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_inc_indent_dark.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_inc_indent_dark.png
deleted file mode 100644
index 09b26243..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_inc_indent_dark.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_inc_indent_dark_checked.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_inc_indent_dark_checked.png
deleted file mode 100644
index 98ea7cd9..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_inc_indent_dark_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_inc_indent_dark_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_inc_indent_dark_pressed.png
deleted file mode 100644
index c8594969..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_inc_indent_dark_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_inc_indent_light.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_inc_indent_light.png
deleted file mode 100644
index 38f2f19a..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_inc_indent_light.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_inc_indent_light_checked.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_inc_indent_light_checked.png
deleted file mode 100644
index 98ea7cd9..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_inc_indent_light_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_inc_indent_light_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_inc_indent_light_pressed.png
deleted file mode 100644
index c8594969..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_inc_indent_light_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_italic_dark.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_italic_dark.png
deleted file mode 100644
index 462bdc20..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_italic_dark.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_italic_dark_checked.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_italic_dark_checked.png
deleted file mode 100644
index ac836af5..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_italic_dark_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_italic_dark_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_italic_dark_pressed.png
deleted file mode 100644
index 17cef2de..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_italic_dark_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_italic_light.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_italic_light.png
deleted file mode 100644
index d5a73e19..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_italic_light.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_italic_light_checked.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_italic_light_checked.png
deleted file mode 100644
index ac836af5..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_italic_light_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_italic_light_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_italic_light_pressed.png
deleted file mode 100644
index 17cef2de..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_italic_light_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_link_dark.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_link_dark.png
deleted file mode 100644
index 9f6a2e21..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_link_dark.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_link_dark_checked.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_link_dark_checked.png
deleted file mode 100644
index dc193a7a..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_link_dark_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_link_dark_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_link_dark_pressed.png
deleted file mode 100644
index 06806df7..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_link_dark_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_link_light.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_link_light.png
deleted file mode 100644
index ff4fbc38..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_link_light.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_link_light_checked.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_link_light_checked.png
deleted file mode 100644
index dc193a7a..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_link_light_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_link_light_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_link_light_pressed.png
deleted file mode 100644
index 06806df7..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_link_light_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_number_dark.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_number_dark.png
deleted file mode 100644
index 9b7a19ef..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_number_dark.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_number_dark_checked.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_number_dark_checked.png
deleted file mode 100644
index b15d37d0..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_number_dark_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_number_dark_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_number_dark_pressed.png
deleted file mode 100644
index 6a3e8cc9..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_number_dark_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_number_light.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_number_light.png
deleted file mode 100644
index 92332d95..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_number_light.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_number_light_checked.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_number_light_checked.png
deleted file mode 100644
index b3855917..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_number_light_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_number_light_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_number_light_pressed.png
deleted file mode 100644
index 1774243a..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_number_light_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_redo_dark.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_redo_dark.png
deleted file mode 100644
index 6313d5b7..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_redo_dark.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_redo_dark_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_redo_dark_pressed.png
deleted file mode 100644
index 40954c48..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_redo_dark_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_redo_light.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_redo_light.png
deleted file mode 100644
index a63fbaa4..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_redo_light.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_redo_light_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_redo_light_pressed.png
deleted file mode 100644
index 5e07e1a5..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_redo_light_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_strikethrough_dark.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_strikethrough_dark.png
deleted file mode 100644
index 2e42d78c..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_strikethrough_dark.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_strikethrough_dark_checked.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_strikethrough_dark_checked.png
deleted file mode 100644
index b34cd1a3..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_strikethrough_dark_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_strikethrough_dark_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_strikethrough_dark_pressed.png
deleted file mode 100644
index f03adadd..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_strikethrough_dark_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_strikethrough_light.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_strikethrough_light.png
deleted file mode 100644
index 118439df..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_strikethrough_light.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_strikethrough_light_checked.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_strikethrough_light_checked.png
deleted file mode 100644
index b34cd1a3..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_strikethrough_light_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_strikethrough_light_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_strikethrough_light_pressed.png
deleted file mode 100644
index f03adadd..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_strikethrough_light_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_subscript_dark.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_subscript_dark.png
deleted file mode 100644
index 034a0fe8..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_subscript_dark.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_subscript_dark_checked.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_subscript_dark_checked.png
deleted file mode 100644
index d02bd639..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_subscript_dark_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_subscript_dark_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_subscript_dark_pressed.png
deleted file mode 100644
index c8dc220a..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_subscript_dark_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_subscript_light.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_subscript_light.png
deleted file mode 100644
index 526d5132..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_subscript_light.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_subscript_light_checked.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_subscript_light_checked.png
deleted file mode 100644
index d02bd639..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_subscript_light_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_subscript_light_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_subscript_light_pressed.png
deleted file mode 100644
index c8dc220a..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_subscript_light_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_superscript_dark.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_superscript_dark.png
deleted file mode 100644
index 13ddef88..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_superscript_dark.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_superscript_dark_checked.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_superscript_dark_checked.png
deleted file mode 100644
index c67525a0..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_superscript_dark_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_superscript_dark_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_superscript_dark_pressed.png
deleted file mode 100644
index 6c07efb5..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_superscript_dark_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_superscript_light.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_superscript_light.png
deleted file mode 100644
index 856a2bfc..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_superscript_light.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_superscript_light_checked.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_superscript_light_checked.png
deleted file mode 100644
index c67525a0..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_superscript_light_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_superscript_light_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_superscript_light_pressed.png
deleted file mode 100644
index 6c07efb5..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_superscript_light_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_typeface_dark.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_typeface_dark.png
deleted file mode 100644
index 515bec19..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_typeface_dark.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_typeface_dark_checked.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_typeface_dark_checked.png
deleted file mode 100644
index dced79e3..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_typeface_dark_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_typeface_dark_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_typeface_dark_pressed.png
deleted file mode 100644
index cac1bdd5..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_typeface_dark_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_typeface_light.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_typeface_light.png
deleted file mode 100644
index a336c9f4..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_typeface_light.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_typeface_light_checked.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_typeface_light_checked.png
deleted file mode 100644
index dced79e3..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_typeface_light_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_typeface_light_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_typeface_light_pressed.png
deleted file mode 100644
index cac1bdd5..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_typeface_light_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_underline_dark.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_underline_dark.png
deleted file mode 100644
index a2b96520..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_underline_dark.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_underline_dark_checked.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_underline_dark_checked.png
deleted file mode 100644
index df884340..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_underline_dark_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_underline_dark_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_underline_dark_pressed.png
deleted file mode 100644
index b3f6f7a8..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_underline_dark_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_underline_light.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_underline_light.png
deleted file mode 100644
index dfaeaa77..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_underline_light.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_underline_light_checked.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_underline_light_checked.png
deleted file mode 100644
index df884340..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_underline_light_checked.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_underline_light_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_underline_light_pressed.png
deleted file mode 100644
index b3f6f7a8..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_underline_light_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_undo_dark.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_undo_dark.png
deleted file mode 100644
index 273a4a9c..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_undo_dark.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_undo_dark_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_undo_dark_pressed.png
deleted file mode 100644
index 4917025f..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_undo_dark_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_undo_light.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_undo_light.png
deleted file mode 100644
index 5b7c5fd0..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_undo_light.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_undo_light_pressed.png b/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_undo_light_pressed.png
deleted file mode 100644
index fcb00106..00000000
Binary files a/RTEditor-Toolbar/src/main/res/drawable-xhdpi/ic_toolbar_undo_light_pressed.png and /dev/null differ
diff --git a/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_align_center_checked.xml b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_align_center_checked.xml
new file mode 100644
index 00000000..eec251db
--- /dev/null
+++ b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_align_center_checked.xml
@@ -0,0 +1,33 @@
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="36dp"
+        android:height="36dp"
+        android:viewportHeight="24.0"
+        android:viewportWidth="24.0">
+
+    <path
+        android:fillColor="#8034B5E5"
+        android:pathData="M0 0h24v24H0z"
+        android:strokeColor="#FF34B5E5"
+        android:strokeWidth="1"/>
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M7 15v2h10v-2H7zm-4 6h18v-2H3v2zm0-8h18v-2H3v2zm4-6v2h10V7H7zM3 3v2h18V3H3z"/>
+</vector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_align_center_dark.xml b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_align_center_dark.xml
new file mode 100644
index 00000000..5de9bbbb
--- /dev/null
+++ b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_align_center_dark.xml
@@ -0,0 +1,31 @@
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="36dp"
+        android:height="36dp"
+        android:viewportHeight="24.0"
+        android:viewportWidth="24.0">
+
+    <path
+        android:fillColor="#404040"
+        android:pathData="M0 0h24v24H0z"/>
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M7 15v2h10v-2H7zm-4 6h18v-2H3v2zm0-8h18v-2H3v2zm4-6v2h10V7H7zM3 3v2h18V3H3z"/>
+</vector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_align_center_pressed.xml b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_align_center_pressed.xml
new file mode 100644
index 00000000..93c40c55
--- /dev/null
+++ b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_align_center_pressed.xml
@@ -0,0 +1,31 @@
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="36dp"
+        android:height="36dp"
+        android:viewportHeight="24.0"
+        android:viewportWidth="24.0">
+
+    <path
+        android:fillColor="#FF34B5E5"
+        android:pathData="M0 0h24v24H0z"/>
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M7 15v2h10v-2H7zm-4 6h18v-2H3v2zm0-8h18v-2H3v2zm4-6v2h10V7H7zM3 3v2h18V3H3z"/>
+</vector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_align_left_checked.xml b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_align_left_checked.xml
new file mode 100644
index 00000000..a806971c
--- /dev/null
+++ b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_align_left_checked.xml
@@ -0,0 +1,33 @@
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="36dp"
+        android:height="36dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#8034B5E5"
+        android:pathData="M0 0h24v24H0z"
+        android:strokeColor="#FF34B5E5"
+        android:strokeWidth="1"/>
+
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M15,15L3,15v2h12v-2zM15,7L3,7v2h12L15,7zM3,13h18v-2L3,11v2zM3,21h18v-2L3,19v2zM3,3v2h18L21,3L3,3z"/>
+</vector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_align_left_dark.xml b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_align_left_dark.xml
new file mode 100644
index 00000000..893a0649
--- /dev/null
+++ b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_align_left_dark.xml
@@ -0,0 +1,32 @@
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="36dp"
+        android:height="36dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+
+    <path
+        android:fillColor="#404040"
+        android:pathData="M0 0h24v24H0z"/>
+    
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M15,15L3,15v2h12v-2zM15,7L3,7v2h12L15,7zM3,13h18v-2L3,11v2zM3,21h18v-2L3,19v2zM3,3v2h18L21,3L3,3z"/>
+</vector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_align_left_light.xml b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_align_left_light.xml
new file mode 100644
index 00000000..bc82e5bd
--- /dev/null
+++ b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_align_left_light.xml
@@ -0,0 +1,30 @@
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="36dp"
+        android:height="36dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#E4E4E4"
+        android:pathData="M0 0h24v24H0z"/>
+    <path
+        android:fillColor="#404040"
+        android:pathData="M15,15L3,15v2h12v-2zM15,7L3,7v2h12L15,7zM3,13h18v-2L3,11v2zM3,21h18v-2L3,19v2zM3,3v2h18L21,3L3,3z"/>
+</vector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_align_left_pressed.xml b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_align_left_pressed.xml
new file mode 100644
index 00000000..6e18e9a9
--- /dev/null
+++ b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_align_left_pressed.xml
@@ -0,0 +1,30 @@
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="36dp"
+        android:height="36dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF34B5E5"
+        android:pathData="M0 0h24v24H0z"/>
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M15,15L3,15v2h12v-2zM15,7L3,7v2h12L15,7zM3,13h18v-2L3,11v2zM3,21h18v-2L3,19v2zM3,3v2h18L21,3L3,3z"/>
+</vector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_align_right_checked.xml b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_align_right_checked.xml
new file mode 100644
index 00000000..03d62291
--- /dev/null
+++ b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_align_right_checked.xml
@@ -0,0 +1,32 @@
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="36dp"
+        android:height="36dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#8034B5E5"
+        android:pathData="M0 0h24v24H0z"
+        android:strokeColor="#FF34B5E5"
+        android:strokeWidth="1"/>
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M3,21h18v-2L3,19v2zM9,17h12v-2L9,15v2zM3,13h18v-2L3,11v2zM9,9h12L21,7L9,7v2zM3,3v2h18L21,3L3,3z"/>
+</vector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_align_right_dark.xml b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_align_right_dark.xml
new file mode 100644
index 00000000..a6ad1f26
--- /dev/null
+++ b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_align_right_dark.xml
@@ -0,0 +1,30 @@
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="36dp"
+        android:height="36dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#404040"
+        android:pathData="M0 0h24v24H0z"/>
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M3,21h18v-2L3,19v2zM9,17h12v-2L9,15v2zM3,13h18v-2L3,11v2zM9,9h12L21,7L9,7v2zM3,3v2h18L21,3L3,3z"/>
+</vector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_align_right_light.xml b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_align_right_light.xml
new file mode 100644
index 00000000..b4e62812
--- /dev/null
+++ b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_align_right_light.xml
@@ -0,0 +1,30 @@
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="36dp"
+        android:height="36dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#E4E4E4"
+        android:pathData="M0 0h24v24H0z"/>
+    <path
+        android:fillColor="#404040"
+        android:pathData="M3,21h18v-2L3,19v2zM9,17h12v-2L9,15v2zM3,13h18v-2L3,11v2zM9,9h12L21,7L9,7v2zM3,3v2h18L21,3L3,3z"/>
+</vector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_align_right_pressed.xml b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_align_right_pressed.xml
new file mode 100644
index 00000000..1ed3f56b
--- /dev/null
+++ b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_align_right_pressed.xml
@@ -0,0 +1,30 @@
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="36dp"
+        android:height="36dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF34B5E5"
+        android:pathData="M0 0h24v24H0z"/>
+    <path
+        android:fillColor="#FFFF"
+        android:pathData="M3,21h18v-2L3,19v2zM9,17h12v-2L9,15v2zM3,13h18v-2L3,11v2zM9,9h12L21,7L9,7v2zM3,3v2h18L21,3L3,3z"/>
+</vector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_barcode_checked.xml b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_barcode_checked.xml
new file mode 100644
index 00000000..253546f8
--- /dev/null
+++ b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_barcode_checked.xml
@@ -0,0 +1,32 @@
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="36dp"
+        android:height="36dp"
+        android:viewportWidth="24.000002"
+        android:viewportHeight="24.000002">
+    <path
+        android:fillColor="#8034B5E5"
+        android:pathData="M0 0h24v24H0z"
+        android:strokeColor="#FF34B5E5"
+        android:strokeWidth="1"/>
+    <path
+        android:pathData="m3,3 l0,6 6,0 0,-6 -6,0zM15,3 L15,9 21,9 21,3 15,3zM5,5 L7,5 7,7 5,7 5,5zM11,5 L11,7 11,9 13,9 13,7 13,5 11,5zM17,5 L19,5 19,7 17,7 17,5zM5,11 L5,13 7,13 7,11 5,11zM9,11 L9,13 11,13 11,15 13,15 13,13 13,11 11,11 9,11zM15,11 L15,13 17,13 17,11 15,11zM17,13 L17,15 19,15 19,13 17,13zM19,13 L21,13 21,11 19,11 19,13zM19,15 L19,17 19,19 21,19 21,17 21,15 19,15zM19,19 L17,19 17,21 19,21 19,19zM17,19 L17,17 17,15 15,15 15,17 13,17 11,17 11,19 11,21 13,21 13,19 15,19 17,19zM3,15 L3,21 9,21 9,15 3,15zM5,17 L7,17 7,19 5,19 5,17z"
+        android:fillColor="#FFFFFF"/>
+</vector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_barcode_dark.xml b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_barcode_dark.xml
new file mode 100644
index 00000000..75430dd9
--- /dev/null
+++ b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_barcode_dark.xml
@@ -0,0 +1,30 @@
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="36dp"
+        android:height="36dp"
+        android:viewportWidth="24.000002"
+        android:viewportHeight="24.000002">
+    <path
+        android:fillColor="#404040"
+        android:pathData="M0 0h24v24H0z"/>
+    <path
+        android:pathData="m3,3 l0,6 6,0 0,-6 -6,0zM15,3 L15,9 21,9 21,3 15,3zM5,5 L7,5 7,7 5,7 5,5zM11,5 L11,7 11,9 13,9 13,7 13,5 11,5zM17,5 L19,5 19,7 17,7 17,5zM5,11 L5,13 7,13 7,11 5,11zM9,11 L9,13 11,13 11,15 13,15 13,13 13,11 11,11 9,11zM15,11 L15,13 17,13 17,11 15,11zM17,13 L17,15 19,15 19,13 17,13zM19,13 L21,13 21,11 19,11 19,13zM19,15 L19,17 19,19 21,19 21,17 21,15 19,15zM19,19 L17,19 17,21 19,21 19,19zM17,19 L17,17 17,15 15,15 15,17 13,17 11,17 11,19 11,21 13,21 13,19 15,19 17,19zM3,15 L3,21 9,21 9,15 3,15zM5,17 L7,17 7,19 5,19 5,17z"
+        android:fillColor="#FFFFFF"/>
+</vector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_barcode_light.xml b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_barcode_light.xml
new file mode 100644
index 00000000..8192864b
--- /dev/null
+++ b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_barcode_light.xml
@@ -0,0 +1,30 @@
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="36dp"
+        android:height="36dp"
+        android:viewportWidth="24.000002"
+        android:viewportHeight="24.000002">
+    <path
+        android:fillColor="#E4E4E4"
+        android:pathData="M0 0h24v24H0z"/>
+    <path
+        android:pathData="m3,3 l0,6 6,0 0,-6 -6,0zM15,3 L15,9 21,9 21,3 15,3zM5,5 L7,5 7,7 5,7 5,5zM11,5 L11,7 11,9 13,9 13,7 13,5 11,5zM17,5 L19,5 19,7 17,7 17,5zM5,11 L5,13 7,13 7,11 5,11zM9,11 L9,13 11,13 11,15 13,15 13,13 13,11 11,11 9,11zM15,11 L15,13 17,13 17,11 15,11zM17,13 L17,15 19,15 19,13 17,13zM19,13 L21,13 21,11 19,11 19,13zM19,15 L19,17 19,19 21,19 21,17 21,15 19,15zM19,19 L17,19 17,21 19,21 19,19zM17,19 L17,17 17,15 15,15 15,17 13,17 11,17 11,19 11,21 13,21 13,19 15,19 17,19zM3,15 L3,21 9,21 9,15 3,15zM5,17 L7,17 7,19 5,19 5,17z"
+        android:fillColor="#404040"/>
+</vector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_barcode_pressed.xml b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_barcode_pressed.xml
new file mode 100644
index 00000000..a2df5ece
--- /dev/null
+++ b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_barcode_pressed.xml
@@ -0,0 +1,30 @@
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="36dp"
+        android:height="36dp"
+        android:viewportWidth="24.000002"
+        android:viewportHeight="24.000002">
+    <path
+        android:fillColor="#FF34B5E5"
+        android:pathData="M0 0h24v24H0z"/>
+    <path
+        android:pathData="m3,3 l0,6 6,0 0,-6 -6,0zM15,3 L15,9 21,9 21,3 15,3zM5,5 L7,5 7,7 5,7 5,5zM11,5 L11,7 11,9 13,9 13,7 13,5 11,5zM17,5 L19,5 19,7 17,7 17,5zM5,11 L5,13 7,13 7,11 5,11zM9,11 L9,13 11,13 11,15 13,15 13,13 13,11 11,11 9,11zM15,11 L15,13 17,13 17,11 15,11zM17,13 L17,15 19,15 19,13 17,13zM19,13 L21,13 21,11 19,11 19,13zM19,15 L19,17 19,19 21,19 21,17 21,15 19,15zM19,19 L17,19 17,21 19,21 19,19zM17,19 L17,17 17,15 15,15 15,17 13,17 11,17 11,19 11,21 13,21 13,19 15,19 17,19zM3,15 L3,21 9,21 9,15 3,15zM5,17 L7,17 7,19 5,19 5,17z"
+        android:fillColor="#FFFFFF"/>
+</vector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_barcode_selected.xml b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_barcode_selected.xml
deleted file mode 100644
index c9e8d9d2..00000000
--- a/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_barcode_selected.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportHeight="28.0"
-    android:viewportWidth="28.0">
-    <path
-
-        android:fillColor="#FF000000"
-        android:pathData="M2.017,5L2.648,5A0.517,0.517 0,0 1,3.165 5.517L3.165,22.483A0.517,0.517 0,0 1,2.648 23L2.017,23A0.517,0.517 0,0 1,1.5 22.483L1.5,5.517A0.517,0.517 0,0 1,2.017 5z" />
-    <path
-
-        android:fillColor="#FF000000"
-        android:pathData="M5.073,5L7.37,5A0.517,0.517 0,0 1,7.887 5.517L7.887,22.483A0.517,0.517 0,0 1,7.37 23L5.073,23A0.517,0.517 0,0 1,4.557 22.483L4.557,5.517A0.517,0.517 0,0 1,5.073 5z" />
-    <path
-
-        android:fillColor="#FF000000"
-        android:pathData="M9.795,5L10.427,5A0.517,0.517 0,0 1,10.943 5.517L10.943,22.483A0.517,0.517 0,0 1,10.427 23L9.795,23A0.517,0.517 0,0 1,9.278 22.483L9.278,5.517A0.517,0.517 0,0 1,9.795 5z" />
-    <path
-
-        android:fillColor="#FF000000"
-        android:pathData="M12.852,5L16.813,5A0.517,0.517 0,0 1,17.33 5.517L17.33,22.483A0.517,0.517 0,0 1,16.813 23L12.852,23A0.517,0.517 0,0 1,12.335 22.483L12.335,5.517A0.517,0.517 0,0 1,12.852 5z" />
-    <path
-
-        android:fillColor="#FF000000"
-        android:pathData="M19.238,5L19.87,5A0.517,0.517 0,0 1,20.387 5.517L20.387,22.483A0.517,0.517 0,0 1,19.87 23L19.238,23A0.517,0.517 0,0 1,18.722 22.483L18.722,5.517A0.517,0.517 0,0 1,19.238 5z" />
-    <path
-
-        android:fillColor="#FF000000"
-        android:pathData="M22.295,5L22.927,5A0.517,0.517 0,0 1,23.443 5.517L23.443,22.483A0.517,0.517 0,0 1,22.927 23L22.295,23A0.517,0.517 0,0 1,21.778 22.483L21.778,5.517A0.517,0.517 0,0 1,22.295 5z" />
-    <path
-
-        android:fillColor="#FF000000"
-        android:pathData="M25.352,5L25.983,5A0.517,0.517 0,0 1,26.5 5.517L26.5,22.483A0.517,0.517 0,0 1,25.983 23L25.352,23A0.517,0.517 0,0 1,24.835 22.483L24.835,5.517A0.517,0.517 0,0 1,25.352 5z" />
-</vector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_bgcolor_checked.xml b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_bgcolor_checked.xml
new file mode 100644
index 00000000..f3bba56c
--- /dev/null
+++ b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_bgcolor_checked.xml
@@ -0,0 +1,38 @@
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="54dp"
+        android:height="36dp"
+        android:viewportHeight="24.00"
+        android:viewportWidth="36.00">
+    <path
+        android:fillColor="#8034B5E5"
+        android:pathData="M 0,0 36,0 36,24 0,24 Z"
+        android:strokeColor="#FF34B5E5"
+        android:strokeWidth="1"/>
+
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M 7.6191406 2 L 6.2109375 3.4101562 L 8.5898438 5.7890625 L 3.4394531 10.939453 C 2.8494531 11.529453 2.8494531 12.480547 3.4394531 13.060547 L 8.9394531 18.560547 C 9.2294531 18.850547 9.62 19 10 19 C 10.38 19 10.770547 18.850547 11.060547 18.560547 L 16.560547 13.060547 C 17.150547 12.480547 17.150547 11.529453 16.560547 10.939453 L 7.6191406 2 z M 10 7.2109375 L 14.789062 12 L 5.2109375 12 L 10 7.2109375 z M 30 9.5292969 L 26 13.529297 L 26.939453 14.470703 L 30 11.416016 L 33.060547 14.470703 L 34 13.529297 L 30 9.5292969 z M 19 13.5 C 19 13.5 17 15.67 17 17 C 17 18.1 17.9 19 19 19 C 20.1 19 21 18.1 21 17 C 21 15.67 19 13.5 19 13.5 z "/>
+
+    <path
+        android:fillAlpha="0.36"
+        android:fillColor="#FFFFFF"
+        android:pathData="m 0,20 24,0 0,4 -24,0 z"/>
+</vector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_bgcolor_dark.xml b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_bgcolor_dark.xml
new file mode 100644
index 00000000..8ed778d6
--- /dev/null
+++ b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_bgcolor_dark.xml
@@ -0,0 +1,37 @@
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="54dp"
+        android:height="36dp"
+        android:viewportHeight="24.00"
+        android:viewportWidth="36.00">
+    <path
+        android:fillColor="#404040"
+        android:pathData="M 0,0 36,0 36,24 0,24 Z"/>
+
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M 7.6191406 2 L 6.2109375 3.4101562 L 8.5898438 5.7890625 L 3.4394531 10.939453 C 2.8494531 11.529453 2.8494531 12.480547 3.4394531 13.060547 L 8.9394531 18.560547 C 9.2294531 18.850547 9.62 19 10 19 C 10.38 19 10.770547 18.850547 11.060547 18.560547 L 16.560547 13.060547 C 17.150547 12.480547 17.150547 11.529453 16.560547 10.939453 L 7.6191406 2 z M 10 7.2109375 L 14.789062 12 L 5.2109375 12 L 10 7.2109375 z M 30 9.5292969 L 26 13.529297 L 26.939453 14.470703 L 30 11.416016 L 33.060547 14.470703 L 34 13.529297 L 30 9.5292969 z M 19 13.5 C 19 13.5 17 15.67 17 17 C 17 18.1 17.9 19 19 19 C 20.1 19 21 18.1 21 17 C 21 15.67 19 13.5 19 13.5 z "/>
+
+    <path
+        android:fillAlpha="0.36"
+        android:fillColor="#FFFFFF"
+        android:pathData="m 0,20 24,0 0,4 -24,0 z"/>
+
+</vector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_bgcolor_light.xml b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_bgcolor_light.xml
new file mode 100644
index 00000000..ae856250
--- /dev/null
+++ b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_bgcolor_light.xml
@@ -0,0 +1,36 @@
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="54dp"
+        android:height="36dp"
+        android:viewportHeight="24.00"
+        android:viewportWidth="36.00">
+    <path
+        android:fillColor="#E4E4E4"
+        android:pathData="M 0,0 36,0 36,24 0,24 Z"/>
+
+    <path
+        android:fillColor="#404040"
+        android:pathData="M 7.6191406 2 L 6.2109375 3.4101562 L 8.5898438 5.7890625 L 3.4394531 10.939453 C 2.8494531 11.529453 2.8494531 12.480547 3.4394531 13.060547 L 8.9394531 18.560547 C 9.2294531 18.850547 9.62 19 10 19 C 10.38 19 10.770547 18.850547 11.060547 18.560547 L 16.560547 13.060547 C 17.150547 12.480547 17.150547 11.529453 16.560547 10.939453 L 7.6191406 2 z M 10 7.2109375 L 14.789062 12 L 5.2109375 12 L 10 7.2109375 z M 30 9.5292969 L 26 13.529297 L 26.939453 14.470703 L 30 11.416016 L 33.060547 14.470703 L 34 13.529297 L 30 9.5292969 z M 19 13.5 C 19 13.5 17 15.67 17 17 C 17 18.1 17.9 19 19 19 C 20.1 19 21 18.1 21 17 C 21 15.67 19 13.5 19 13.5 z "/>
+
+    <path
+        android:fillAlpha="0.36"
+        android:fillColor="#000000"
+        android:pathData="m 0,20 24,0 0,4 -24,0 z"/>
+</vector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_bgcolor_pressed.xml b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_bgcolor_pressed.xml
new file mode 100644
index 00000000..bbf06382
--- /dev/null
+++ b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_bgcolor_pressed.xml
@@ -0,0 +1,36 @@
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="54dp"
+        android:height="36dp"
+        android:viewportHeight="24.00"
+        android:viewportWidth="36.00">
+    <path
+        android:fillColor="#FF34B5E5"
+        android:pathData="M 0,0 36,0 36,24 0,24 Z"/>
+
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M 7.6191406 2 L 6.2109375 3.4101562 L 8.5898438 5.7890625 L 3.4394531 10.939453 C 2.8494531 11.529453 2.8494531 12.480547 3.4394531 13.060547 L 8.9394531 18.560547 C 9.2294531 18.850547 9.62 19 10 19 C 10.38 19 10.770547 18.850547 11.060547 18.560547 L 16.560547 13.060547 C 17.150547 12.480547 17.150547 11.529453 16.560547 10.939453 L 7.6191406 2 z M 10 7.2109375 L 14.789062 12 L 5.2109375 12 L 10 7.2109375 z M 30 9.5292969 L 26 13.529297 L 26.939453 14.470703 L 30 11.416016 L 33.060547 14.470703 L 34 13.529297 L 30 9.5292969 z M 19 13.5 C 19 13.5 17 15.67 17 17 C 17 18.1 17.9 19 19 19 C 20.1 19 21 18.1 21 17 C 21 15.67 19 13.5 19 13.5 z "/>
+
+    <path
+        android:fillAlpha="0.36"
+        android:fillColor="#FFFFFF"
+        android:pathData="m 0,20 24,0 0,4 -24,0 z"/>
+</vector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_bold_checked.xml b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_bold_checked.xml
new file mode 100644
index 00000000..52465fb5
--- /dev/null
+++ b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_bold_checked.xml
@@ -0,0 +1,32 @@
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="36dp"
+        android:height="36dp"
+        android:viewportHeight="24.000002"
+        android:viewportWidth="24.000002">
+    <path
+        android:fillColor="#8034B5E5"
+        android:pathData="M0 0h24v24H0z"
+        android:strokeColor="#FF34B5E5"
+        android:strokeWidth="1"/>
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M15.6,10.79c0.97,-0.67 1.65,-1.77 1.65,-2.79 0,-2.26 -1.75,-4 -4,-4L7,4v14h7.04c2.09,0 3.71,-1.7 3.71,-3.79 0,-1.52 -0.86,-2.82 -2.15,-3.42zM10,6.5h3c0.83,0 1.5,0.67 1.5,1.5s-0.67,1.5 -1.5,1.5h-3v-3zM13.5,15.5L10,15.5v-3h3.5c0.83,0 1.5,0.67 1.5,1.5s-0.67,1.5 -1.5,1.5z"/>
+</vector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_bold_dark.xml b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_bold_dark.xml
new file mode 100644
index 00000000..0645c90f
--- /dev/null
+++ b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_bold_dark.xml
@@ -0,0 +1,30 @@
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="36dp"
+        android:height="36dp"
+        android:viewportHeight="24.000002"
+        android:viewportWidth="24.000002">
+    <path
+        android:fillColor="#404040"
+        android:pathData="M0 0h24v24H0z"/>
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M15.6,10.79c0.97,-0.67 1.65,-1.77 1.65,-2.79 0,-2.26 -1.75,-4 -4,-4L7,4v14h7.04c2.09,0 3.71,-1.7 3.71,-3.79 0,-1.52 -0.86,-2.82 -2.15,-3.42zM10,6.5h3c0.83,0 1.5,0.67 1.5,1.5s-0.67,1.5 -1.5,1.5h-3v-3zM13.5,15.5L10,15.5v-3h3.5c0.83,0 1.5,0.67 1.5,1.5s-0.67,1.5 -1.5,1.5z"/>
+</vector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_bold_light.xml b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_bold_light.xml
new file mode 100644
index 00000000..eea80074
--- /dev/null
+++ b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_bold_light.xml
@@ -0,0 +1,30 @@
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="36dp"
+        android:height="36dp"
+        android:viewportHeight="24.000002"
+        android:viewportWidth="24.000002">
+    <path
+        android:fillColor="#E4E4E4"
+        android:pathData="M0 0h24v24H0z"/>
+    <path
+        android:fillColor="#404040"
+        android:pathData="M15.6,10.79c0.97,-0.67 1.65,-1.77 1.65,-2.79 0,-2.26 -1.75,-4 -4,-4L7,4v14h7.04c2.09,0 3.71,-1.7 3.71,-3.79 0,-1.52 -0.86,-2.82 -2.15,-3.42zM10,6.5h3c0.83,0 1.5,0.67 1.5,1.5s-0.67,1.5 -1.5,1.5h-3v-3zM13.5,15.5L10,15.5v-3h3.5c0.83,0 1.5,0.67 1.5,1.5s-0.67,1.5 -1.5,1.5z"/>
+</vector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_bold_pressed.xml b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_bold_pressed.xml
new file mode 100644
index 00000000..2baf6e4d
--- /dev/null
+++ b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_bold_pressed.xml
@@ -0,0 +1,30 @@
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="36dp"
+        android:height="36dp"
+        android:viewportHeight="24.000002"
+        android:viewportWidth="24.000002">
+    <path
+        android:fillColor="#FF34B5E5"
+        android:pathData="M0 0h24v24H0z"/>
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M15.6,10.79c0.97,-0.67 1.65,-1.77 1.65,-2.79 0,-2.26 -1.75,-4 -4,-4L7,4v14h7.04c2.09,0 3.71,-1.7 3.71,-3.79 0,-1.52 -0.86,-2.82 -2.15,-3.42zM10,6.5h3c0.83,0 1.5,0.67 1.5,1.5s-0.67,1.5 -1.5,1.5h-3v-3zM13.5,15.5L10,15.5v-3h3.5c0.83,0 1.5,0.67 1.5,1.5s-0.67,1.5 -1.5,1.5z"/>
+</vector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_bullet_checked.xml b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_bullet_checked.xml
new file mode 100644
index 00000000..344cd798
--- /dev/null
+++ b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_bullet_checked.xml
@@ -0,0 +1,32 @@
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="36dp"
+        android:height="36dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#8034B5E5"
+        android:pathData="M0 0h24v24H0z"
+        android:strokeColor="#FF34B5E5"
+        android:strokeWidth="1"/>
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M4,10.5c-0.83,0 -1.5,0.67 -1.5,1.5s0.67,1.5 1.5,1.5 1.5,-0.67 1.5,-1.5 -0.67,-1.5 -1.5,-1.5zM4,4.5c-0.83,0 -1.5,0.67 -1.5,1.5S3.17,7.5 4,7.5 5.5,6.83 5.5,6 4.83,4.5 4,4.5zM4,16.67c-0.74,0 -1.33,0.6 -1.33,1.33s0.6,1.33 1.33,1.33 1.33,-0.6 1.33,-1.33 -0.59,-1.33 -1.33,-1.33zM7,19h14v-2L7,17v2zM7,13h14v-2L7,11v2zM7,5v2h14L21,5L7,5z"/>
+</vector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_bullet_dark.xml b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_bullet_dark.xml
new file mode 100644
index 00000000..d72061d6
--- /dev/null
+++ b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_bullet_dark.xml
@@ -0,0 +1,30 @@
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="36dp"
+        android:height="36dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#404040"
+        android:pathData="M0 0h24v24H0z"/>
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M4,10.5c-0.83,0 -1.5,0.67 -1.5,1.5s0.67,1.5 1.5,1.5 1.5,-0.67 1.5,-1.5 -0.67,-1.5 -1.5,-1.5zM4,4.5c-0.83,0 -1.5,0.67 -1.5,1.5S3.17,7.5 4,7.5 5.5,6.83 5.5,6 4.83,4.5 4,4.5zM4,16.67c-0.74,0 -1.33,0.6 -1.33,1.33s0.6,1.33 1.33,1.33 1.33,-0.6 1.33,-1.33 -0.59,-1.33 -1.33,-1.33zM7,19h14v-2L7,17v2zM7,13h14v-2L7,11v2zM7,5v2h14L21,5L7,5z"/>
+</vector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_bullet_light.xml b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_bullet_light.xml
new file mode 100644
index 00000000..8514ddfc
--- /dev/null
+++ b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_bullet_light.xml
@@ -0,0 +1,30 @@
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="36dp"
+        android:height="36dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#E4E4E4"
+        android:pathData="M0 0h24v24H0z"/>
+    <path
+        android:fillColor="#404040"
+        android:pathData="M4,10.5c-0.83,0 -1.5,0.67 -1.5,1.5s0.67,1.5 1.5,1.5 1.5,-0.67 1.5,-1.5 -0.67,-1.5 -1.5,-1.5zM4,4.5c-0.83,0 -1.5,0.67 -1.5,1.5S3.17,7.5 4,7.5 5.5,6.83 5.5,6 4.83,4.5 4,4.5zM4,16.67c-0.74,0 -1.33,0.6 -1.33,1.33s0.6,1.33 1.33,1.33 1.33,-0.6 1.33,-1.33 -0.59,-1.33 -1.33,-1.33zM7,19h14v-2L7,17v2zM7,13h14v-2L7,11v2zM7,5v2h14L21,5L7,5z"/>
+</vector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_bullet_pressed.xml b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_bullet_pressed.xml
new file mode 100644
index 00000000..cea0828c
--- /dev/null
+++ b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_bullet_pressed.xml
@@ -0,0 +1,30 @@
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="36dp"
+        android:height="36dp"
+        android:viewportHeight="24.0"
+        android:viewportWidth="24.0">
+    <path
+        android:fillColor="#FF34B5E5"
+        android:pathData="M0 0h24v24H0z"/>
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M4,10.5c-0.83,0 -1.5,0.67 -1.5,1.5s0.67,1.5 1.5,1.5 1.5,-0.67 1.5,-1.5 -0.67,-1.5 -1.5,-1.5zM4,4.5c-0.83,0 -1.5,0.67 -1.5,1.5S3.17,7.5 4,7.5 5.5,6.83 5.5,6 4.83,4.5 4,4.5zM4,16.67c-0.74,0 -1.33,0.6 -1.33,1.33s0.6,1.33 1.33,1.33 1.33,-0.6 1.33,-1.33 -0.59,-1.33 -1.33,-1.33zM7,19h14v-2L7,17v2zM7,13h14v-2L7,11v2zM7,5v2h14L21,5L7,5z"/>
+</vector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_capture_dark.xml b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_capture_dark.xml
new file mode 100644
index 00000000..05054fb4
--- /dev/null
+++ b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_capture_dark.xml
@@ -0,0 +1,30 @@
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="36dp"
+        android:height="36dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#404040"
+        android:pathData="M0 0h24v24H0z"/>
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M9,2L7.17,4L4,4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2h-3.17L15,2L9,2zM12,17c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5z"/>
+</vector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_capture_light.xml b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_capture_light.xml
new file mode 100644
index 00000000..d2462f25
--- /dev/null
+++ b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_capture_light.xml
@@ -0,0 +1,30 @@
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="36dp"
+        android:height="36dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#E4E4E4"
+        android:pathData="M0 0h24v24H0z"/>
+    <path
+        android:fillColor="#404040"
+        android:pathData="M9,2L7.17,4L4,4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2h-3.17L15,2L9,2zM12,17c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5z"/>
+</vector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_capture_pressed.xml b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_capture_pressed.xml
new file mode 100644
index 00000000..ec5eebd2
--- /dev/null
+++ b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_capture_pressed.xml
@@ -0,0 +1,30 @@
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="36dp"
+        android:height="36dp"
+        android:viewportHeight="24.0"
+        android:viewportWidth="24.0">
+    <path
+        android:fillColor="#FF34B5E5"
+        android:pathData="M0 0h24v24H0z"/>
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M9,2L7.17,4L4,4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2h-3.17L15,2L9,2zM12,17c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5z"/>
+</vector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_clear_dark.xml b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_clear_dark.xml
new file mode 100644
index 00000000..0bbab849
--- /dev/null
+++ b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_clear_dark.xml
@@ -0,0 +1,30 @@
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="36dp"
+        android:height="36dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#404040"
+        android:pathData="M0 0h24v24H0z"/>
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M3.27,5L2,6.27l6.97,6.97L6.5,19h3l1.57,-3.66L16.73,21 18,19.73 3.55,5.27 3.27,5zM6,5v0.18L8.82,8h2.4l-0.72,1.68 2.1,2.1L14.21,8H20V5H6z"/>
+</vector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_clear_light.xml b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_clear_light.xml
new file mode 100644
index 00000000..dfa40791
--- /dev/null
+++ b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_clear_light.xml
@@ -0,0 +1,30 @@
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="36dp"
+        android:height="36dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#E4E4E4"
+        android:pathData="M0 0h24v24H0z"/>
+    <path
+        android:fillColor="#404040"
+        android:pathData="M3.27,5L2,6.27l6.97,6.97L6.5,19h3l1.57,-3.66L16.73,21 18,19.73 3.55,5.27 3.27,5zM6,5v0.18L8.82,8h2.4l-0.72,1.68 2.1,2.1L14.21,8H20V5H6z"/>
+</vector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_clear_pressed.xml b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_clear_pressed.xml
new file mode 100644
index 00000000..8125bff9
--- /dev/null
+++ b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_clear_pressed.xml
@@ -0,0 +1,30 @@
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="36dp"
+        android:height="36dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF34B5E5"
+        android:pathData="M0 0h24v24H0z"/>
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M3.27,5L2,6.27l6.97,6.97L6.5,19h3l1.57,-3.66L16.73,21 18,19.73 3.55,5.27 3.27,5zM6,5v0.18L8.82,8h2.4l-0.72,1.68 2.1,2.1L14.21,8H20V5H6z"/>
+</vector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_dec_indent_checked.xml b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_dec_indent_checked.xml
new file mode 100644
index 00000000..db4982f0
--- /dev/null
+++ b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_dec_indent_checked.xml
@@ -0,0 +1,32 @@
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="36dp"
+        android:height="36dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#8034B5E5"
+        android:pathData="M0 0h24v24H0z"
+        android:strokeColor="#FF34B5E5"
+        android:strokeWidth="1"/>
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M11,17h10v-2L11,15v2zM3,12l4,4L7,8l-4,4zM3,21h18v-2L3,19v2zM3,3v2h18L21,3L3,3zM11,9h10L21,7L11,7v2zM11,13h10v-2L11,11v2z"/>
+</vector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_dec_indent_dark.xml b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_dec_indent_dark.xml
new file mode 100644
index 00000000..e70252ea
--- /dev/null
+++ b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_dec_indent_dark.xml
@@ -0,0 +1,30 @@
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="36dp"
+        android:height="36dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#404040"
+        android:pathData="M0 0h24v24H0z"/>
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M11,17h10v-2L11,15v2zM3,12l4,4L7,8l-4,4zM3,21h18v-2L3,19v2zM3,3v2h18L21,3L3,3zM11,9h10L21,7L11,7v2zM11,13h10v-2L11,11v2z"/>
+</vector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_dec_indent_light.xml b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_dec_indent_light.xml
new file mode 100644
index 00000000..53c7c203
--- /dev/null
+++ b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_dec_indent_light.xml
@@ -0,0 +1,30 @@
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="36dp"
+        android:height="36dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#E4E4E4"
+        android:pathData="M0 0h24v24H0z"/>
+    <path
+        android:fillColor="#404040"
+        android:pathData="M11,17h10v-2L11,15v2zM3,12l4,4L7,8l-4,4zM3,21h18v-2L3,19v2zM3,3v2h18L21,3L3,3zM11,9h10L21,7L11,7v2zM11,13h10v-2L11,11v2z"/>
+</vector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_dec_indent_pressed.xml b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_dec_indent_pressed.xml
new file mode 100644
index 00000000..3d7d6854
--- /dev/null
+++ b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_dec_indent_pressed.xml
@@ -0,0 +1,30 @@
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="36dp"
+        android:height="36dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF34B5E5"
+        android:pathData="M0 0h24v24H0z"/>
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M11,17h10v-2L11,15v2zM3,12l4,4L7,8l-4,4zM3,21h18v-2L3,19v2zM3,3v2h18L21,3L3,3zM11,9h10L21,7L11,7v2zM11,13h10v-2L11,11v2z"/>
+</vector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_fontcolor_checked.xml b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_fontcolor_checked.xml
new file mode 100644
index 00000000..cb824558
--- /dev/null
+++ b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_fontcolor_checked.xml
@@ -0,0 +1,38 @@
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="54dp"
+        android:height="36dp"
+        android:viewportHeight="24.00"
+        android:viewportWidth="36.00">
+    <path
+        android:fillColor="#8034B5E5"
+        android:pathData="M 0,0 36,0 36,24 0,24 Z"
+        android:strokeColor="#FF34B5E5"
+        android:strokeWidth="1"/>
+
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M 11.003906 3.5 L 5.5039062 17.5 L 7.7539062 17.5 L 8.8730469 14.5 L 15.123047 14.5 L 16.244141 17.5 L 18.494141 17.5 L 13.003906 3.5 L 11.003906 3.5 z M 12.003906 6.1699219 L 14.382812 12.5 L 9.6230469 12.5 L 12.003906 6.1699219 z M 30 9.5292969 L 26 13.529297 L 26.939453 14.470703 L 30 11.416016 L 33.060547 14.470703 L 34 13.529297 L 30 9.5292969 z "
+        />
+    <path
+        android:fillAlpha="0.36"
+        android:fillColor="#FFFFFF"
+        android:pathData="m 0,20 24,0 0,4 -24,0 z"/>
+</vector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_fontcolor_dark.xml b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_fontcolor_dark.xml
new file mode 100644
index 00000000..7f49f5a3
--- /dev/null
+++ b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_fontcolor_dark.xml
@@ -0,0 +1,37 @@
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="54dp"
+        android:height="36dp"
+        android:viewportHeight="24.00"
+        android:viewportWidth="36.00">
+    <path
+        android:fillColor="#404040"
+        android:pathData="M 0,0 36,0 36,24 0,24 Z"/>
+
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M 11.003906 3.5 L 5.5039062 17.5 L 7.7539062 17.5 L 8.8730469 14.5 L 15.123047 14.5 L 16.244141 17.5 L 18.494141 17.5 L 13.003906 3.5 L 11.003906 3.5 z M 12.003906 6.1699219 L 14.382812 12.5 L 9.6230469 12.5 L 12.003906 6.1699219 z M 30 9.5292969 L 26 13.529297 L 26.939453 14.470703 L 30 11.416016 L 33.060547 14.470703 L 34 13.529297 L 30 9.5292969 z "
+        />
+    <path
+        android:fillAlpha="0.36"
+        android:fillColor="#FFFFFF"
+        android:pathData="m 0,20 24,0 0,4 -24,0 z"/>
+
+</vector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_fontcolor_light.xml b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_fontcolor_light.xml
new file mode 100644
index 00000000..3b1cdf4c
--- /dev/null
+++ b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_fontcolor_light.xml
@@ -0,0 +1,36 @@
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="54dp"
+        android:height="36dp"
+        android:viewportHeight="24.00"
+        android:viewportWidth="36.00">
+    <path
+        android:fillColor="#E4E4E4"
+        android:pathData="M 0,0 36,0 36,24 0,24 Z"/>
+
+    <path
+        android:fillColor="#404040"
+        android:pathData="M 11.003906 3.5 L 5.5039062 17.5 L 7.7539062 17.5 L 8.8730469 14.5 L 15.123047 14.5 L 16.244141 17.5 L 18.494141 17.5 L 13.003906 3.5 L 11.003906 3.5 z M 12.003906 6.1699219 L 14.382812 12.5 L 9.6230469 12.5 L 12.003906 6.1699219 z M 30 9.5292969 L 26 13.529297 L 26.939453 14.470703 L 30 11.416016 L 33.060547 14.470703 L 34 13.529297 L 30 9.5292969 z "
+        />
+    <path
+        android:fillAlpha="0.36"
+        android:fillColor="#000000"
+        android:pathData="m 0,20 24,0 0,4 -24,0 z"/>
+</vector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_fontcolor_pressed.xml b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_fontcolor_pressed.xml
new file mode 100644
index 00000000..eb16a312
--- /dev/null
+++ b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_fontcolor_pressed.xml
@@ -0,0 +1,36 @@
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="54dp"
+        android:height="36dp"
+        android:viewportHeight="24.00"
+        android:viewportWidth="36.00">
+    <path
+        android:fillColor="#FF34B5E5"
+        android:pathData="M 0,0 36,0 36,24 0,24 Z"/>
+
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M 11.003906 3.5 L 5.5039062 17.5 L 7.7539062 17.5 L 8.8730469 14.5 L 15.123047 14.5 L 16.244141 17.5 L 18.494141 17.5 L 13.003906 3.5 L 11.003906 3.5 z M 12.003906 6.1699219 L 14.382812 12.5 L 9.6230469 12.5 L 12.003906 6.1699219 z M 30 9.5292969 L 26 13.529297 L 26.939453 14.470703 L 30 11.416016 L 33.060547 14.470703 L 34 13.529297 L 30 9.5292969 z "
+/>
+    <path
+        android:fillAlpha="0.36"
+        android:fillColor="#FFFFFF"
+        android:pathData="m 0,20 24,0 0,4 -24,0 z"/>
+</vector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_fontsize_checked.xml b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_fontsize_checked.xml
new file mode 100644
index 00000000..600498de
--- /dev/null
+++ b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_fontsize_checked.xml
@@ -0,0 +1,33 @@
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="54dp"
+        android:height="36dp"
+        android:viewportHeight="24.00"
+        android:viewportWidth="36.00">
+    <path
+        android:fillColor="#8034B5E5"
+        android:pathData="M 0,0 36,0 36,24 0,24 Z"
+        android:strokeColor="#FF34B5E5"
+        android:strokeWidth="1"/>
+
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M 30,9.5292969 26,13.529297 26.939453,14.470703 30,11.416016 33.060547,14.470703 34,13.529297 30,9.5292969 Z"/>
+</vector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_fontsize_dark.xml b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_fontsize_dark.xml
new file mode 100644
index 00000000..00a7f33d
--- /dev/null
+++ b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_fontsize_dark.xml
@@ -0,0 +1,32 @@
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="54dp"
+        android:height="36dp"
+        android:viewportHeight="24.00"
+        android:viewportWidth="36.00">
+    <path
+        android:fillColor="#404040"
+        android:pathData="M 0,0 36,0 36,24 0,24 Z"/>
+
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M 30,9.5292969 26,13.529297 26.939453,14.470703 30,11.416016 33.060547,14.470703 34,13.529297 30,9.5292969 Z"/>
+
+</vector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_fontsize_light.xml b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_fontsize_light.xml
new file mode 100644
index 00000000..a9ad932c
--- /dev/null
+++ b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_fontsize_light.xml
@@ -0,0 +1,31 @@
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="54dp"
+        android:height="36dp"
+        android:viewportHeight="24.00"
+        android:viewportWidth="36.00">
+    <path
+        android:fillColor="#E4E4E4"
+        android:pathData="M 0,0 36,0 36,24 0,24 Z"/>
+
+    <path
+        android:fillColor="#404040"
+        android:pathData="M 30,9.5292969 26,13.529297 26.939453,14.470703 30,11.416016 33.060547,14.470703 34,13.529297 30,9.5292969 Z"/>
+</vector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_fontsize_pressed.xml b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_fontsize_pressed.xml
new file mode 100644
index 00000000..979f3851
--- /dev/null
+++ b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_fontsize_pressed.xml
@@ -0,0 +1,30 @@
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="54dp"
+        android:height="36dp"
+        android:viewportHeight="24.00"
+        android:viewportWidth="36.00">
+    <path
+        android:fillColor="#FF34B5E5"
+        android:pathData="M 0,0 36,0 36,24 0,24 Z"/>
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M 30,9.5292969 26,13.529297 26.939453,14.470703 30,11.416016 33.060547,14.470703 34,13.529297 30,9.5292969 Z"/>
+</vector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_gif_dark.xml b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_gif_dark.xml
new file mode 100644
index 00000000..b5e407dc
--- /dev/null
+++ b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_gif_dark.xml
@@ -0,0 +1,31 @@
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="36dp"
+        android:height="36dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#404040"
+        android:pathData="M0 0h24v24H0z"/>
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M11.5,9L13,9v6h-1.5zM9,9L6,9c-0.6,0 -1,0.5 -1,1v4c0,0.5 0.4,1 1,1h3c0.6,0 1,-0.5 1,-1v-2L8.5,12v1.5h-2v-3L10,10.5L10,10c0,-0.5 -0.4,-1 -1,-1zM19,10.5L19,9h-4.5v6L16,15v-2h2v-1.5h-2v-1z"/>
+    />
+</vector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_gif_light.xml b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_gif_light.xml
new file mode 100644
index 00000000..4149edd4
--- /dev/null
+++ b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_gif_light.xml
@@ -0,0 +1,30 @@
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="36dp"
+        android:height="36dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#E4E4E4"
+        android:pathData="M0 0h24v24H0z"/>
+    <path
+        android:fillColor="#404040"
+        android:pathData="M11.5,9L13,9v6h-1.5zM9,9L6,9c-0.6,0 -1,0.5 -1,1v4c0,0.5 0.4,1 1,1h3c0.6,0 1,-0.5 1,-1v-2L8.5,12v1.5h-2v-3L10,10.5L10,10c0,-0.5 -0.4,-1 -1,-1zM19,10.5L19,9h-4.5v6L16,15v-2h2v-1.5h-2v-1z"/>
+</vector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_gif_pressed.xml b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_gif_pressed.xml
new file mode 100644
index 00000000..f41baccb
--- /dev/null
+++ b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_gif_pressed.xml
@@ -0,0 +1,30 @@
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="36dp"
+        android:height="36dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF34B5E5"
+        android:pathData="M0 0h24v24H0z"/>
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M11.5,9L13,9v6h-1.5zM9,9L6,9c-0.6,0 -1,0.5 -1,1v4c0,0.5 0.4,1 1,1h3c0.6,0 1,-0.5 1,-1v-2L8.5,12v1.5h-2v-3L10,10.5L10,10c0,-0.5 -0.4,-1 -1,-1zM19,10.5L19,9h-4.5v6L16,15v-2h2v-1.5h-2v-1z"/>
+</vector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_image_dark.xml b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_image_dark.xml
new file mode 100644
index 00000000..85c4b68d
--- /dev/null
+++ b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_image_dark.xml
@@ -0,0 +1,30 @@
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="36dp"
+        android:height="36dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#404040"
+        android:pathData="M0 0h24v24H0z"/>
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M21,19V5c0,-1.1 -0.9,-2 -2,-2H5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2zM8.5,13.5l2.5,3.01L14.5,12l4.5,6H5l3.5,-4.5z"/>
+</vector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_image_light.xml b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_image_light.xml
new file mode 100644
index 00000000..c0ef2e28
--- /dev/null
+++ b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_image_light.xml
@@ -0,0 +1,30 @@
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="36dp"
+        android:height="36dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#E4E4E4"
+        android:pathData="M0 0h24v24H0z"/>
+    <path
+        android:fillColor="#404040"
+        android:pathData="M21,19V5c0,-1.1 -0.9,-2 -2,-2H5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2zM8.5,13.5l2.5,3.01L14.5,12l4.5,6H5l3.5,-4.5z"/>
+</vector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_image_pressed.xml b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_image_pressed.xml
new file mode 100644
index 00000000..a299e274
--- /dev/null
+++ b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_image_pressed.xml
@@ -0,0 +1,30 @@
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="36dp"
+        android:height="36dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF34B5E5"
+        android:pathData="M0 0h24v24H0z"/>
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M21,19V5c0,-1.1 -0.9,-2 -2,-2H5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2zM8.5,13.5l2.5,3.01L14.5,12l4.5,6H5l3.5,-4.5z"/>
+</vector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_inc_indent_checked.xml b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_inc_indent_checked.xml
new file mode 100644
index 00000000..8d5ad381
--- /dev/null
+++ b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_inc_indent_checked.xml
@@ -0,0 +1,32 @@
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="36dp"
+        android:height="36dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#8034B5E5"
+        android:pathData="M0 0h24v24H0z"
+        android:strokeColor="#FF34B5E5"
+        android:strokeWidth="1"/>
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M3,21h18v-2L3,19v2zM3,8v8l4,-4 -4,-4zM11,17h10v-2L11,15v2zM3,3v2h18L21,3L3,3zM11,9h10L21,7L11,7v2zM11,13h10v-2L11,11v2z"/>
+</vector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_inc_indent_dark.xml b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_inc_indent_dark.xml
new file mode 100644
index 00000000..b2f33b11
--- /dev/null
+++ b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_inc_indent_dark.xml
@@ -0,0 +1,30 @@
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="36dp"
+        android:height="36dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#404040"
+        android:pathData="M0 0h24v24H0z"/>
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M3,21h18v-2L3,19v2zM3,8v8l4,-4 -4,-4zM11,17h10v-2L11,15v2zM3,3v2h18L21,3L3,3zM11,9h10L21,7L11,7v2zM11,13h10v-2L11,11v2z"/>
+</vector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_inc_indent_light.xml b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_inc_indent_light.xml
new file mode 100644
index 00000000..93eaf917
--- /dev/null
+++ b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_inc_indent_light.xml
@@ -0,0 +1,30 @@
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="36dp"
+        android:height="36dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#E4E4E4"
+        android:pathData="M0 0h24v24H0z"/>
+    <path
+        android:fillColor="#404040"
+        android:pathData="M3,21h18v-2L3,19v2zM3,8v8l4,-4 -4,-4zM11,17h10v-2L11,15v2zM3,3v2h18L21,3L3,3zM11,9h10L21,7L11,7v2zM11,13h10v-2L11,11v2z"/>
+</vector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_inc_indent_pressed.xml b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_inc_indent_pressed.xml
new file mode 100644
index 00000000..d3f697d0
--- /dev/null
+++ b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_inc_indent_pressed.xml
@@ -0,0 +1,30 @@
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="36dp"
+        android:height="36dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF34B5E5"
+        android:pathData="M0 0h24v24H0z"/>
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M3,21h18v-2L3,19v2zM3,8v8l4,-4 -4,-4zM11,17h10v-2L11,15v2zM3,3v2h18L21,3L3,3zM11,9h10L21,7L11,7v2zM11,13h10v-2L11,11v2z"/>
+</vector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_italic_checked.xml b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_italic_checked.xml
new file mode 100644
index 00000000..181d27ad
--- /dev/null
+++ b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_italic_checked.xml
@@ -0,0 +1,32 @@
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="36dp"
+        android:height="36dp"
+        android:viewportHeight="24.000002"
+        android:viewportWidth="24.000002">
+    <path
+        android:fillColor="#8034B5E5"
+        android:pathData="M0 0h24v24H0z"
+        android:strokeColor="#FF34B5E5"
+        android:strokeWidth="1"/>
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M10,4v3h2.21l-3.42,8H6v3h8v-3h-2.21l3.42,-8H18V4z"/>
+</vector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_italic_dark.xml b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_italic_dark.xml
new file mode 100644
index 00000000..d25c3ecb
--- /dev/null
+++ b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_italic_dark.xml
@@ -0,0 +1,29 @@
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="36dp"
+        android:height="36dp"
+        android:viewportHeight="24.000002"
+        android:viewportWidth="24.000002">
+    <path
+        android:fillColor="#404040"
+        android:pathData="M0 0h24v24H0z"/>
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M10,4v3h2.21l-3.42,8H6v3h8v-3h-2.21l3.42,-8H18V4z"/></vector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_italic_light.xml b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_italic_light.xml
new file mode 100644
index 00000000..3f28077a
--- /dev/null
+++ b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_italic_light.xml
@@ -0,0 +1,29 @@
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="36dp"
+        android:height="36dp"
+        android:viewportHeight="24.000002"
+        android:viewportWidth="24.000002">
+    <path
+        android:fillColor="#E4E4E4"
+        android:pathData="M0 0h24v24H0z"/>
+    <path
+        android:fillColor="#404040"
+        android:pathData="M10,4v3h2.21l-3.42,8H6v3h8v-3h-2.21l3.42,-8H18V4z"/></vector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_italic_pressed.xml b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_italic_pressed.xml
new file mode 100644
index 00000000..cecea728
--- /dev/null
+++ b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_italic_pressed.xml
@@ -0,0 +1,29 @@
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="36dp"
+        android:height="36dp"
+        android:viewportHeight="24.000002"
+        android:viewportWidth="24.000002">
+    <path
+        android:fillColor="#FF34B5E5"
+        android:pathData="M0 0h24v24H0z"/>
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M10,4v3h2.21l-3.42,8H6v3h8v-3h-2.21l3.42,-8H18V4z"/></vector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_link_checked.xml b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_link_checked.xml
new file mode 100644
index 00000000..cec6bc59
--- /dev/null
+++ b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_link_checked.xml
@@ -0,0 +1,33 @@
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="36dp"
+        android:height="36dp"
+        android:viewportHeight="24.000002"
+        android:viewportWidth="24.000002">
+    <path
+        android:fillColor="#8034B5E5"
+        android:pathData="M0 0h24v24H0z"
+        android:strokeColor="#FF34B5E5"
+        android:strokeWidth="1"/>
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M3.9,12c0,-1.71 1.39,-3.1 3.1,-3.1h4L11,7L7,7c-2.76,0 -5,2.24 -5,5s2.24,5 5,5h4v-1.9L7,15.1c-1.71,0 -3.1,-1.39 -3.1,-3.1zM8,13h8v-2L8,11v2zM17,7h-4v1.9h4c1.71,0 3.1,1.39 3.1,3.1s-1.39,3.1 -3.1,3.1h-4L13,17h4c2.76,0 5,-2.24 5,-5s-2.24,-5 -5,-5z"/>
+
+</vector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_link_dark.xml b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_link_dark.xml
new file mode 100644
index 00000000..85a723f5
--- /dev/null
+++ b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_link_dark.xml
@@ -0,0 +1,30 @@
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="36dp"
+        android:height="36dp"
+        android:viewportHeight="24.000002"
+        android:viewportWidth="24.000002">
+    <path
+        android:fillColor="#404040"
+        android:pathData="M0 0h24v24H0z"/>
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M3.9,12c0,-1.71 1.39,-3.1 3.1,-3.1h4L11,7L7,7c-2.76,0 -5,2.24 -5,5s2.24,5 5,5h4v-1.9L7,15.1c-1.71,0 -3.1,-1.39 -3.1,-3.1zM8,13h8v-2L8,11v2zM17,7h-4v1.9h4c1.71,0 3.1,1.39 3.1,3.1s-1.39,3.1 -3.1,3.1h-4L13,17h4c2.76,0 5,-2.24 5,-5s-2.24,-5 -5,-5z"/>
+</vector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_link_light.xml b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_link_light.xml
new file mode 100644
index 00000000..18b80eac
--- /dev/null
+++ b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_link_light.xml
@@ -0,0 +1,30 @@
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="36dp"
+        android:height="36dp"
+        android:viewportHeight="24.000002"
+        android:viewportWidth="24.000002">
+    <path
+        android:fillColor="#E4E4E4"
+        android:pathData="M0 0h24v24H0z"/>
+    <path
+        android:fillColor="#404040"
+        android:pathData="M3.9,12c0,-1.71 1.39,-3.1 3.1,-3.1h4L11,7L7,7c-2.76,0 -5,2.24 -5,5s2.24,5 5,5h4v-1.9L7,15.1c-1.71,0 -3.1,-1.39 -3.1,-3.1zM8,13h8v-2L8,11v2zM17,7h-4v1.9h4c1.71,0 3.1,1.39 3.1,3.1s-1.39,3.1 -3.1,3.1h-4L13,17h4c2.76,0 5,-2.24 5,-5s-2.24,-5 -5,-5z"/>
+</vector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_link_pressed.xml b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_link_pressed.xml
new file mode 100644
index 00000000..c39fe25d
--- /dev/null
+++ b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_link_pressed.xml
@@ -0,0 +1,31 @@
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="36dp"
+        android:height="36dp"
+        android:viewportHeight="24.000002"
+        android:viewportWidth="24.000002">
+    <path
+        android:fillColor="#FF34B5E5"
+        android:pathData="M0 0h24v24H0z"/>
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M3.9,12c0,-1.71 1.39,-3.1 3.1,-3.1h4L11,7L7,7c-2.76,0 -5,2.24 -5,5s2.24,5 5,5h4v-1.9L7,15.1c-1.71,0 -3.1,-1.39 -3.1,-3.1zM8,13h8v-2L8,11v2zM17,7h-4v1.9h4c1.71,0 3.1,1.39 3.1,3.1s-1.39,3.1 -3.1,3.1h-4L13,17h4c2.76,0 5,-2.24 5,-5s-2.24,-5 -5,-5z"/>
+
+</vector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_number_checked.xml b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_number_checked.xml
new file mode 100644
index 00000000..37c916b8
--- /dev/null
+++ b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_number_checked.xml
@@ -0,0 +1,33 @@
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="36dp"
+        android:height="36dp"
+        android:viewportHeight="24.000002"
+        android:viewportWidth="24.000002">
+    <path
+        android:fillColor="#8034B5E5"
+        android:pathData="M0 0h24v24H0z"
+        android:strokeColor="#FF34B5E5"
+        android:strokeWidth="1"/>
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M2,17h2v0.5L3,17.5v1h1v0.5L2,19v1h3v-4L2,16v1zM3,8h1L4,4L2,4v1h1v3zM2,11h1.8L2,13.1v0.9h3v-1L3.2,13L5,10.9L5,10L2,10v1zM7,5v2h14L21,5L7,5zM7,19h14v-2L7,17v2zM7,13h14v-2L7,11v2z"/>
+
+</vector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_number_dark.xml b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_number_dark.xml
new file mode 100644
index 00000000..48f9c878
--- /dev/null
+++ b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_number_dark.xml
@@ -0,0 +1,30 @@
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="36dp"
+        android:height="36dp"
+        android:viewportHeight="24.000002"
+        android:viewportWidth="24.000002">
+    <path
+        android:fillColor="#404040"
+        android:pathData="M0 0h24v24H0z"/>
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M2,17h2v0.5L3,17.5v1h1v0.5L2,19v1h3v-4L2,16v1zM3,8h1L4,4L2,4v1h1v3zM2,11h1.8L2,13.1v0.9h3v-1L3.2,13L5,10.9L5,10L2,10v1zM7,5v2h14L21,5L7,5zM7,19h14v-2L7,17v2zM7,13h14v-2L7,11v2z"/>
+</vector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_number_light.xml b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_number_light.xml
new file mode 100644
index 00000000..e7a63a1b
--- /dev/null
+++ b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_number_light.xml
@@ -0,0 +1,30 @@
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="36dp"
+        android:height="36dp"
+        android:viewportHeight="24.000002"
+        android:viewportWidth="24.000002">
+    <path
+        android:fillColor="#E4E4E4"
+        android:pathData="M0 0h24v24H0z"/>
+    <path
+        android:fillColor="#404040"
+        android:pathData="M2,17h2v0.5L3,17.5v1h1v0.5L2,19v1h3v-4L2,16v1zM3,8h1L4,4L2,4v1h1v3zM2,11h1.8L2,13.1v0.9h3v-1L3.2,13L5,10.9L5,10L2,10v1zM7,5v2h14L21,5L7,5zM7,19h14v-2L7,17v2zM7,13h14v-2L7,11v2z"/>
+</vector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_number_pressed.xml b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_number_pressed.xml
new file mode 100644
index 00000000..bda888a6
--- /dev/null
+++ b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_number_pressed.xml
@@ -0,0 +1,31 @@
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="36dp"
+        android:height="36dp"
+        android:viewportHeight="24.000002"
+        android:viewportWidth="24.000002">
+    <path
+        android:fillColor="#FF34B5E5"
+        android:pathData="M0 0h24v24H0z"/>
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M2,17h2v0.5L3,17.5v1h1v0.5L2,19v1h3v-4L2,16v1zM3,8h1L4,4L2,4v1h1v3zM2,11h1.8L2,13.1v0.9h3v-1L3.2,13L5,10.9L5,10L2,10v1zM7,5v2h14L21,5L7,5zM7,19h14v-2L7,17v2zM7,13h14v-2L7,11v2z"/>
+
+</vector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_redo_dark.xml b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_redo_dark.xml
new file mode 100644
index 00000000..9e98fda4
--- /dev/null
+++ b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_redo_dark.xml
@@ -0,0 +1,30 @@
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="36dp"
+        android:height="36dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#404040"
+        android:pathData="M0 0h24v24H0z"/>
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M18.4,10.6C16.55,8.99 14.15,8 11.5,8c-4.65,0 -8.58,3.03 -9.96,7.22L3.9,16c1.05,-3.19 4.05,-5.5 7.6,-5.5 1.95,0 3.73,0.72 5.12,1.88L13,16h9V7l-3.6,3.6z"/>
+</vector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_redo_light.xml b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_redo_light.xml
new file mode 100644
index 00000000..bb56c2bb
--- /dev/null
+++ b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_redo_light.xml
@@ -0,0 +1,30 @@
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="36dp"
+        android:height="36dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#E4E4E4"
+        android:pathData="M0 0h24v24H0z"/>
+    <path
+        android:fillColor="#404040"
+        android:pathData="M18.4,10.6C16.55,8.99 14.15,8 11.5,8c-4.65,0 -8.58,3.03 -9.96,7.22L3.9,16c1.05,-3.19 4.05,-5.5 7.6,-5.5 1.95,0 3.73,0.72 5.12,1.88L13,16h9V7l-3.6,3.6z"/>
+</vector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_redo_pressed.xml b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_redo_pressed.xml
new file mode 100644
index 00000000..ef047618
--- /dev/null
+++ b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_redo_pressed.xml
@@ -0,0 +1,30 @@
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="36dp"
+        android:height="36dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF34B5E5"
+        android:pathData="M0 0h24v24H0z"/>
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M18.4,10.6C16.55,8.99 14.15,8 11.5,8c-4.65,0 -8.58,3.03 -9.96,7.22L3.9,16c1.05,-3.19 4.05,-5.5 7.6,-5.5 1.95,0 3.73,0.72 5.12,1.88L13,16h9V7l-3.6,3.6z"/>
+</vector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_strikethrough_checked.xml b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_strikethrough_checked.xml
new file mode 100644
index 00000000..8604ccd0
--- /dev/null
+++ b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_strikethrough_checked.xml
@@ -0,0 +1,33 @@
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="36dp"
+        android:height="36dp"
+        android:viewportHeight="24.000002"
+        android:viewportWidth="24.000002">
+    <path
+        android:fillColor="#8034B5E5"
+        android:pathData="M0 0h24v24H0z"
+        android:strokeColor="#FF34B5E5"
+        android:strokeWidth="1"/>
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M7.24,8.75c-0.26,-0.48 -0.39,-1.03 -0.39,-1.67 0,-0.61 0.13,-1.16 0.4,-1.67 0.26,-0.5 0.63,-0.93 1.11,-1.29 0.48,-0.35 1.05,-0.63 1.7,-0.83 0.66,-0.19 1.39,-0.29 2.18,-0.29 0.81,0 1.54,0.11 2.21,0.34 0.66,0.22 1.23,0.54 1.69,0.94 0.47,0.4 0.83,0.88 1.08,1.43 0.25,0.55 0.38,1.15 0.38,1.81h-3.01c0,-0.31 -0.05,-0.59 -0.15,-0.85 -0.09,-0.27 -0.24,-0.49 -0.44,-0.68 -0.2,-0.19 -0.45,-0.33 -0.75,-0.44 -0.3,-0.1 -0.66,-0.16 -1.06,-0.16 -0.39,0 -0.74,0.04 -1.03,0.13 -0.29,0.09 -0.53,0.21 -0.72,0.36 -0.19,0.16 -0.34,0.34 -0.44,0.55 -0.1,0.21 -0.15,0.43 -0.15,0.66 0,0.48 0.25,0.88 0.74,1.21 0.38,0.25 0.77,0.48 1.41,0.7H7.39c-0.05,-0.08 -0.11,-0.17 -0.15,-0.25zM21,12v-2H3v2h9.62c0.18,0.07 0.4,0.14 0.55,0.2 0.37,0.17 0.66,0.34 0.87,0.51 0.21,0.17 0.35,0.36 0.43,0.57 0.07,0.2 0.11,0.43 0.11,0.69 0,0.23 -0.05,0.45 -0.14,0.66 -0.09,0.2 -0.23,0.38 -0.42,0.53 -0.19,0.15 -0.42,0.26 -0.71,0.35 -0.29,0.08 -0.63,0.13 -1.01,0.13 -0.43,0 -0.83,-0.04 -1.18,-0.13s-0.66,-0.23 -0.91,-0.42c-0.25,-0.19 -0.45,-0.44 -0.59,-0.75 -0.14,-0.31 -0.25,-0.76 -0.25,-1.21H6.4c0,0.55 0.08,1.13 0.24,1.58 0.16,0.45 0.37,0.85 0.65,1.21 0.28,0.35 0.6,0.66 0.98,0.92 0.37,0.26 0.78,0.48 1.22,0.65 0.44,0.17 0.9,0.3 1.38,0.39 0.48,0.08 0.96,0.13 1.44,0.13 0.8,0 1.53,-0.09 2.18,-0.28s1.21,-0.45 1.67,-0.79c0.46,-0.34 0.82,-0.77 1.07,-1.27s0.38,-1.07 0.38,-1.71c0,-0.6 -0.1,-1.14 -0.31,-1.61 -0.05,-0.11 -0.11,-0.23 -0.17,-0.33H21z"
+        />
+</vector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_strikethrough_dark.xml b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_strikethrough_dark.xml
new file mode 100644
index 00000000..7323bfb1
--- /dev/null
+++ b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_strikethrough_dark.xml
@@ -0,0 +1,30 @@
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="36dp"
+        android:height="36dp"
+        android:viewportHeight="24.000002"
+        android:viewportWidth="24.000002">
+    <path
+        android:fillColor="#404040"
+        android:pathData="M0 0h24v24H0z"/>
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M7.24,8.75c-0.26,-0.48 -0.39,-1.03 -0.39,-1.67 0,-0.61 0.13,-1.16 0.4,-1.67 0.26,-0.5 0.63,-0.93 1.11,-1.29 0.48,-0.35 1.05,-0.63 1.7,-0.83 0.66,-0.19 1.39,-0.29 2.18,-0.29 0.81,0 1.54,0.11 2.21,0.34 0.66,0.22 1.23,0.54 1.69,0.94 0.47,0.4 0.83,0.88 1.08,1.43 0.25,0.55 0.38,1.15 0.38,1.81h-3.01c0,-0.31 -0.05,-0.59 -0.15,-0.85 -0.09,-0.27 -0.24,-0.49 -0.44,-0.68 -0.2,-0.19 -0.45,-0.33 -0.75,-0.44 -0.3,-0.1 -0.66,-0.16 -1.06,-0.16 -0.39,0 -0.74,0.04 -1.03,0.13 -0.29,0.09 -0.53,0.21 -0.72,0.36 -0.19,0.16 -0.34,0.34 -0.44,0.55 -0.1,0.21 -0.15,0.43 -0.15,0.66 0,0.48 0.25,0.88 0.74,1.21 0.38,0.25 0.77,0.48 1.41,0.7H7.39c-0.05,-0.08 -0.11,-0.17 -0.15,-0.25zM21,12v-2H3v2h9.62c0.18,0.07 0.4,0.14 0.55,0.2 0.37,0.17 0.66,0.34 0.87,0.51 0.21,0.17 0.35,0.36 0.43,0.57 0.07,0.2 0.11,0.43 0.11,0.69 0,0.23 -0.05,0.45 -0.14,0.66 -0.09,0.2 -0.23,0.38 -0.42,0.53 -0.19,0.15 -0.42,0.26 -0.71,0.35 -0.29,0.08 -0.63,0.13 -1.01,0.13 -0.43,0 -0.83,-0.04 -1.18,-0.13s-0.66,-0.23 -0.91,-0.42c-0.25,-0.19 -0.45,-0.44 -0.59,-0.75 -0.14,-0.31 -0.25,-0.76 -0.25,-1.21H6.4c0,0.55 0.08,1.13 0.24,1.58 0.16,0.45 0.37,0.85 0.65,1.21 0.28,0.35 0.6,0.66 0.98,0.92 0.37,0.26 0.78,0.48 1.22,0.65 0.44,0.17 0.9,0.3 1.38,0.39 0.48,0.08 0.96,0.13 1.44,0.13 0.8,0 1.53,-0.09 2.18,-0.28s1.21,-0.45 1.67,-0.79c0.46,-0.34 0.82,-0.77 1.07,-1.27s0.38,-1.07 0.38,-1.71c0,-0.6 -0.1,-1.14 -0.31,-1.61 -0.05,-0.11 -0.11,-0.23 -0.17,-0.33H21z"
+        /></vector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_strikethrough_light.xml b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_strikethrough_light.xml
new file mode 100644
index 00000000..589120c6
--- /dev/null
+++ b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_strikethrough_light.xml
@@ -0,0 +1,30 @@
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="36dp"
+        android:height="36dp"
+        android:viewportHeight="24.000002"
+        android:viewportWidth="24.000002">
+    <path
+        android:fillColor="#E4E4E4"
+        android:pathData="M0 0h24v24H0z"/>
+    <path
+        android:fillColor="#404040"
+        android:pathData="M7.24,8.75c-0.26,-0.48 -0.39,-1.03 -0.39,-1.67 0,-0.61 0.13,-1.16 0.4,-1.67 0.26,-0.5 0.63,-0.93 1.11,-1.29 0.48,-0.35 1.05,-0.63 1.7,-0.83 0.66,-0.19 1.39,-0.29 2.18,-0.29 0.81,0 1.54,0.11 2.21,0.34 0.66,0.22 1.23,0.54 1.69,0.94 0.47,0.4 0.83,0.88 1.08,1.43 0.25,0.55 0.38,1.15 0.38,1.81h-3.01c0,-0.31 -0.05,-0.59 -0.15,-0.85 -0.09,-0.27 -0.24,-0.49 -0.44,-0.68 -0.2,-0.19 -0.45,-0.33 -0.75,-0.44 -0.3,-0.1 -0.66,-0.16 -1.06,-0.16 -0.39,0 -0.74,0.04 -1.03,0.13 -0.29,0.09 -0.53,0.21 -0.72,0.36 -0.19,0.16 -0.34,0.34 -0.44,0.55 -0.1,0.21 -0.15,0.43 -0.15,0.66 0,0.48 0.25,0.88 0.74,1.21 0.38,0.25 0.77,0.48 1.41,0.7H7.39c-0.05,-0.08 -0.11,-0.17 -0.15,-0.25zM21,12v-2H3v2h9.62c0.18,0.07 0.4,0.14 0.55,0.2 0.37,0.17 0.66,0.34 0.87,0.51 0.21,0.17 0.35,0.36 0.43,0.57 0.07,0.2 0.11,0.43 0.11,0.69 0,0.23 -0.05,0.45 -0.14,0.66 -0.09,0.2 -0.23,0.38 -0.42,0.53 -0.19,0.15 -0.42,0.26 -0.71,0.35 -0.29,0.08 -0.63,0.13 -1.01,0.13 -0.43,0 -0.83,-0.04 -1.18,-0.13s-0.66,-0.23 -0.91,-0.42c-0.25,-0.19 -0.45,-0.44 -0.59,-0.75 -0.14,-0.31 -0.25,-0.76 -0.25,-1.21H6.4c0,0.55 0.08,1.13 0.24,1.58 0.16,0.45 0.37,0.85 0.65,1.21 0.28,0.35 0.6,0.66 0.98,0.92 0.37,0.26 0.78,0.48 1.22,0.65 0.44,0.17 0.9,0.3 1.38,0.39 0.48,0.08 0.96,0.13 1.44,0.13 0.8,0 1.53,-0.09 2.18,-0.28s1.21,-0.45 1.67,-0.79c0.46,-0.34 0.82,-0.77 1.07,-1.27s0.38,-1.07 0.38,-1.71c0,-0.6 -0.1,-1.14 -0.31,-1.61 -0.05,-0.11 -0.11,-0.23 -0.17,-0.33H21z"
+        /></vector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_strikethrough_pressed.xml b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_strikethrough_pressed.xml
new file mode 100644
index 00000000..8a5cd197
--- /dev/null
+++ b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_strikethrough_pressed.xml
@@ -0,0 +1,30 @@
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="36dp"
+        android:height="36dp"
+        android:viewportHeight="24.000002"
+        android:viewportWidth="24.000002">
+    <path
+        android:fillColor="#FF34B5E5"
+        android:pathData="M0 0h24v24H0z"/>
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M7.24,8.75c-0.26,-0.48 -0.39,-1.03 -0.39,-1.67 0,-0.61 0.13,-1.16 0.4,-1.67 0.26,-0.5 0.63,-0.93 1.11,-1.29 0.48,-0.35 1.05,-0.63 1.7,-0.83 0.66,-0.19 1.39,-0.29 2.18,-0.29 0.81,0 1.54,0.11 2.21,0.34 0.66,0.22 1.23,0.54 1.69,0.94 0.47,0.4 0.83,0.88 1.08,1.43 0.25,0.55 0.38,1.15 0.38,1.81h-3.01c0,-0.31 -0.05,-0.59 -0.15,-0.85 -0.09,-0.27 -0.24,-0.49 -0.44,-0.68 -0.2,-0.19 -0.45,-0.33 -0.75,-0.44 -0.3,-0.1 -0.66,-0.16 -1.06,-0.16 -0.39,0 -0.74,0.04 -1.03,0.13 -0.29,0.09 -0.53,0.21 -0.72,0.36 -0.19,0.16 -0.34,0.34 -0.44,0.55 -0.1,0.21 -0.15,0.43 -0.15,0.66 0,0.48 0.25,0.88 0.74,1.21 0.38,0.25 0.77,0.48 1.41,0.7H7.39c-0.05,-0.08 -0.11,-0.17 -0.15,-0.25zM21,12v-2H3v2h9.62c0.18,0.07 0.4,0.14 0.55,0.2 0.37,0.17 0.66,0.34 0.87,0.51 0.21,0.17 0.35,0.36 0.43,0.57 0.07,0.2 0.11,0.43 0.11,0.69 0,0.23 -0.05,0.45 -0.14,0.66 -0.09,0.2 -0.23,0.38 -0.42,0.53 -0.19,0.15 -0.42,0.26 -0.71,0.35 -0.29,0.08 -0.63,0.13 -1.01,0.13 -0.43,0 -0.83,-0.04 -1.18,-0.13s-0.66,-0.23 -0.91,-0.42c-0.25,-0.19 -0.45,-0.44 -0.59,-0.75 -0.14,-0.31 -0.25,-0.76 -0.25,-1.21H6.4c0,0.55 0.08,1.13 0.24,1.58 0.16,0.45 0.37,0.85 0.65,1.21 0.28,0.35 0.6,0.66 0.98,0.92 0.37,0.26 0.78,0.48 1.22,0.65 0.44,0.17 0.9,0.3 1.38,0.39 0.48,0.08 0.96,0.13 1.44,0.13 0.8,0 1.53,-0.09 2.18,-0.28s1.21,-0.45 1.67,-0.79c0.46,-0.34 0.82,-0.77 1.07,-1.27s0.38,-1.07 0.38,-1.71c0,-0.6 -0.1,-1.14 -0.31,-1.61 -0.05,-0.11 -0.11,-0.23 -0.17,-0.33H21z"
+        /></vector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_subscript_checked.xml b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_subscript_checked.xml
new file mode 100644
index 00000000..36908c28
--- /dev/null
+++ b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_subscript_checked.xml
@@ -0,0 +1,32 @@
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="36dp"
+        android:height="36dp"
+        android:viewportHeight="24.000002"
+        android:viewportWidth="24.000002">
+    <path
+        android:fillColor="#8034B5E5"
+        android:pathData="M0 0h24v24H0z"
+        android:strokeColor="#FF34B5E5"
+        android:strokeWidth="1"/>
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M16,7.41L11.41,12L16,16.59L14.59,18L10,13.41L5.41,18L4,16.59L8.59,12L4,7.41L5.41,6L10,10.59L14.59,6L16,7.41M21.85,21.03H16.97V20.03L17.86,19.23C18.62,18.58 19.18,18.04 19.56,17.6C19.93,17.16 20.12,16.75 20.13,16.36C20.14,16.08 20.05,15.85 19.86,15.66C19.68,15.5 19.39,15.38 19,15.38C18.69,15.38 18.42,15.44 18.16,15.56L17.5,15.94L17.05,14.77C17.32,14.56 17.64,14.38 18.03,14.24C18.42,14.1 18.85,14 19.32,14C20.1,14.04 20.7,14.25 21.1,14.66C21.5,15.07 21.72,15.59 21.72,16.23C21.71,16.79 21.53,17.31 21.18,17.78C20.84,18.25 20.42,18.7 19.91,19.14L19.27,19.66V19.68H21.85V21.03Z"/>
+</vector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_subscript_dark.xml b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_subscript_dark.xml
new file mode 100644
index 00000000..182c1aec
--- /dev/null
+++ b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_subscript_dark.xml
@@ -0,0 +1,34 @@
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="36dp"
+        android:height="36dp"
+        android:viewportHeight="24.000002"
+        android:viewportWidth="24.000002">
+    <path
+        android:fillColor="#404040"
+        android:pathData="M0 0h24v24H0z"/>
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M 16,7.41 11.41,12 16,16.59 14.59,18 10,13.41 5.41,18 4,16.59 8.59,12 4,7.41 5.41,6 10,10.59 14.59,6 16,7.41"/>
+    <path
+        android:fillColor="#34B5E5"
+        android:pathData="m 21.85,21.03 -4.88,0 0,-1 0.89,-0.8 c 0.76,-0.65 1.32,-1.19 1.7,-1.63 0.37,-0.44 0.56,-0.85 0.57,-1.24 0.01,-0.28 -0.08,-0.51 -0.27,-0.7 -0.18,-0.16 -0.47,-0.28 -0.86,-0.28 -0.31,0 -0.58,0.06 -0.84,0.18 l -0.66,0.38 -0.45,-1.17 c 0.27,-0.21 0.59,-0.39 0.98,-0.53 0.39,-0.14 0.82,-0.24 1.29,-0.24 0.78,0.04 1.38,0.25 1.78,0.66 0.4,0.41 0.62,0.93 0.62,1.57 -0.01,0.56 -0.19,1.08 -0.54,1.55 -0.34,0.47 -0.76,0.92 -1.27,1.36 l -0.64,0.52 0,0.02 2.58,0 0,1.35 z"
+        />
+</vector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_subscript_light.xml b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_subscript_light.xml
new file mode 100644
index 00000000..6519c8f3
--- /dev/null
+++ b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_subscript_light.xml
@@ -0,0 +1,34 @@
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="36dp"
+        android:height="36dp"
+        android:viewportHeight="24.000002"
+        android:viewportWidth="24.000002">
+    <path
+        android:fillColor="#E4E4E4"
+        android:pathData="M0 0h24v24H0z"/>
+    <path
+        android:fillColor="#404040"
+        android:pathData="M 16,7.41 11.41,12 16,16.59 14.59,18 10,13.41 5.41,18 4,16.59 8.59,12 4,7.41 5.41,6 10,10.59 14.59,6 16,7.41"/>
+    <path
+        android:fillColor="#34B5E5"
+        android:pathData="m 21.85,21.03 -4.88,0 0,-1 0.89,-0.8 c 0.76,-0.65 1.32,-1.19 1.7,-1.63 0.37,-0.44 0.56,-0.85 0.57,-1.24 0.01,-0.28 -0.08,-0.51 -0.27,-0.7 -0.18,-0.16 -0.47,-0.28 -0.86,-0.28 -0.31,0 -0.58,0.06 -0.84,0.18 l -0.66,0.38 -0.45,-1.17 c 0.27,-0.21 0.59,-0.39 0.98,-0.53 0.39,-0.14 0.82,-0.24 1.29,-0.24 0.78,0.04 1.38,0.25 1.78,0.66 0.4,0.41 0.62,0.93 0.62,1.57 -0.01,0.56 -0.19,1.08 -0.54,1.55 -0.34,0.47 -0.76,0.92 -1.27,1.36 l -0.64,0.52 0,0.02 2.58,0 0,1.35 z"
+        />
+</vector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_subscript_pressed.xml b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_subscript_pressed.xml
new file mode 100644
index 00000000..e85e2467
--- /dev/null
+++ b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_subscript_pressed.xml
@@ -0,0 +1,30 @@
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="36dp"
+        android:height="36dp"
+        android:viewportHeight="24.000002"
+        android:viewportWidth="24.000002">
+    <path
+        android:fillColor="#FF34B5E5"
+        android:pathData="M0 0h24v24H0z"/>
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M16,7.41L11.41,12L16,16.59L14.59,18L10,13.41L5.41,18L4,16.59L8.59,12L4,7.41L5.41,6L10,10.59L14.59,6L16,7.41M21.85,21.03H16.97V20.03L17.86,19.23C18.62,18.58 19.18,18.04 19.56,17.6C19.93,17.16 20.12,16.75 20.13,16.36C20.14,16.08 20.05,15.85 19.86,15.66C19.68,15.5 19.39,15.38 19,15.38C18.69,15.38 18.42,15.44 18.16,15.56L17.5,15.94L17.05,14.77C17.32,14.56 17.64,14.38 18.03,14.24C18.42,14.1 18.85,14 19.32,14C20.1,14.04 20.7,14.25 21.1,14.66C21.5,15.07 21.72,15.59 21.72,16.23C21.71,16.79 21.53,17.31 21.18,17.78C20.84,18.25 20.42,18.7 19.91,19.14L19.27,19.66V19.68H21.85V21.03Z" />
+</vector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_superscript_checked.xml b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_superscript_checked.xml
new file mode 100644
index 00000000..fcffc59d
--- /dev/null
+++ b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_superscript_checked.xml
@@ -0,0 +1,32 @@
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="36dp"
+        android:height="36dp"
+        android:viewportHeight="24.000002"
+        android:viewportWidth="24.000002">
+    <path
+        android:fillColor="#8034B5E5"
+        android:pathData="M0 0h24v24H0z"
+        android:strokeColor="#FF34B5E5"
+        android:strokeWidth="1"/>
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M16,7.41L11.41,12L16,16.59L14.59,18L10,13.41L5.41,18L4,16.59L8.59,12L4,7.41L5.41,6L10,10.59L14.59,6L16,7.41M21.85,9H16.97V8L17.86,7.18C18.62,6.54 19.18,6 19.56,5.55C19.93,5.11 20.12,4.7 20.13,4.32C20.14,4.04 20.05,3.8 19.86,3.62C19.68,3.43 19.39,3.34 19,3.33C18.69,3.34 18.42,3.4 18.16,3.5L17.5,3.89L17.05,2.72C17.32,2.5 17.64,2.33 18.03,2.19C18.42,2.05 18.85,2 19.32,2C20.1,2 20.7,2.2 21.1,2.61C21.5,3 21.72,3.54 21.72,4.18C21.71,4.74 21.53,5.26 21.18,5.73C20.84,6.21 20.42,6.66 19.91,7.09L19.27,7.61V7.63H21.85V9Z"/>
+</vector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_superscript_dark.xml b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_superscript_dark.xml
new file mode 100644
index 00000000..6396b926
--- /dev/null
+++ b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_superscript_dark.xml
@@ -0,0 +1,34 @@
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="36dp"
+        android:height="36dp"
+        android:viewportHeight="24.000002"
+        android:viewportWidth="24.000002">
+    <path
+        android:fillColor="#404040"
+        android:pathData="M0 0h24v24H0z"/>
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M 16,7.41 11.41,12 16,16.59 14.59,18 10,13.41 5.41,18 4,16.59 8.59,12 4,7.41 5.41,6 10,10.59 14.59,6 16,7.41"/>
+    <path
+        android:fillColor="#34B5E5"
+        android:pathData="m 21.85,9 -4.88,0 0,-1 0.89,-0.82 C 18.62,6.54 19.18,6 19.56,5.55 19.93,5.11 20.12,4.7 20.13,4.32 20.14,4.04 20.05,3.8 19.86,3.62 19.68,3.43 19.39,3.34 19,3.33 18.69,3.34 18.42,3.4 18.16,3.5 L 17.5,3.89 17.05,2.72 C 17.32,2.5 17.64,2.33 18.03,2.19 18.42,2.05 18.85,2 19.32,2 20.1,2 20.7,2.2 21.1,2.61 21.5,3 21.72,3.54 21.72,4.18 21.71,4.74 21.53,5.26 21.18,5.73 20.84,6.21 20.42,6.66 19.91,7.09 l -0.64,0.52 0,0.02 2.58,0 0,1.37 z"
+        />
+</vector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_superscript_light.xml b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_superscript_light.xml
new file mode 100644
index 00000000..77222d09
--- /dev/null
+++ b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_superscript_light.xml
@@ -0,0 +1,34 @@
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="36dp"
+        android:height="36dp"
+        android:viewportHeight="24.000002"
+        android:viewportWidth="24.000002">
+    <path
+        android:fillColor="#E4E4E4"
+        android:pathData="M0 0h24v24H0z"/>
+    <path
+        android:fillColor="#404040"
+        android:pathData="M 16,7.41 11.41,12 16,16.59 14.59,18 10,13.41 5.41,18 4,16.59 8.59,12 4,7.41 5.41,6 10,10.59 14.59,6 16,7.41"/>
+    <path
+        android:fillColor="#34B5E5"
+        android:pathData="m 21.85,9 -4.88,0 0,-1 0.89,-0.82 C 18.62,6.54 19.18,6 19.56,5.55 19.93,5.11 20.12,4.7 20.13,4.32 20.14,4.04 20.05,3.8 19.86,3.62 19.68,3.43 19.39,3.34 19,3.33 18.69,3.34 18.42,3.4 18.16,3.5 L 17.5,3.89 17.05,2.72 C 17.32,2.5 17.64,2.33 18.03,2.19 18.42,2.05 18.85,2 19.32,2 20.1,2 20.7,2.2 21.1,2.61 21.5,3 21.72,3.54 21.72,4.18 21.71,4.74 21.53,5.26 21.18,5.73 20.84,6.21 20.42,6.66 19.91,7.09 l -0.64,0.52 0,0.02 2.58,0 0,1.37 z"
+        />
+</vector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_superscript_pressed.xml b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_superscript_pressed.xml
new file mode 100644
index 00000000..872eda67
--- /dev/null
+++ b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_superscript_pressed.xml
@@ -0,0 +1,30 @@
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="36dp"
+        android:height="36dp"
+        android:viewportHeight="24.000002"
+        android:viewportWidth="24.000002">
+    <path
+        android:fillColor="#FF34B5E5"
+        android:pathData="M0 0h24v24H0z"/>
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M16,7.41L11.41,12L16,16.59L14.59,18L10,13.41L5.41,18L4,16.59L8.59,12L4,7.41L5.41,6L10,10.59L14.59,6L16,7.41M21.85,9H16.97V8L17.86,7.18C18.62,6.54 19.18,6 19.56,5.55C19.93,5.11 20.12,4.7 20.13,4.32C20.14,4.04 20.05,3.8 19.86,3.62C19.68,3.43 19.39,3.34 19,3.33C18.69,3.34 18.42,3.4 18.16,3.5L17.5,3.89L17.05,2.72C17.32,2.5 17.64,2.33 18.03,2.19C18.42,2.05 18.85,2 19.32,2C20.1,2 20.7,2.2 21.1,2.61C21.5,3 21.72,3.54 21.72,4.18C21.71,4.74 21.53,5.26 21.18,5.73C20.84,6.21 20.42,6.66 19.91,7.09L19.27,7.61V7.63H21.85V9Z"/>
+</vector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_typeface_checked.xml b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_typeface_checked.xml
new file mode 100644
index 00000000..d387af94
--- /dev/null
+++ b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_typeface_checked.xml
@@ -0,0 +1,34 @@
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="54dp"
+        android:height="36dp"
+        android:viewportHeight="24.00"
+        android:viewportWidth="36.00">
+    <path
+        android:fillColor="#8034B5E5"
+        android:pathData="M 0,0 36,0 36,24 0,24 Z"
+        android:strokeColor="#FF34B5E5"
+        android:strokeWidth="1"/>
+
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M 11.003906 5 L 5.5039062 19 L 7.7539062 19 L 8.8730469 16 L 15.123047 16 L 16.244141 19 L 18.494141 19 L 13.003906 5 L 11.003906 5 z M 12.003906 7.6699219 L 14.382812 14 L 9.6230469 14 L 12.003906 7.6699219 z M 30 9.5292969 L 26 13.529297 L 26.939453 14.470703 L 30 11.416016 L 33.060547 14.470703 L 34 13.529297 L 30 9.5292969 z "
+        />
+</vector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_typeface_dark.xml b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_typeface_dark.xml
new file mode 100644
index 00000000..8f573573
--- /dev/null
+++ b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_typeface_dark.xml
@@ -0,0 +1,33 @@
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="54dp"
+        android:height="36dp"
+        android:viewportHeight="24.00"
+        android:viewportWidth="36.00">
+    <path
+        android:fillColor="#404040"
+        android:pathData="M 0,0 36,0 36,24 0,24 Z"/>
+
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M 11.003906 5 L 5.5039062 19 L 7.7539062 19 L 8.8730469 16 L 15.123047 16 L 16.244141 19 L 18.494141 19 L 13.003906 5 L 11.003906 5 z M 12.003906 7.6699219 L 14.382812 14 L 9.6230469 14 L 12.003906 7.6699219 z M 30 9.5292969 L 26 13.529297 L 26.939453 14.470703 L 30 11.416016 L 33.060547 14.470703 L 34 13.529297 L 30 9.5292969 z "
+        />
+
+</vector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_typeface_light.xml b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_typeface_light.xml
new file mode 100644
index 00000000..de938639
--- /dev/null
+++ b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_typeface_light.xml
@@ -0,0 +1,32 @@
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="54dp"
+        android:height="36dp"
+        android:viewportHeight="24.00"
+        android:viewportWidth="36.00">
+    <path
+        android:fillColor="#E4E4E4"
+        android:pathData="M 0,0 36,0 36,24 0,24 Z"/>
+
+    <path
+        android:fillColor="#404040"
+        android:pathData="M 11.003906 5 L 5.5039062 19 L 7.7539062 19 L 8.8730469 16 L 15.123047 16 L 16.244141 19 L 18.494141 19 L 13.003906 5 L 11.003906 5 z M 12.003906 7.6699219 L 14.382812 14 L 9.6230469 14 L 12.003906 7.6699219 z M 30 9.5292969 L 26 13.529297 L 26.939453 14.470703 L 30 11.416016 L 33.060547 14.470703 L 34 13.529297 L 30 9.5292969 z "
+        />
+</vector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_typeface_pressed.xml b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_typeface_pressed.xml
new file mode 100644
index 00000000..f951fa04
--- /dev/null
+++ b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_typeface_pressed.xml
@@ -0,0 +1,32 @@
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="54dp"
+        android:height="36dp"
+        android:viewportHeight="24.00"
+        android:viewportWidth="36.00">
+    <path
+        android:fillColor="#FF34B5E5"
+        android:pathData="M 0,0 36,0 36,24 0,24 Z"/>
+
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M 11.003906 5 L 5.5039062 19 L 7.7539062 19 L 8.8730469 16 L 15.123047 16 L 16.244141 19 L 18.494141 19 L 13.003906 5 L 11.003906 5 z M 12.003906 7.6699219 L 14.382812 14 L 9.6230469 14 L 12.003906 7.6699219 z M 30 9.5292969 L 26 13.529297 L 26.939453 14.470703 L 30 11.416016 L 33.060547 14.470703 L 34 13.529297 L 30 9.5292969 z "
+        />
+</vector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_underline_checked.xml b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_underline_checked.xml
new file mode 100644
index 00000000..c7abf026
--- /dev/null
+++ b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_underline_checked.xml
@@ -0,0 +1,33 @@
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="36dp"
+        android:height="36dp"
+        android:viewportHeight="24.000002"
+        android:viewportWidth="24.000002">
+    <path
+        android:fillColor="#8034B5E5"
+        android:pathData="M0 0h24v24H0z"
+        android:strokeColor="#FF34B5E5"
+        android:strokeWidth="1"/>
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M12,17c3.31,0 6,-2.69 6,-6L18,3h-2.5v8c0,1.93 -1.57,3.5 -3.5,3.5S8.5,12.93 8.5,11L8.5,3L6,3v8c0,3.31 2.69,6 6,6zM5,19v2h14v-2L5,19z"/>
+
+</vector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_underline_dark.xml b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_underline_dark.xml
new file mode 100644
index 00000000..6f296b33
--- /dev/null
+++ b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_underline_dark.xml
@@ -0,0 +1,30 @@
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="36dp"
+        android:height="36dp"
+        android:viewportHeight="24.000002"
+        android:viewportWidth="24.000002">
+    <path
+        android:fillColor="#404040"
+        android:pathData="M0 0h24v24H0z"/>
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M12,17c3.31,0 6,-2.69 6,-6L18,3h-2.5v8c0,1.93 -1.57,3.5 -3.5,3.5S8.5,12.93 8.5,11L8.5,3L6,3v8c0,3.31 2.69,6 6,6zM5,19v2h14v-2L5,19z"/>
+</vector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_underline_light.xml b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_underline_light.xml
new file mode 100644
index 00000000..2409f4dd
--- /dev/null
+++ b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_underline_light.xml
@@ -0,0 +1,30 @@
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="36dp"
+        android:height="36dp"
+        android:viewportHeight="24.000002"
+        android:viewportWidth="24.000002">
+    <path
+        android:fillColor="#E4E4E4"
+        android:pathData="M0 0h24v24H0z"/>
+    <path
+        android:fillColor="#404040"
+        android:pathData="M12,17c3.31,0 6,-2.69 6,-6L18,3h-2.5v8c0,1.93 -1.57,3.5 -3.5,3.5S8.5,12.93 8.5,11L8.5,3L6,3v8c0,3.31 2.69,6 6,6zM5,19v2h14v-2L5,19z"/>
+</vector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_underline_pressed.xml b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_underline_pressed.xml
new file mode 100644
index 00000000..666b34d4
--- /dev/null
+++ b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_underline_pressed.xml
@@ -0,0 +1,30 @@
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="36dp"
+        android:height="36dp"
+        android:viewportHeight="24.000002"
+        android:viewportWidth="24.000002">
+    <path
+        android:fillColor="#FF34B5E5"
+        android:pathData="M0 0h24v24H0z"/>
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M12,17c3.31,0 6,-2.69 6,-6L18,3h-2.5v8c0,1.93 -1.57,3.5 -3.5,3.5S8.5,12.93 8.5,11L8.5,3L6,3v8c0,3.31 2.69,6 6,6zM5,19v2h14v-2L5,19z"/>
+</vector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_undo_dark.xml b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_undo_dark.xml
new file mode 100644
index 00000000..4aa3f320
--- /dev/null
+++ b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_undo_dark.xml
@@ -0,0 +1,30 @@
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="36dp"
+        android:height="36dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#404040"
+        android:pathData="M0 0h24v24H0z"/>
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M12.5,8c-2.65,0 -5.05,0.99 -6.9,2.6L2,7v9h9l-3.62,-3.62c1.39,-1.16 3.16,-1.88 5.12,-1.88 3.54,0 6.55,2.31 7.6,5.5l2.37,-0.78C21.08,11.03 17.15,8 12.5,8z"/>
+</vector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_undo_light.xml b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_undo_light.xml
new file mode 100644
index 00000000..5ea13df7
--- /dev/null
+++ b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_undo_light.xml
@@ -0,0 +1,30 @@
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="36dp"
+        android:height="36dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#E4E4E4"
+        android:pathData="M0 0h24v24H0z"/>
+    <path
+        android:fillColor="#404040"
+        android:pathData="M12.5,8c-2.65,0 -5.05,0.99 -6.9,2.6L2,7v9h9l-3.62,-3.62c1.39,-1.16 3.16,-1.88 5.12,-1.88 3.54,0 6.55,2.31 7.6,5.5l2.37,-0.78C21.08,11.03 17.15,8 12.5,8z"/>
+</vector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_undo_pressed.xml b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_undo_pressed.xml
new file mode 100644
index 00000000..f6fae634
--- /dev/null
+++ b/RTEditor-Toolbar/src/main/res/drawable/ic_toolbar_undo_pressed.xml
@@ -0,0 +1,30 @@
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="36dp"
+        android:height="36dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF34B5E5"
+        android:pathData="M0 0h24v24H0z"/>
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M12.5,8c-2.65,0 -5.05,0.99 -6.9,2.6L2,7v9h9l-3.62,-3.62c1.39,-1.16 3.16,-1.88 5.12,-1.88 3.54,0 6.55,2.31 7.6,5.5l2.37,-0.78C21.08,11.03 17.15,8 12.5,8z"/>
+</vector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_align_center_dark.xml b/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_align_center_dark.xml
index 9a678143..4f42bd21 100644
--- a/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_align_center_dark.xml
+++ b/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_align_center_dark.xml
@@ -1,26 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <selector
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:onegravity="http://schemas.android.com/apk/res-auto">
 
-    <item android:drawable="@drawable/ic_toolbar_align_center_dark_pressed" android:state_pressed="true"/>
-    <item android:drawable="@drawable/ic_toolbar_align_center_dark_checked" android:state_pressed="false" onegravity:state_checked="true"/>
+    <item android:drawable="@drawable/ic_toolbar_align_center_pressed" android:state_pressed="true"/>
+    <item android:drawable="@drawable/ic_toolbar_align_center_checked" android:state_pressed="false" onegravity:state_checked="true"/>
     <item android:drawable="@drawable/ic_toolbar_align_center_dark"/>
 
 </selector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_align_center_light.xml b/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_align_center_light.xml
index 8c9a6a65..7c0fbc07 100644
--- a/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_align_center_light.xml
+++ b/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_align_center_light.xml
@@ -1,26 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <selector
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:onegravity="http://schemas.android.com/apk/res-auto">
 
-    <item android:drawable="@drawable/ic_toolbar_align_center_light_pressed" android:state_pressed="true"/>
-    <item android:drawable="@drawable/ic_toolbar_align_center_light_checked" android:state_pressed="false" onegravity:state_checked="true"/>
+    <item android:drawable="@drawable/ic_toolbar_align_center_pressed" android:state_pressed="true"/>
+    <item android:drawable="@drawable/ic_toolbar_align_center_checked" android:state_pressed="false" onegravity:state_checked="true"/>
     <item android:drawable="@drawable/ic_toolbar_align_center_light"/>
 
 </selector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_align_left_dark.xml b/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_align_left_dark.xml
index 73b1b9d8..bbb6394d 100644
--- a/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_align_left_dark.xml
+++ b/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_align_left_dark.xml
@@ -1,26 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <selector
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:onegravity="http://schemas.android.com/apk/res-auto">
 
-    <item android:drawable="@drawable/ic_toolbar_align_left_dark_pressed" android:state_pressed="true"/>
-    <item android:drawable="@drawable/ic_toolbar_align_left_dark_checked" android:state_pressed="false" onegravity:state_checked="true"/>
+    <item android:drawable="@drawable/ic_toolbar_align_left_pressed" android:state_pressed="true"/>
+    <item android:drawable="@drawable/ic_toolbar_align_left_checked" android:state_pressed="false" onegravity:state_checked="true"/>
     <item android:drawable="@drawable/ic_toolbar_align_left_dark"/>
 
 </selector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_align_left_light.xml b/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_align_left_light.xml
index 99502f3e..546f6282 100644
--- a/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_align_left_light.xml
+++ b/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_align_left_light.xml
@@ -1,26 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <selector
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:onegravity="http://schemas.android.com/apk/res-auto">
 
-    <item android:drawable="@drawable/ic_toolbar_align_left_light_pressed" android:state_pressed="true"/>
-    <item android:drawable="@drawable/ic_toolbar_align_left_light_checked" android:state_pressed="false" onegravity:state_checked="true"/>
+    <item android:drawable="@drawable/ic_toolbar_align_left_pressed" android:state_pressed="true"/>
+    <item android:drawable="@drawable/ic_toolbar_align_left_checked" android:state_pressed="false" onegravity:state_checked="true"/>
     <item android:drawable="@drawable/ic_toolbar_align_left_light"/>
 
 </selector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_align_right_dark.xml b/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_align_right_dark.xml
index fe83b539..e899cd53 100644
--- a/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_align_right_dark.xml
+++ b/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_align_right_dark.xml
@@ -1,26 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <selector
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:onegravity="http://schemas.android.com/apk/res-auto">
 
-    <item android:drawable="@drawable/ic_toolbar_align_right_dark_pressed" android:state_pressed="true"/>
-    <item android:drawable="@drawable/ic_toolbar_align_right_dark_checked" android:state_pressed="false" onegravity:state_checked="true"/>
+    <item android:drawable="@drawable/ic_toolbar_align_right_pressed" android:state_pressed="true"/>
+    <item android:drawable="@drawable/ic_toolbar_align_right_checked" android:state_pressed="false" onegravity:state_checked="true"/>
     <item android:drawable="@drawable/ic_toolbar_align_right_dark"/>
 
 </selector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_align_right_light.xml b/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_align_right_light.xml
index ab611992..7f8d2086 100644
--- a/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_align_right_light.xml
+++ b/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_align_right_light.xml
@@ -1,26 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <selector
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:onegravity="http://schemas.android.com/apk/res-auto">
 
-    <item android:drawable="@drawable/ic_toolbar_align_right_light_pressed" android:state_pressed="true"/>
-    <item android:drawable="@drawable/ic_toolbar_align_right_light_checked" android:state_pressed="false" onegravity:state_checked="true"/>
+    <item android:drawable="@drawable/ic_toolbar_align_right_pressed" android:state_pressed="true"/>
+    <item android:drawable="@drawable/ic_toolbar_align_right_checked" android:state_pressed="false" onegravity:state_checked="true"/>
     <item android:drawable="@drawable/ic_toolbar_align_right_light"/>
 
 </selector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_barcode_dark.xml b/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_barcode_dark.xml
new file mode 100644
index 00000000..5303a714
--- /dev/null
+++ b/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_barcode_dark.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<selector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:onegravity="http://schemas.android.com/apk/res-auto">
+
+    <item android:drawable="@drawable/ic_toolbar_barcode_pressed" android:state_pressed="true"/>
+    <item android:drawable="@drawable/ic_toolbar_barcode_checked" android:state_pressed="false" onegravity:state_checked="true"/>
+    <item android:drawable="@drawable/ic_toolbar_barcode_dark"/>
+
+</selector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_barcode_light.xml b/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_barcode_light.xml
new file mode 100644
index 00000000..4a71fcb1
--- /dev/null
+++ b/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_barcode_light.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<selector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:onegravity="http://schemas.android.com/apk/res-auto">
+
+    <item android:drawable="@drawable/ic_toolbar_barcode_pressed" android:state_pressed="true"/>
+    <item android:drawable="@drawable/ic_toolbar_barcode_checked" android:state_pressed="false" onegravity:state_checked="true"/>
+    <item android:drawable="@drawable/ic_toolbar_barcode_light"/>
+
+</selector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_bgcolor_dark.xml b/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_bgcolor_dark.xml
index b529232b..5d8d1f77 100644
--- a/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_bgcolor_dark.xml
+++ b/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_bgcolor_dark.xml
@@ -1,26 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <selector
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:onegravity="http://schemas.android.com/apk/res-auto">
 
-    <item android:drawable="@drawable/ic_toolbar_bgcolor_dark_pressed" android:state_pressed="true"/>
-    <item android:drawable="@drawable/ic_toolbar_bgcolor_dark_checked" android:state_pressed="false" onegravity:state_checked="true"/>
+    <item android:drawable="@drawable/ic_toolbar_bgcolor_pressed" android:state_pressed="true"/>
+    <item android:drawable="@drawable/ic_toolbar_bgcolor_checked" android:state_pressed="false" onegravity:state_checked="true"/>
     <item android:drawable="@drawable/ic_toolbar_bgcolor_dark"/>
 
 </selector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_bgcolor_light.xml b/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_bgcolor_light.xml
index 224bd2e1..ceea83d4 100644
--- a/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_bgcolor_light.xml
+++ b/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_bgcolor_light.xml
@@ -1,26 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <selector
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:onegravity="http://schemas.android.com/apk/res-auto">
 
-    <item android:drawable="@drawable/ic_toolbar_bgcolor_light_pressed" android:state_pressed="true"/>
-    <item android:drawable="@drawable/ic_toolbar_bgcolor_light_checked" android:state_pressed="false" onegravity:state_checked="true"/>
+    <item android:drawable="@drawable/ic_toolbar_bgcolor_pressed" android:state_pressed="true"/>
+    <item android:drawable="@drawable/ic_toolbar_bgcolor_checked" android:state_pressed="false" onegravity:state_checked="true"/>
     <item android:drawable="@drawable/ic_toolbar_bgcolor_light"/>
 
 </selector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_bold_dark.xml b/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_bold_dark.xml
index 2902b318..0a34fbf1 100644
--- a/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_bold_dark.xml
+++ b/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_bold_dark.xml
@@ -1,26 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <selector
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:onegravity="http://schemas.android.com/apk/res-auto">
 
-    <item android:drawable="@drawable/ic_toolbar_bold_dark_pressed" android:state_pressed="true"/>
-    <item android:drawable="@drawable/ic_toolbar_bold_dark_checked" android:state_pressed="false" onegravity:state_checked="true"/>
+    <item android:drawable="@drawable/ic_toolbar_bold_pressed" android:state_pressed="true"/>
+    <item android:drawable="@drawable/ic_toolbar_bold_checked" android:state_pressed="false" onegravity:state_checked="true"/>
     <item android:drawable="@drawable/ic_toolbar_bold_dark"/>
 
 </selector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_bold_light.xml b/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_bold_light.xml
index a636bb85..4f5d58f2 100644
--- a/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_bold_light.xml
+++ b/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_bold_light.xml
@@ -1,26 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <selector
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:onegravity="http://schemas.android.com/apk/res-auto">
 
-    <item android:drawable="@drawable/ic_toolbar_bold_light_pressed" android:state_pressed="true"/>
-    <item android:drawable="@drawable/ic_toolbar_bold_light_checked" android:state_pressed="false" onegravity:state_checked="true"/>
+    <item android:drawable="@drawable/ic_toolbar_bold_pressed" android:state_pressed="true"/>
+    <item android:drawable="@drawable/ic_toolbar_bold_checked" android:state_pressed="false" onegravity:state_checked="true"/>
     <item android:drawable="@drawable/ic_toolbar_bold_light"/>
 
 </selector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_bullet_dark.xml b/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_bullet_dark.xml
index f7f333ca..c537a279 100644
--- a/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_bullet_dark.xml
+++ b/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_bullet_dark.xml
@@ -1,26 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <selector
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:onegravity="http://schemas.android.com/apk/res-auto">
 
-    <item android:drawable="@drawable/ic_toolbar_bullet_dark_pressed" android:state_pressed="true"/>
-    <item android:drawable="@drawable/ic_toolbar_bullet_dark_checked" android:state_pressed="false" onegravity:state_checked="true"/>
+    <item android:drawable="@drawable/ic_toolbar_bullet_pressed" android:state_pressed="true"/>
+    <item android:drawable="@drawable/ic_toolbar_bullet_checked" android:state_pressed="false" onegravity:state_checked="true"/>
     <item android:drawable="@drawable/ic_toolbar_bullet_dark"/>
 
 </selector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_bullet_light.xml b/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_bullet_light.xml
index 3bdc018f..48fcec6c 100644
--- a/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_bullet_light.xml
+++ b/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_bullet_light.xml
@@ -1,26 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <selector
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:onegravity="http://schemas.android.com/apk/res-auto">
 
-    <item android:drawable="@drawable/ic_toolbar_bullet_light_pressed" android:state_pressed="true"/>
-    <item android:drawable="@drawable/ic_toolbar_bullet_light_checked" android:state_pressed="false" onegravity:state_checked="true"/>
+    <item android:drawable="@drawable/ic_toolbar_bullet_pressed" android:state_pressed="true"/>
+    <item android:drawable="@drawable/ic_toolbar_bullet_checked" android:state_pressed="false" onegravity:state_checked="true"/>
     <item android:drawable="@drawable/ic_toolbar_bullet_light"/>
 
 </selector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_capture_dark.xml b/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_capture_dark.xml
index c819e883..34271aff 100644
--- a/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_capture_dark.xml
+++ b/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_capture_dark.xml
@@ -1,24 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <selector
     xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:drawable="@drawable/ic_toolbar_capture_dark_pressed" android:state_pressed="true"/>
+    <item android:drawable="@drawable/ic_toolbar_capture_pressed" android:state_pressed="true"/>
     <item android:drawable="@drawable/ic_toolbar_capture_dark"/>
 
 </selector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_capture_light.xml b/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_capture_light.xml
index 931a91a0..d0fe3bc9 100644
--- a/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_capture_light.xml
+++ b/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_capture_light.xml
@@ -1,24 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <selector
     xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:drawable="@drawable/ic_toolbar_capture_light_pressed" android:state_pressed="true"/>
+    <item android:drawable="@drawable/ic_toolbar_capture_pressed" android:state_pressed="true"/>
     <item android:drawable="@drawable/ic_toolbar_capture_light"/>
 
 </selector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_clear_dark.xml b/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_clear_dark.xml
index 1370ed85..71d1a220 100644
--- a/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_clear_dark.xml
+++ b/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_clear_dark.xml
@@ -1,24 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <selector
     xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:drawable="@drawable/ic_toolbar_clear_dark_pressed" android:state_pressed="true"/>
+    <item android:drawable="@drawable/ic_toolbar_clear_pressed" android:state_pressed="true"/>
     <item android:drawable="@drawable/ic_toolbar_clear_dark"/>
 
 </selector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_clear_light.xml b/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_clear_light.xml
index f0692017..f9bcd221 100644
--- a/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_clear_light.xml
+++ b/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_clear_light.xml
@@ -1,24 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <selector
     xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:drawable="@drawable/ic_toolbar_clear_light_pressed" android:state_pressed="true"/>
+    <item android:drawable="@drawable/ic_toolbar_clear_pressed" android:state_pressed="true"/>
     <item android:drawable="@drawable/ic_toolbar_clear_light"/>
 
 </selector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_dec_indent_dark.xml b/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_dec_indent_dark.xml
index 2324b1e1..7a0b65be 100644
--- a/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_dec_indent_dark.xml
+++ b/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_dec_indent_dark.xml
@@ -1,26 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <selector
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:onegravity="http://schemas.android.com/apk/res-auto">
 
-    <item android:drawable="@drawable/ic_toolbar_dec_indent_dark_pressed" android:state_pressed="true"/>
-    <item android:drawable="@drawable/ic_toolbar_dec_indent_dark_checked" android:state_pressed="false" onegravity:state_checked="true"/>
-    <item android:drawable="@drawable/ic_toolbar_dec_indent_dark"/>
+    <item android:drawable="@drawable/ic_toolbar_dec_indent_pressed" android:state_pressed="true"/>
+    <item android:drawable="@drawable/ic_toolbar_dec_indent_checked" android:state_pressed="false" onegravity:state_checked="true"/>
+    <item android:drawable="@drawable/ic_toolbar_inc_indent_dark"/>
 
 </selector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_dec_indent_light.xml b/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_dec_indent_light.xml
index 1f4a28f1..a23d1618 100644
--- a/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_dec_indent_light.xml
+++ b/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_dec_indent_light.xml
@@ -1,26 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <selector
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:onegravity="http://schemas.android.com/apk/res-auto">
 
-    <item android:drawable="@drawable/ic_toolbar_dec_indent_light_pressed" android:state_pressed="true"/>
-    <item android:drawable="@drawable/ic_toolbar_dec_indent_light_checked" android:state_pressed="false" onegravity:state_checked="true"/>
+    <item android:drawable="@drawable/ic_toolbar_dec_indent_pressed" android:state_pressed="true"/>
+    <item android:drawable="@drawable/ic_toolbar_dec_indent_checked" android:state_pressed="false" onegravity:state_checked="true"/>
     <item android:drawable="@drawable/ic_toolbar_dec_indent_light"/>
 
 </selector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_font_dark.xml b/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_font_dark.xml
index 58fa2d88..0a691209 100644
--- a/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_font_dark.xml
+++ b/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_font_dark.xml
@@ -1,26 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <selector
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:onegravity="http://schemas.android.com/apk/res-auto">
 
-    <item android:drawable="@drawable/ic_toolbar_typeface_dark_pressed" android:state_pressed="true"/>
-    <item android:drawable="@drawable/ic_toolbar_typeface_dark_checked" android:state_pressed="false" onegravity:state_checked="true"/>
+    <item android:drawable="@drawable/ic_toolbar_typeface_pressed" android:state_pressed="true"/>
+    <item android:drawable="@drawable/ic_toolbar_typeface_checked" android:state_pressed="false" onegravity:state_checked="true"/>
     <item android:drawable="@drawable/ic_toolbar_typeface_dark"/>
 
 </selector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_font_light.xml b/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_font_light.xml
index 47e08974..9df66abc 100644
--- a/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_font_light.xml
+++ b/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_font_light.xml
@@ -1,26 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <selector
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:onegravity="http://schemas.android.com/apk/res-auto">
 
-    <item android:drawable="@drawable/ic_toolbar_typeface_light_pressed" android:state_pressed="true"/>
-    <item android:drawable="@drawable/ic_toolbar_typeface_light_checked" android:state_pressed="false" onegravity:state_checked="true"/>
+    <item android:drawable="@drawable/ic_toolbar_typeface_pressed" android:state_pressed="true"/>
+    <item android:drawable="@drawable/ic_toolbar_typeface_checked" android:state_pressed="false" onegravity:state_checked="true"/>
     <item android:drawable="@drawable/ic_toolbar_typeface_light"/>
 
 </selector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_fontcolor_dark.xml b/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_fontcolor_dark.xml
index ec1ee53e..c052413b 100644
--- a/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_fontcolor_dark.xml
+++ b/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_fontcolor_dark.xml
@@ -1,26 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <selector
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:onegravity="http://schemas.android.com/apk/res-auto">
 
-    <item android:drawable="@drawable/ic_toolbar_fontcolor_dark_pressed" android:state_pressed="true"/>
-    <item android:drawable="@drawable/ic_toolbar_fontcolor_dark_checked" android:state_pressed="false" onegravity:state_checked="true"/>
+    <item android:drawable="@drawable/ic_toolbar_fontcolor_pressed" android:state_pressed="true"/>
+    <item android:drawable="@drawable/ic_toolbar_fontcolor_checked" android:state_pressed="false" onegravity:state_checked="true"/>
     <item android:drawable="@drawable/ic_toolbar_fontcolor_dark"/>
 
 </selector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_fontcolor_light.xml b/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_fontcolor_light.xml
index fcc0cedb..ec116635 100644
--- a/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_fontcolor_light.xml
+++ b/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_fontcolor_light.xml
@@ -1,26 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <selector
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:onegravity="http://schemas.android.com/apk/res-auto">
 
-    <item android:drawable="@drawable/ic_toolbar_fontcolor_light_pressed" android:state_pressed="true"/>
-    <item android:drawable="@drawable/ic_toolbar_fontcolor_light_checked" android:state_pressed="false" onegravity:state_checked="true"/>
+    <item android:drawable="@drawable/ic_toolbar_fontcolor_pressed" android:state_pressed="true"/>
+    <item android:drawable="@drawable/ic_toolbar_fontcolor_checked" android:state_pressed="false" onegravity:state_checked="true"/>
     <item android:drawable="@drawable/ic_toolbar_fontcolor_light"/>
 
 </selector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_fontsize_dark.xml b/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_fontsize_dark.xml
index bfd8049c..655f89e1 100644
--- a/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_fontsize_dark.xml
+++ b/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_fontsize_dark.xml
@@ -1,26 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <selector
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:onegravity="http://schemas.android.com/apk/res-auto">
 
-    <item android:drawable="@drawable/ic_toolbar_fontsize_dark_pressed" android:state_pressed="true"/>
-    <item android:drawable="@drawable/ic_toolbar_fontsize_dark_checked" android:state_pressed="false" onegravity:state_checked="true"/>
+    <item android:drawable="@drawable/ic_toolbar_fontsize_pressed" android:state_pressed="true"/>
+    <item android:drawable="@drawable/ic_toolbar_fontsize_checked" android:state_pressed="false" onegravity:state_checked="true"/>
     <item android:drawable="@drawable/ic_toolbar_fontsize_dark"/>
 
 </selector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_fontsize_light.xml b/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_fontsize_light.xml
index 145e0557..21d3d3f3 100644
--- a/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_fontsize_light.xml
+++ b/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_fontsize_light.xml
@@ -1,26 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <selector
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:onegravity="http://schemas.android.com/apk/res-auto">
 
-    <item android:drawable="@drawable/ic_toolbar_fontsize_light_pressed" android:state_pressed="true"/>
-    <item android:drawable="@drawable/ic_toolbar_fontsize_light_checked" android:state_pressed="false" onegravity:state_checked="true"/>
+    <item android:drawable="@drawable/ic_toolbar_fontsize_pressed" android:state_pressed="true"/>
+    <item android:drawable="@drawable/ic_toolbar_fontsize_checked" android:state_pressed="false" onegravity:state_checked="true"/>
     <item android:drawable="@drawable/ic_toolbar_fontsize_light"/>
 
 </selector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_gif_dark.xml b/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_gif_dark.xml
new file mode 100644
index 00000000..eee3f596
--- /dev/null
+++ b/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_gif_dark.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<selector
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:drawable="@drawable/ic_toolbar_gif_pressed" android:state_pressed="true"/>
+    <item android:drawable="@drawable/ic_toolbar_gif_dark"/>
+
+</selector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_gif_light.xml b/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_gif_light.xml
new file mode 100644
index 00000000..dc1a30d9
--- /dev/null
+++ b/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_gif_light.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<selector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:onegravity="http://schemas.android.com/apk/res-auto">
+
+    <item android:drawable="@drawable/ic_toolbar_gif_pressed" android:state_pressed="true"/>
+    <item android:drawable="@drawable/ic_toolbar_gif_light"/>
+
+</selector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_image_dark.xml b/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_image_dark.xml
index e32f455d..08ef74af 100644
--- a/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_image_dark.xml
+++ b/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_image_dark.xml
@@ -1,24 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <selector
     xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:drawable="@drawable/ic_toolbar_image_dark_pressed" android:state_pressed="true"/>
+    <item android:drawable="@drawable/ic_toolbar_image_pressed" android:state_pressed="true"/>
     <item android:drawable="@drawable/ic_toolbar_image_dark"/>
 
 </selector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_image_light.xml b/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_image_light.xml
index abfad1f9..6b23c880 100644
--- a/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_image_light.xml
+++ b/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_image_light.xml
@@ -1,25 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <selector
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:onegravity="http://schemas.android.com/apk/res-auto">
 
-    <item android:drawable="@drawable/ic_toolbar_image_light_pressed" android:state_pressed="true"/>
+    <item android:drawable="@drawable/ic_toolbar_image_pressed" android:state_pressed="true"/>
     <item android:drawable="@drawable/ic_toolbar_image_light"/>
 
 </selector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_inc_indent_dark.xml b/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_inc_indent_dark.xml
index 5258c052..ae71f539 100644
--- a/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_inc_indent_dark.xml
+++ b/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_inc_indent_dark.xml
@@ -1,26 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <selector
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:onegravity="http://schemas.android.com/apk/res-auto">
 
-    <item android:drawable="@drawable/ic_toolbar_inc_indent_dark_pressed" android:state_pressed="true"/>
-    <item android:drawable="@drawable/ic_toolbar_inc_indent_dark_checked" android:state_pressed="false" onegravity:state_checked="true"/>
+    <item android:drawable="@drawable/ic_toolbar_inc_indent_pressed" android:state_pressed="true"/>
+    <item android:drawable="@drawable/ic_toolbar_inc_indent_checked" android:state_pressed="false" onegravity:state_checked="true"/>
     <item android:drawable="@drawable/ic_toolbar_inc_indent_dark"/>
 
 </selector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_inc_indent_light.xml b/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_inc_indent_light.xml
index e1e091c8..751f4458 100644
--- a/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_inc_indent_light.xml
+++ b/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_inc_indent_light.xml
@@ -1,26 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <selector
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:onegravity="http://schemas.android.com/apk/res-auto">
 
-    <item android:drawable="@drawable/ic_toolbar_inc_indent_light_pressed" android:state_pressed="true"/>
-    <item android:drawable="@drawable/ic_toolbar_inc_indent_light_checked" android:state_pressed="false" onegravity:state_checked="true"/>
+    <item android:drawable="@drawable/ic_toolbar_inc_indent_pressed" android:state_pressed="true"/>
+    <item android:drawable="@drawable/ic_toolbar_inc_indent_checked" android:state_pressed="false" onegravity:state_checked="true"/>
     <item android:drawable="@drawable/ic_toolbar_inc_indent_light"/>
 
 </selector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_italic_dark.xml b/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_italic_dark.xml
index c233d009..fd3823f5 100644
--- a/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_italic_dark.xml
+++ b/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_italic_dark.xml
@@ -1,26 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <selector
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:onegravity="http://schemas.android.com/apk/res-auto">
 
-    <item android:drawable="@drawable/ic_toolbar_italic_dark_pressed" android:state_pressed="true"/>
-    <item android:drawable="@drawable/ic_toolbar_italic_dark_checked" android:state_pressed="false" onegravity:state_checked="true"/>
+    <item android:drawable="@drawable/ic_toolbar_italic_pressed" android:state_pressed="true"/>
+    <item android:drawable="@drawable/ic_toolbar_italic_checked" android:state_pressed="false" onegravity:state_checked="true"/>
     <item android:drawable="@drawable/ic_toolbar_italic_dark"/>
 
 </selector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_italic_light.xml b/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_italic_light.xml
index b09f12a9..33b27f3a 100644
--- a/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_italic_light.xml
+++ b/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_italic_light.xml
@@ -1,26 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <selector
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:onegravity="http://schemas.android.com/apk/res-auto">
 
-    <item android:drawable="@drawable/ic_toolbar_italic_light_pressed" android:state_pressed="true"/>
-    <item android:drawable="@drawable/ic_toolbar_italic_light_checked" android:state_pressed="false" onegravity:state_checked="true"/>
+    <item android:drawable="@drawable/ic_toolbar_italic_pressed" android:state_pressed="true"/>
+    <item android:drawable="@drawable/ic_toolbar_italic_checked" android:state_pressed="false" onegravity:state_checked="true"/>
     <item android:drawable="@drawable/ic_toolbar_italic_light"/>
 
 </selector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_link_dark.xml b/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_link_dark.xml
index 6db39479..0e64ad45 100644
--- a/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_link_dark.xml
+++ b/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_link_dark.xml
@@ -1,26 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <selector
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:onegravity="http://schemas.android.com/apk/res-auto">
 
-    <item android:drawable="@drawable/ic_toolbar_link_dark_pressed" android:state_pressed="true"/>
-    <item android:drawable="@drawable/ic_toolbar_link_dark_checked" android:state_pressed="false" onegravity:state_checked="true"/>
+    <item android:drawable="@drawable/ic_toolbar_link_pressed" android:state_pressed="true"/>
+    <item android:drawable="@drawable/ic_toolbar_link_checked" android:state_pressed="false" onegravity:state_checked="true"/>
     <item android:drawable="@drawable/ic_toolbar_link_dark"/>
 
 </selector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_link_light.xml b/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_link_light.xml
index 33c19b70..1de081c3 100644
--- a/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_link_light.xml
+++ b/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_link_light.xml
@@ -1,26 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <selector
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:onegravity="http://schemas.android.com/apk/res-auto">
 
-    <item android:drawable="@drawable/ic_toolbar_link_light_pressed" android:state_pressed="true"/>
-    <item android:drawable="@drawable/ic_toolbar_link_light_checked" android:state_pressed="false" onegravity:state_checked="true"/>
+    <item android:drawable="@drawable/ic_toolbar_link_pressed" android:state_pressed="true"/>
+    <item android:drawable="@drawable/ic_toolbar_link_checked" android:state_pressed="false" onegravity:state_checked="true"/>
     <item android:drawable="@drawable/ic_toolbar_link_light"/>
 
 </selector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_number_dark.xml b/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_number_dark.xml
index 9645b40f..f8247a74 100644
--- a/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_number_dark.xml
+++ b/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_number_dark.xml
@@ -1,26 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <selector
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:onegravity="http://schemas.android.com/apk/res-auto">
 
-    <item android:drawable="@drawable/ic_toolbar_number_dark_pressed" android:state_pressed="true"/>
-    <item android:drawable="@drawable/ic_toolbar_number_dark_checked" android:state_pressed="false" onegravity:state_checked="true"/>
+    <item android:drawable="@drawable/ic_toolbar_number_pressed" android:state_pressed="true"/>
+    <item android:drawable="@drawable/ic_toolbar_number_checked" android:state_pressed="false" onegravity:state_checked="true"/>
     <item android:drawable="@drawable/ic_toolbar_number_dark"/>
 
 </selector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_number_light.xml b/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_number_light.xml
index 401cc091..31a386c6 100644
--- a/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_number_light.xml
+++ b/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_number_light.xml
@@ -1,26 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <selector
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:onegravity="http://schemas.android.com/apk/res-auto">
 
-    <item android:drawable="@drawable/ic_toolbar_number_light_pressed" android:state_pressed="true"/>
-    <item android:drawable="@drawable/ic_toolbar_number_light_checked" android:state_pressed="false" onegravity:state_checked="true"/>
+    <item android:drawable="@drawable/ic_toolbar_number_pressed" android:state_pressed="true"/>
+    <item android:drawable="@drawable/ic_toolbar_number_checked" android:state_pressed="false" onegravity:state_checked="true"/>
     <item android:drawable="@drawable/ic_toolbar_number_light"/>
 
 </selector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_redo_dark.xml b/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_redo_dark.xml
index eb59aa0a..089ae3c3 100644
--- a/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_redo_dark.xml
+++ b/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_redo_dark.xml
@@ -1,24 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <selector
     xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:drawable="@drawable/ic_toolbar_redo_dark_pressed" android:state_pressed="true"/>
+    <item android:drawable="@drawable/ic_toolbar_redo_pressed" android:state_pressed="true"/>
     <item android:drawable="@drawable/ic_toolbar_redo_dark"/>
 
 </selector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_redo_light.xml b/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_redo_light.xml
index d0d10ed2..8668933b 100644
--- a/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_redo_light.xml
+++ b/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_redo_light.xml
@@ -1,24 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <selector
     xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:drawable="@drawable/ic_toolbar_redo_light_pressed" android:state_pressed="true"/>
+    <item android:drawable="@drawable/ic_toolbar_redo_pressed" android:state_pressed="true"/>
     <item android:drawable="@drawable/ic_toolbar_redo_light"/>
 
 </selector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_strikethrough_dark.xml b/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_strikethrough_dark.xml
index 1c859da5..76f988ea 100644
--- a/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_strikethrough_dark.xml
+++ b/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_strikethrough_dark.xml
@@ -1,26 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <selector
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:onegravity="http://schemas.android.com/apk/res-auto">
 
-    <item android:drawable="@drawable/ic_toolbar_strikethrough_dark_pressed" android:state_pressed="true"/>
-    <item android:drawable="@drawable/ic_toolbar_strikethrough_dark_checked" android:state_pressed="false" onegravity:state_checked="true"/>
+    <item android:drawable="@drawable/ic_toolbar_strikethrough_pressed" android:state_pressed="true"/>
+    <item android:drawable="@drawable/ic_toolbar_strikethrough_checked" android:state_pressed="false" onegravity:state_checked="true"/>
     <item android:drawable="@drawable/ic_toolbar_strikethrough_dark"/>
 
 </selector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_strikethrough_light.xml b/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_strikethrough_light.xml
index e03f6a17..b34bd937 100644
--- a/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_strikethrough_light.xml
+++ b/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_strikethrough_light.xml
@@ -1,26 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <selector
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:onegravity="http://schemas.android.com/apk/res-auto">
 
-    <item android:drawable="@drawable/ic_toolbar_strikethrough_light_pressed" android:state_pressed="true"/>
-    <item android:drawable="@drawable/ic_toolbar_strikethrough_light_checked" android:state_pressed="false" onegravity:state_checked="true"/>
+    <item android:drawable="@drawable/ic_toolbar_strikethrough_pressed" android:state_pressed="true"/>
+    <item android:drawable="@drawable/ic_toolbar_strikethrough_checked" android:state_pressed="false" onegravity:state_checked="true"/>
     <item android:drawable="@drawable/ic_toolbar_strikethrough_light"/>
 
 </selector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_subscript_dark.xml b/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_subscript_dark.xml
index e93968de..fc22b6bd 100644
--- a/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_subscript_dark.xml
+++ b/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_subscript_dark.xml
@@ -1,26 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <selector
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:onegravity="http://schemas.android.com/apk/res-auto">
 
-    <item android:drawable="@drawable/ic_toolbar_subscript_dark_pressed" android:state_pressed="true"/>
-    <item android:drawable="@drawable/ic_toolbar_subscript_dark_checked" android:state_pressed="false" onegravity:state_checked="true"/>
+    <item android:drawable="@drawable/ic_toolbar_subscript_pressed" android:state_pressed="true"/>
+    <item android:drawable="@drawable/ic_toolbar_subscript_checked" android:state_pressed="false" onegravity:state_checked="true"/>
     <item android:drawable="@drawable/ic_toolbar_subscript_dark"/>
 
 </selector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_subscript_light.xml b/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_subscript_light.xml
index 3d2c5d77..44460db2 100644
--- a/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_subscript_light.xml
+++ b/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_subscript_light.xml
@@ -1,26 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <selector
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:onegravity="http://schemas.android.com/apk/res-auto">
 
-    <item android:drawable="@drawable/ic_toolbar_subscript_light_pressed" android:state_pressed="true"/>
-    <item android:drawable="@drawable/ic_toolbar_subscript_light_checked" android:state_pressed="false" onegravity:state_checked="true"/>
+    <item android:drawable="@drawable/ic_toolbar_subscript_pressed" android:state_pressed="true"/>
+    <item android:drawable="@drawable/ic_toolbar_subscript_checked" android:state_pressed="false" onegravity:state_checked="true"/>
     <item android:drawable="@drawable/ic_toolbar_subscript_light"/>
 
 </selector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_superscript_dark.xml b/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_superscript_dark.xml
index bbc588b3..6bd137ab 100644
--- a/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_superscript_dark.xml
+++ b/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_superscript_dark.xml
@@ -1,26 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <selector
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:onegravity="http://schemas.android.com/apk/res-auto">
 
-    <item android:drawable="@drawable/ic_toolbar_superscript_dark_pressed" android:state_pressed="true"/>
-    <item android:drawable="@drawable/ic_toolbar_superscript_dark_checked" android:state_pressed="false" onegravity:state_checked="true"/>
+    <item android:drawable="@drawable/ic_toolbar_superscript_pressed" android:state_pressed="true"/>
+    <item android:drawable="@drawable/ic_toolbar_superscript_checked" android:state_pressed="false" onegravity:state_checked="true"/>
     <item android:drawable="@drawable/ic_toolbar_superscript_dark"/>
 
 </selector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_superscript_light.xml b/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_superscript_light.xml
index 16da8d00..3e5edf71 100644
--- a/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_superscript_light.xml
+++ b/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_superscript_light.xml
@@ -1,26 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <selector
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:onegravity="http://schemas.android.com/apk/res-auto">
 
-    <item android:drawable="@drawable/ic_toolbar_superscript_light_pressed" android:state_pressed="true"/>
-    <item android:drawable="@drawable/ic_toolbar_superscript_light_checked" android:state_pressed="false" onegravity:state_checked="true"/>
+    <item android:drawable="@drawable/ic_toolbar_superscript_pressed" android:state_pressed="true"/>
+    <item android:drawable="@drawable/ic_toolbar_superscript_checked" android:state_pressed="false" onegravity:state_checked="true"/>
     <item android:drawable="@drawable/ic_toolbar_superscript_light"/>
 
 </selector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_underline_dark.xml b/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_underline_dark.xml
index a2e20c2a..29e938a3 100644
--- a/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_underline_dark.xml
+++ b/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_underline_dark.xml
@@ -1,26 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <selector
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:onegravity="http://schemas.android.com/apk/res-auto">
 
-    <item android:drawable="@drawable/ic_toolbar_underline_dark_pressed" android:state_pressed="true"/>
-    <item android:drawable="@drawable/ic_toolbar_underline_dark_checked" android:state_pressed="false" onegravity:state_checked="true"/>
+    <item android:drawable="@drawable/ic_toolbar_underline_pressed" android:state_pressed="true"/>
+    <item android:drawable="@drawable/ic_toolbar_underline_checked" android:state_pressed="false" onegravity:state_checked="true"/>
     <item android:drawable="@drawable/ic_toolbar_underline_dark"/>
 
 </selector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_underline_light.xml b/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_underline_light.xml
index e7353e67..1b8cf662 100644
--- a/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_underline_light.xml
+++ b/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_underline_light.xml
@@ -1,26 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <selector
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:onegravity="http://schemas.android.com/apk/res-auto">
 
-    <item android:drawable="@drawable/ic_toolbar_underline_light_pressed" android:state_pressed="true"/>
-    <item android:drawable="@drawable/ic_toolbar_underline_light_checked" android:state_pressed="false" onegravity:state_checked="true"/>
+    <item android:drawable="@drawable/ic_toolbar_underline_pressed" android:state_pressed="true"/>
+    <item android:drawable="@drawable/ic_toolbar_underline_checked" android:state_pressed="false" onegravity:state_checked="true"/>
     <item android:drawable="@drawable/ic_toolbar_underline_light"/>
 
 </selector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_undo_dark.xml b/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_undo_dark.xml
index 65a770cd..579a031f 100644
--- a/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_undo_dark.xml
+++ b/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_undo_dark.xml
@@ -1,24 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <selector
     xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:drawable="@drawable/ic_toolbar_undo_dark_pressed" android:state_pressed="true"/>
+    <item android:drawable="@drawable/ic_toolbar_undo_pressed" android:state_pressed="true"/>
     <item android:drawable="@drawable/ic_toolbar_undo_dark"/>
 
 </selector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_undo_light.xml b/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_undo_light.xml
index 0fc1ed42..94ae83e4 100644
--- a/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_undo_light.xml
+++ b/RTEditor-Toolbar/src/main/res/drawable/selector_ic_toolbar_undo_light.xml
@@ -1,24 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <selector
     xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:drawable="@drawable/ic_toolbar_undo_light_pressed" android:state_pressed="true"/>
+    <item android:drawable="@drawable/ic_toolbar_undo_pressed" android:state_pressed="true"/>
     <item android:drawable="@drawable/ic_toolbar_undo_light"/>
 
 </selector>
diff --git a/RTEditor-Toolbar/src/main/res/drawable/vertical_divider.xml b/RTEditor-Toolbar/src/main/res/drawable/vertical_divider.xml
index 361d0daf..b1aa00b8 100644
--- a/RTEditor-Toolbar/src/main/res/drawable/vertical_divider.xml
+++ b/RTEditor-Toolbar/src/main/res/drawable/vertical_divider.xml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <shape xmlns:android="http://schemas.android.com/apk/res/android" >
diff --git a/RTEditor-Toolbar/src/main/res/layout/rte_toolbar.xml b/RTEditor-Toolbar/src/main/res/layout/rte_toolbar.xml
index 759bbcaa..1edc9be9 100644
--- a/RTEditor-Toolbar/src/main/res/layout/rte_toolbar.xml
+++ b/RTEditor-Toolbar/src/main/res/layout/rte_toolbar.xml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <HorizontalScrollView
@@ -130,15 +132,19 @@
 
         <com.onegravity.rteditor.toolbar.RTToolbarImageButton
             android:id="@+id/toolbar_barcode"
-            android:src="@drawable/ic_toolbar_barcode_selected"
             style="@style/RTE_ToolbarButton"
-            />
+            android:background="?attr/rte_icToolbarBarcode"/>
 
         <com.onegravity.rteditor.toolbar.RTToolbarImageButton
             android:id="@+id/toolbar_image"
             style="@style/RTE_ToolbarButton"
             android:background="?attr/rte_icToolbarImage"/>
 
+        <com.onegravity.rteditor.toolbar.RTToolbarImageButton
+            android:id="@+id/toolbar_gif"
+            style="@style/RTE_ToolbarButton"
+            android:background="?attr/rte_icToolbarGif"/>
+
         <com.onegravity.rteditor.toolbar.RTToolbarImageButton
             android:id="@+id/toolbar_image_capture"
             style="@style/RTE_ToolbarButton"
diff --git a/RTEditor-Toolbar/src/main/res/layout/rte_toolbar_bgcolor_spinner.xml b/RTEditor-Toolbar/src/main/res/layout/rte_toolbar_bgcolor_spinner.xml
index 1996387e..f99ab907 100644
--- a/RTEditor-Toolbar/src/main/res/layout/rte_toolbar_bgcolor_spinner.xml
+++ b/RTEditor-Toolbar/src/main/res/layout/rte_toolbar_bgcolor_spinner.xml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <ImageView
diff --git a/RTEditor-Toolbar/src/main/res/layout/rte_toolbar_bgcolor_spinner_item.xml b/RTEditor-Toolbar/src/main/res/layout/rte_toolbar_bgcolor_spinner_item.xml
index 8236aaf6..8d43f9b3 100644
--- a/RTEditor-Toolbar/src/main/res/layout/rte_toolbar_bgcolor_spinner_item.xml
+++ b/RTEditor-Toolbar/src/main/res/layout/rte_toolbar_bgcolor_spinner_item.xml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <FrameLayout
diff --git a/RTEditor-Toolbar/src/main/res/layout/rte_toolbar_character.xml b/RTEditor-Toolbar/src/main/res/layout/rte_toolbar_character.xml
index e2942718..12a46c19 100644
--- a/RTEditor-Toolbar/src/main/res/layout/rte_toolbar_character.xml
+++ b/RTEditor-Toolbar/src/main/res/layout/rte_toolbar_character.xml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <HorizontalScrollView
diff --git a/RTEditor-Toolbar/src/main/res/layout/rte_toolbar_divider.xml b/RTEditor-Toolbar/src/main/res/layout/rte_toolbar_divider.xml
index f0369f36..37c613bb 100644
--- a/RTEditor-Toolbar/src/main/res/layout/rte_toolbar_divider.xml
+++ b/RTEditor-Toolbar/src/main/res/layout/rte_toolbar_divider.xml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <ImageView
diff --git a/RTEditor-Toolbar/src/main/res/layout/rte_toolbar_font_spinner.xml b/RTEditor-Toolbar/src/main/res/layout/rte_toolbar_font_spinner.xml
index 6a05b127..3257162d 100644
--- a/RTEditor-Toolbar/src/main/res/layout/rte_toolbar_font_spinner.xml
+++ b/RTEditor-Toolbar/src/main/res/layout/rte_toolbar_font_spinner.xml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <ImageView
diff --git a/RTEditor-Toolbar/src/main/res/layout/rte_toolbar_fontcolor_spinner.xml b/RTEditor-Toolbar/src/main/res/layout/rte_toolbar_fontcolor_spinner.xml
index d385c227..5bbaad8b 100644
--- a/RTEditor-Toolbar/src/main/res/layout/rte_toolbar_fontcolor_spinner.xml
+++ b/RTEditor-Toolbar/src/main/res/layout/rte_toolbar_fontcolor_spinner.xml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <ImageView
diff --git a/RTEditor-Toolbar/src/main/res/layout/rte_toolbar_fontcolor_spinner_item.xml b/RTEditor-Toolbar/src/main/res/layout/rte_toolbar_fontcolor_spinner_item.xml
index 8236aaf6..8d43f9b3 100644
--- a/RTEditor-Toolbar/src/main/res/layout/rte_toolbar_fontcolor_spinner_item.xml
+++ b/RTEditor-Toolbar/src/main/res/layout/rte_toolbar_fontcolor_spinner_item.xml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <FrameLayout
diff --git a/RTEditor-Toolbar/src/main/res/layout/rte_toolbar_fontsize_spinner.xml b/RTEditor-Toolbar/src/main/res/layout/rte_toolbar_fontsize_spinner.xml
index 51ff12b3..6549fa8a 100644
--- a/RTEditor-Toolbar/src/main/res/layout/rte_toolbar_fontsize_spinner.xml
+++ b/RTEditor-Toolbar/src/main/res/layout/rte_toolbar_fontsize_spinner.xml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <FrameLayout
diff --git a/RTEditor-Toolbar/src/main/res/layout/rte_toolbar_paragraph.xml b/RTEditor-Toolbar/src/main/res/layout/rte_toolbar_paragraph.xml
index 26251b6b..8b6441d6 100644
--- a/RTEditor-Toolbar/src/main/res/layout/rte_toolbar_paragraph.xml
+++ b/RTEditor-Toolbar/src/main/res/layout/rte_toolbar_paragraph.xml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <HorizontalScrollView
@@ -74,6 +76,11 @@
             style="@style/RTE_ToolbarButton"
             android:background="?attr/rte_icToolbarLink"/>
 
+        <com.onegravity.rteditor.toolbar.RTToolbarImageButton
+            android:id="@+id/toolbar_barcode"
+            style="@style/RTE_ToolbarButton"
+            android:background="?attr/rte_icToolbarBarcode"/>
+
         <com.onegravity.rteditor.toolbar.RTToolbarImageButton
             android:id="@+id/toolbar_image"
             style="@style/RTE_ToolbarButton"
diff --git a/RTEditor-Toolbar/src/main/res/layout/rte_toolbar_spinner_item.xml b/RTEditor-Toolbar/src/main/res/layout/rte_toolbar_spinner_item.xml
index 6861fb56..6961e19d 100644
--- a/RTEditor-Toolbar/src/main/res/layout/rte_toolbar_spinner_item.xml
+++ b/RTEditor-Toolbar/src/main/res/layout/rte_toolbar_spinner_item.xml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <FrameLayout
diff --git a/RTEditor-Toolbar/src/main/res/values-de/rte_toolbar_strings.xml b/RTEditor-Toolbar/src/main/res/values-de/rte_toolbar_strings.xml
index 25455b43..739e7bdb 100644
--- a/RTEditor-Toolbar/src/main/res/values-de/rte_toolbar_strings.xml
+++ b/RTEditor-Toolbar/src/main/res/values-de/rte_toolbar_strings.xml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
diff --git a/RTEditor-Toolbar/src/main/res/values-es/rte_toolbar_strings.xml b/RTEditor-Toolbar/src/main/res/values-es/rte_toolbar_strings.xml
index c4955896..f51604e0 100644
--- a/RTEditor-Toolbar/src/main/res/values-es/rte_toolbar_strings.xml
+++ b/RTEditor-Toolbar/src/main/res/values-es/rte_toolbar_strings.xml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
diff --git a/RTEditor-Toolbar/src/main/res/values-fa/rte_toolbar_strings.xml b/RTEditor-Toolbar/src/main/res/values-fa/rte_toolbar_strings.xml
index fde474ea..ed3b4b9e 100644
--- a/RTEditor-Toolbar/src/main/res/values-fa/rte_toolbar_strings.xml
+++ b/RTEditor-Toolbar/src/main/res/values-fa/rte_toolbar_strings.xml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
diff --git a/RTEditor-Toolbar/src/main/res/values-fr/rte_toolbar_strings.xml b/RTEditor-Toolbar/src/main/res/values-fr/rte_toolbar_strings.xml
index e99d5b7a..4b1466e0 100644
--- a/RTEditor-Toolbar/src/main/res/values-fr/rte_toolbar_strings.xml
+++ b/RTEditor-Toolbar/src/main/res/values-fr/rte_toolbar_strings.xml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
diff --git a/RTEditor-Toolbar/src/main/res/values-it/rte_toolbar_strings.xml b/RTEditor-Toolbar/src/main/res/values-it/rte_toolbar_strings.xml
index a9d72537..ac46cbc9 100644
--- a/RTEditor-Toolbar/src/main/res/values-it/rte_toolbar_strings.xml
+++ b/RTEditor-Toolbar/src/main/res/values-it/rte_toolbar_strings.xml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
diff --git a/RTEditor-Toolbar/src/main/res/values-ja/rte_toolbar_strings.xml b/RTEditor-Toolbar/src/main/res/values-ja/rte_toolbar_strings.xml
index 650cd59f..619df1ab 100644
--- a/RTEditor-Toolbar/src/main/res/values-ja/rte_toolbar_strings.xml
+++ b/RTEditor-Toolbar/src/main/res/values-ja/rte_toolbar_strings.xml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
diff --git a/RTEditor-Toolbar/src/main/res/values-land/rte_toolbar_dimensions.xml b/RTEditor-Toolbar/src/main/res/values-land/rte_toolbar_dimensions.xml
index b5c052f3..2d6c9c77 100644
--- a/RTEditor-Toolbar/src/main/res/values-land/rte_toolbar_dimensions.xml
+++ b/RTEditor-Toolbar/src/main/res/values-land/rte_toolbar_dimensions.xml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <resources>
diff --git a/RTEditor-Toolbar/src/main/res/values-large-hdpi-1024x600/rte_toolbar_dimensions.xml b/RTEditor-Toolbar/src/main/res/values-large-hdpi-1024x600/rte_toolbar_dimensions.xml
index 7ce52b5d..1cb82a1e 100644
--- a/RTEditor-Toolbar/src/main/res/values-large-hdpi-1024x600/rte_toolbar_dimensions.xml
+++ b/RTEditor-Toolbar/src/main/res/values-large-hdpi-1024x600/rte_toolbar_dimensions.xml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <resources>
diff --git a/RTEditor-Toolbar/src/main/res/values-large-land-hdpi-1024x600/rte_toolbar_dimensions.xml b/RTEditor-Toolbar/src/main/res/values-large-land-hdpi-1024x600/rte_toolbar_dimensions.xml
index b5c052f3..2d6c9c77 100644
--- a/RTEditor-Toolbar/src/main/res/values-large-land-hdpi-1024x600/rte_toolbar_dimensions.xml
+++ b/RTEditor-Toolbar/src/main/res/values-large-land-hdpi-1024x600/rte_toolbar_dimensions.xml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <resources>
diff --git a/RTEditor-Toolbar/src/main/res/values-large-land-mdpi-1024x600/rte_toolbar_dimensions.xml b/RTEditor-Toolbar/src/main/res/values-large-land-mdpi-1024x600/rte_toolbar_dimensions.xml
index 7ce52b5d..1cb82a1e 100644
--- a/RTEditor-Toolbar/src/main/res/values-large-land-mdpi-1024x600/rte_toolbar_dimensions.xml
+++ b/RTEditor-Toolbar/src/main/res/values-large-land-mdpi-1024x600/rte_toolbar_dimensions.xml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <resources>
diff --git a/RTEditor-Toolbar/src/main/res/values-large-mdpi-1024x600/rte_toolbar_dimensions.xml b/RTEditor-Toolbar/src/main/res/values-large-mdpi-1024x600/rte_toolbar_dimensions.xml
index 1b0fd7da..fdb64392 100644
--- a/RTEditor-Toolbar/src/main/res/values-large-mdpi-1024x600/rte_toolbar_dimensions.xml
+++ b/RTEditor-Toolbar/src/main/res/values-large-mdpi-1024x600/rte_toolbar_dimensions.xml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <resources>
diff --git a/RTEditor-Toolbar/src/main/res/values-pt-rBR/rte_toolbar_strings.xml b/RTEditor-Toolbar/src/main/res/values-pt-rBR/rte_toolbar_strings.xml
index 667bff18..b5aa3a09 100644
--- a/RTEditor-Toolbar/src/main/res/values-pt-rBR/rte_toolbar_strings.xml
+++ b/RTEditor-Toolbar/src/main/res/values-pt-rBR/rte_toolbar_strings.xml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
diff --git a/RTEditor-Toolbar/src/main/res/values-ru/rte_toolbar_strings.xml b/RTEditor-Toolbar/src/main/res/values-ru/rte_toolbar_strings.xml
index c795de40..3c899ae3 100644
--- a/RTEditor-Toolbar/src/main/res/values-ru/rte_toolbar_strings.xml
+++ b/RTEditor-Toolbar/src/main/res/values-ru/rte_toolbar_strings.xml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
diff --git a/RTEditor-Toolbar/src/main/res/values-sw600dp/rte_toolbar_dimensions.xml b/RTEditor-Toolbar/src/main/res/values-sw600dp/rte_toolbar_dimensions.xml
index 7ce52b5d..1cb82a1e 100644
--- a/RTEditor-Toolbar/src/main/res/values-sw600dp/rte_toolbar_dimensions.xml
+++ b/RTEditor-Toolbar/src/main/res/values-sw600dp/rte_toolbar_dimensions.xml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <resources>
diff --git a/RTEditor-Toolbar/src/main/res/values-v21/rte_toolbar_themes.xml b/RTEditor-Toolbar/src/main/res/values-v21/rte_toolbar_themes.xml
index 3a9ed6e9..c09d3de8 100644
--- a/RTEditor-Toolbar/src/main/res/values-v21/rte_toolbar_themes.xml
+++ b/RTEditor-Toolbar/src/main/res/values-v21/rte_toolbar_themes.xml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
diff --git a/RTEditor-Toolbar/src/main/res/values-xlarge/rte_toolbar_dimensions.xml b/RTEditor-Toolbar/src/main/res/values-xlarge/rte_toolbar_dimensions.xml
index 7ce52b5d..1cb82a1e 100644
--- a/RTEditor-Toolbar/src/main/res/values-xlarge/rte_toolbar_dimensions.xml
+++ b/RTEditor-Toolbar/src/main/res/values-xlarge/rte_toolbar_dimensions.xml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <resources>
diff --git a/RTEditor-Toolbar/src/main/res/values/rte_toolbar_arrays.xml b/RTEditor-Toolbar/src/main/res/values/rte_toolbar_arrays.xml
index 70f1c97d..72fb1c8c 100644
--- a/RTEditor-Toolbar/src/main/res/values/rte_toolbar_arrays.xml
+++ b/RTEditor-Toolbar/src/main/res/values/rte_toolbar_arrays.xml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <resources>
diff --git a/RTEditor-Toolbar/src/main/res/values/rte_toolbar_attrs.xml b/RTEditor-Toolbar/src/main/res/values/rte_toolbar_attrs.xml
index 123bc2f8..00cc48ef 100644
--- a/RTEditor-Toolbar/src/main/res/values/rte_toolbar_attrs.xml
+++ b/RTEditor-Toolbar/src/main/res/values/rte_toolbar_attrs.xml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <resources>
@@ -41,7 +43,9 @@
         <attr name="rte_icToolbarFontColor" format="reference"/>
         <attr name="rte_icToolbarBGColor" format="reference"/>
         <attr name="rte_icToolbarLink" format="reference"/>
+        <attr name="rte_icToolbarBarcode" format="reference"/>
         <attr name="rte_icToolbarImage" format="reference"/>
+        <attr name="rte_icToolbarGif" format="reference"/>
         <attr name="rte_icToolbarCapture" format="reference"/>
         <attr name="rte_icToolbarUndo" format="reference"/>
         <attr name="rte_icToolbarRedo" format="reference"/>
diff --git a/RTEditor-Toolbar/src/main/res/values/rte_toolbar_colors.xml b/RTEditor-Toolbar/src/main/res/values/rte_toolbar_colors.xml
index f0050257..dd5cb940 100644
--- a/RTEditor-Toolbar/src/main/res/values/rte_toolbar_colors.xml
+++ b/RTEditor-Toolbar/src/main/res/values/rte_toolbar_colors.xml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <resources>
diff --git a/RTEditor-Toolbar/src/main/res/values/rte_toolbar_dimensions.xml b/RTEditor-Toolbar/src/main/res/values/rte_toolbar_dimensions.xml
index 8ed54bd9..224bfcf0 100644
--- a/RTEditor-Toolbar/src/main/res/values/rte_toolbar_dimensions.xml
+++ b/RTEditor-Toolbar/src/main/res/values/rte_toolbar_dimensions.xml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <resources>
diff --git a/RTEditor-Toolbar/src/main/res/values/rte_toolbar_strings.xml b/RTEditor-Toolbar/src/main/res/values/rte_toolbar_strings.xml
index 9f20f8b6..60f8b2d5 100644
--- a/RTEditor-Toolbar/src/main/res/values/rte_toolbar_strings.xml
+++ b/RTEditor-Toolbar/src/main/res/values/rte_toolbar_strings.xml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
diff --git a/RTEditor-Toolbar/src/main/res/values/rte_toolbar_styles.xml b/RTEditor-Toolbar/src/main/res/values/rte_toolbar_styles.xml
index 23de1864..1928b2ad 100644
--- a/RTEditor-Toolbar/src/main/res/values/rte_toolbar_styles.xml
+++ b/RTEditor-Toolbar/src/main/res/values/rte_toolbar_styles.xml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
diff --git a/RTEditor-Toolbar/src/main/res/values/rte_toolbar_themes.xml b/RTEditor-Toolbar/src/main/res/values/rte_toolbar_themes.xml
index f2eabdce..163a2bf1 100644
--- a/RTEditor-Toolbar/src/main/res/values/rte_toolbar_themes.xml
+++ b/RTEditor-Toolbar/src/main/res/values/rte_toolbar_themes.xml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
@@ -43,7 +45,9 @@
         <item name="rte_icToolbarFontColor">@drawable/selector_ic_toolbar_fontcolor_light</item>
         <item name="rte_icToolbarBGColor">@drawable/selector_ic_toolbar_bgcolor_light</item>
         <item name="rte_icToolbarLink">@drawable/selector_ic_toolbar_link_light</item>
+        <item name="rte_icToolbarBarcode">@drawable/ic_toolbar_barcode_light</item>
         <item name="rte_icToolbarImage">@drawable/selector_ic_toolbar_image_light</item>
+        <item name="rte_icToolbarGif">@drawable/selector_ic_toolbar_gif_light</item>
         <item name="rte_icToolbarCapture">@drawable/selector_ic_toolbar_capture_light</item>
         <item name="rte_icToolbarUndo">@drawable/selector_ic_toolbar_undo_light</item>
         <item name="rte_icToolbarRedo">@drawable/selector_ic_toolbar_redo_light</item>
@@ -78,7 +82,9 @@
         <item name="rte_icToolbarFontColor">@drawable/selector_ic_toolbar_fontcolor_dark</item>
         <item name="rte_icToolbarBGColor">@drawable/selector_ic_toolbar_bgcolor_dark</item>
         <item name="rte_icToolbarLink">@drawable/selector_ic_toolbar_link_dark</item>
+        <item name="rte_icToolbarBarcode">@drawable/ic_toolbar_barcode_light</item>
         <item name="rte_icToolbarImage">@drawable/selector_ic_toolbar_image_dark</item>
+        <item name="rte_icToolbarGif">@drawable/selector_ic_toolbar_gif_dark</item>
         <item name="rte_icToolbarCapture">@drawable/selector_ic_toolbar_capture_dark</item>
         <item name="rte_icToolbarUndo">@drawable/selector_ic_toolbar_undo_dark</item>
         <item name="rte_icToolbarRedo">@drawable/selector_ic_toolbar_redo_dark</item>
diff --git a/RTEditor/build.gradle b/RTEditor/build.gradle
index d038975d..125d0376 100644
--- a/RTEditor/build.gradle
+++ b/RTEditor/build.gradle
@@ -17,12 +17,12 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 24
-    buildToolsVersion '24.0.2'
+    compileSdkVersion 25
+    buildToolsVersion '25.0.0'
 
     defaultConfig {
         minSdkVersion 14
-        targetSdkVersion 24
+        targetSdkVersion 25
     }
 
     buildTypes {
@@ -37,10 +37,17 @@ android {
     }
 }
 
+repositories {
+    mavenCentral()
+    maven { url "https://oss.sonatype.org/content/repositories/snapshots" }
+}
+
 dependencies {
     compile 'com.1gravity:android-colorpicker:2.0.2'
     compile 'com.google.zxing:core:3.3.0'
+    compile 'pl.droidsonroids.gif:android-gif-drawable:1.2.2'
 }
 
+
 apply from: '../android-artifacts.gradle'
 apply from: '../central-publish.gradle'
diff --git a/RTEditor/src/main/java/com/onegravity/rteditor/BarcodeFragment.java b/RTEditor/src/main/java/com/onegravity/rteditor/BarcodeFragment.java
deleted file mode 100644
index 4af57e4e..00000000
--- a/RTEditor/src/main/java/com/onegravity/rteditor/BarcodeFragment.java
+++ /dev/null
@@ -1,361 +0,0 @@
-package com.onegravity.rteditor;
-
-import android.annotation.SuppressLint;
-import android.app.Activity;
-import android.app.Dialog;
-import android.app.DialogFragment;
-import android.app.Fragment;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.graphics.Bitmap;
-import android.os.AsyncTask;
-import android.os.Bundle;
-import android.os.Environment;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AlertDialog;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.EditText;
-
-import com.google.zxing.BarcodeFormat;
-import com.google.zxing.EncodeHintType;
-import com.google.zxing.MultiFormatWriter;
-import com.google.zxing.WriterException;
-import com.google.zxing.common.BitMatrix;
-import com.onegravity.rteditor.api.format.RTFormat;
-import com.onegravity.rteditor.api.media.RTImage;
-
-import org.greenrobot.eventbus.EventBus;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.EnumMap;
-import java.util.Map;
-import java.util.UUID;
-
-import static android.graphics.Color.BLACK;
-import static android.graphics.Color.WHITE;
-
-/**
- * A DialogFragment to add, modify or remove QR Codes from Spanned text.
- */
-
-public class BarcodeFragment extends DialogFragment {
-
-    private static final String BARCODE_DATA = "barcode_data";
-    private static final String BARCODE_WIDTH = "barcode_width";
-
-
-    static class Barcode {
-        final private RTImage mBarcode;
-        final private Bitmap mBitmap;
-        final private String mEncodeText;
-        final private int mWidth;
-
-        private Barcode(RTImage barcode, String encodeText, int width) {
-            mBarcode = barcode;
-            mBitmap = null;
-            mEncodeText = encodeText;
-            mWidth = width;
-        }
-
-        private Barcode(Bitmap bitmap, String encodeText, int width) {
-            mBarcode = null;
-            mBitmap = bitmap;
-            mEncodeText = encodeText;
-            mWidth = width;
-        }
-
-        public Barcode(RTImage mBarcode, Bitmap mBitmap, String mEncodeText, int mWidth) {
-            this.mBarcode = mBarcode;
-            this.mBitmap = mBitmap;
-            this.mEncodeText = mEncodeText;
-            this.mWidth = mWidth;
-        }
-
-
-        public RTImage getImage() {
-            return mBarcode;
-        }
-
-        public Bitmap getBitmap() {
-            return mBitmap;
-        }
-
-        public String getEncodeText() {
-            return mEncodeText;
-        }
-
-        public int getWidth() {
-            return mWidth;
-        }
-
-        public boolean isValid() {
-            return !mEncodeText.isEmpty() && mWidth != 0;
-        }
-    }
-
-    /**
-     * This event is broadcast via EventBus when the dialog closes.
-     * It's received by the RTManager to update the active editor.
-     */
-    static class BarcodeEvent {
-        private final String mFragmentTag;
-        private final Barcode mBarcode;
-        private final boolean mWasCancelled;
-
-        BarcodeEvent(Fragment fragment, Barcode barcode, boolean wasCancelled) {
-            mFragmentTag = fragment.getTag();
-            mBarcode = barcode;
-            mWasCancelled = wasCancelled;
-        }
-
-
-        public String getFragmentTag() {
-            return mFragmentTag;
-        }
-
-        public Barcode getBarcode() {
-            return mBarcode;
-        }
-
-        public boolean wasCancelled() {
-            return mWasCancelled;
-        }
-    }
-
-    public static BarcodeFragment newInstance(String encodeText, int width) {
-        BarcodeFragment fragment = new BarcodeFragment();
-        Bundle args = new Bundle();
-        args.putString(BARCODE_DATA, encodeText);
-        args.putInt(BARCODE_WIDTH, width);
-        fragment.setArguments(args);
-        return fragment;
-    }
-
-    public BarcodeFragment() {
-    }
-
-    @NonNull
-    @SuppressLint("InflateParams")
-    @Override
-    public final Dialog onCreateDialog(Bundle savedInstanceState) {
-        Context context = getActivity();
-        LayoutInflater li = LayoutInflater.from(context);
-        View view = li.inflate(R.layout.rte_barcode, null);
-
-        Bundle args = getArguments();
-
-        // barcode data
-        final String data = args.getString(BARCODE_DATA);
-
-        final EditText dataView = ((EditText) view.findViewById(R.id.barcodeData));
-        if (data != null) {
-            dataView.setText(data);
-        }
-
-        // barcode width
-        final int width = args.getInt(BARCODE_WIDTH) != 0 ? args.getInt(BARCODE_WIDTH) : 200;
-        final EditText widthView = ((EditText) view.findViewById(R.id.barcodeWidth));
-        if (width > 1500) {
-            widthView.setText(String.valueOf(width));
-        }
-
-        AlertDialog.Builder builder = new AlertDialog.Builder(context)
-                .setTitle(R.string.rte_create_barcode)
-                .setView(view)
-                .setCancelable(false)
-                .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialog, int which) {
-                        try {
-                            validate(dataView, widthView);
-                        } catch (WriterException | IOException e) {
-                            e.printStackTrace();
-                        }
-                    }
-                })
-                .setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialog, int which) {
-                        EventBus.getDefault().post(new BarcodeEvent(BarcodeFragment.this, new Barcode(null, null, null, 0), true));
-                    }
-                });
-
-        if (data != null) {
-            builder.setNeutralButton(R.string.rte_remove_action, new DialogInterface.OnClickListener() {
-                @Override
-                public void onClick(DialogInterface dialog, int which) {
-                    // Remove button
-                    EventBus.getDefault().post(new BarcodeEvent(BarcodeFragment.this, null, false));
-                }
-            });
-        }
-
-        return builder.create();
-    }
-
-    private void validate(EditText dataView, EditText widthView) throws WriterException, IOException {
-        final String data = dataView.getText().toString().trim();
-        final int width = Integer.parseInt(widthView.getText().toString());
-        String errorMessage = null;
-
-        if (!data.isEmpty()) {
-            if (width < 1500) {
-                final Bitmap bitmap = encodeAsBitmap(data, width);
-
-                FileSaveAsyncTask task = new FileSaveAsyncTask(getActivity());
-                task.execute(new Barcode(bitmap, data, width));
-            } else {
-                errorMessage = getString(R.string.rte_barcode_big_image);
-            }
-        } else {
-            errorMessage = getString(R.string.rte_barcode_no_data);
-        }
-
-        if (errorMessage != null) dataView.setText(errorMessage);
-    }
-
-
-    @Override
-    public void onCancel(DialogInterface dialog) {
-        super.onCancel(dialog);
-        EventBus.getDefault().post(new BarcodeEvent(BarcodeFragment.this, null, true));
-    }
-
-    public static Bitmap encodeAsBitmap(String data, int width) throws WriterException, IllegalArgumentException {
-        if (data == null) {
-            return null;
-        }
-
-        BarcodeFormat format = BarcodeFormat.QR_CODE;
-        String encoding = "UTF-8";
-
-        Map<EncodeHintType, Object> hints = new EnumMap<>(EncodeHintType.class);
-        hints.put(EncodeHintType.CHARACTER_SET, encoding);
-
-        MultiFormatWriter writer = new MultiFormatWriter();
-        BitMatrix result;
-
-        try {
-            result = writer.encode(data, format, width, width, hints);
-        } catch (IllegalArgumentException iae) {
-            return null;
-        }
-
-        int imageWidth = result.getWidth();
-        int imageHeight = result.getHeight();
-        int[] pixels = new int[imageWidth * imageHeight];
-
-        for (int y = 0; y < imageHeight; y++) {
-            int offset = y * imageWidth;
-            for (int x = 0; x < imageWidth; x++) {
-                pixels[offset + x] = result.get(x, y) ? BLACK : WHITE;
-            }
-        }
-
-        Bitmap bitmap = Bitmap.createBitmap(imageWidth, imageHeight, Bitmap.Config.ARGB_8888);
-        bitmap.setPixels(pixels, 0, imageWidth, 0, 0, imageWidth, imageHeight);
-        return bitmap;
-    }
-
-    private class FileSaveAsyncTask extends AsyncTask<Barcode, Void, RTImage> {
-
-        Activity activity;
-        Bitmap bitmap;
-        String data;
-        int width;
-
-        FileSaveAsyncTask(Activity activity) {
-            this.activity = activity;
-        }
-
-        @Override
-        protected RTImage doInBackground(Barcode... params) {
-            String uniqueFileName = UUID.randomUUID().toString().replaceAll("-", "");
-            String directory = Environment.getExternalStorageDirectory().getAbsolutePath() + "/Android/data/" + activity.getPackageName() + "/files/images";
-
-            Barcode param = params[0];
-
-            bitmap = param.getBitmap();
-            data = param.getEncodeText();
-            width = param.getWidth();
-
-            File dir = new File(directory);
-            if (!dir.exists()) dir.mkdirs();
-
-            final String pathImage = directory + "/BARCODE-" + uniqueFileName + ".bmp";
-
-            FileOutputStream outImage = null;
-
-            try {
-                outImage = new FileOutputStream(pathImage);
-            } catch (FileNotFoundException e) {
-                e.printStackTrace();
-            }
-
-            RTImage barcode = null;
-            if (bitmap != null) {
-                bitmap.compress(Bitmap.CompressFormat.PNG, 100, outImage);
-                try {
-                    outImage.close();
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-                barcode = new RTImage() {
-                    @Override
-                    public String getFilePath(RTFormat format) {
-                        return pathImage;
-                    }
-
-                    @Override
-                    public String getFileName() {
-                        return pathImage.substring(pathImage.lastIndexOf("/"));
-                    }
-
-                    @Override
-                    public String getFileExtension() {
-                        return pathImage.substring(pathImage.lastIndexOf("."));
-                    }
-
-                    @Override
-                    public boolean exists() {
-                        return new File(pathImage).exists();
-                    }
-
-                    @Override
-                    public void remove() {
-                        new File(pathImage).delete();
-                    }
-
-                    @Override
-                    public int getWidth() {
-                        return width;
-                    }
-
-                    @Override
-                    public int getHeight() {
-                        return width;
-                    }
-
-                    @Override
-                    public long getSize() {
-                        return bitmap.getByteCount();
-                    }
-                };
-            }
-
-            return barcode;
-        }
-
-        @Override
-        protected void onPostExecute(RTImage image) {
-            BarcodeEvent event = new BarcodeEvent(BarcodeFragment.this, new Barcode(image, data, width), false);
-            EventBus.getDefault().post(event);
-        }
-    }
-
-}
diff --git a/RTEditor/src/main/java/com/onegravity/rteditor/RTEditText.java b/RTEditor/src/main/java/com/onegravity/rteditor/RTEditText.java
index 0c2436df..481de71b 100644
--- a/RTEditor/src/main/java/com/onegravity/rteditor/RTEditText.java
+++ b/RTEditor/src/main/java/com/onegravity/rteditor/RTEditText.java
@@ -37,11 +37,13 @@
 import com.onegravity.rteditor.api.format.RTPlainText;
 import com.onegravity.rteditor.api.format.RTText;
 import com.onegravity.rteditor.api.media.RTAudio;
+import com.onegravity.rteditor.api.media.RTGif;
 import com.onegravity.rteditor.api.media.RTImage;
 import com.onegravity.rteditor.api.media.RTMedia;
 import com.onegravity.rteditor.api.media.RTVideo;
 import com.onegravity.rteditor.effects.Effect;
 import com.onegravity.rteditor.effects.Effects;
+import com.onegravity.rteditor.spans.BarcodeSpan;
 import com.onegravity.rteditor.spans.LinkSpan;
 import com.onegravity.rteditor.spans.LinkSpan.LinkSpanListener;
 import com.onegravity.rteditor.spans.MediaSpan;
@@ -57,7 +59,9 @@
 /**
  * The actual rich text editor (extending android.widget.EditText).
  */
-public class RTEditText extends EditText implements TextWatcher, SpanWatcher, LinkSpanListener {
+public class RTEditText extends EditText implements TextWatcher, SpanWatcher,
+        LinkSpanListener,
+        BarcodeSpan.BarcodeSpanListener {
 
     // don't allow any formatting in text mode
     private boolean mUseRTFormatting = true;
@@ -80,7 +84,7 @@ public class RTEditText extends EditText implements TextWatcher, SpanWatcher, Li
 
     private RTEditTextListener mListener;
 
-    private RTMediaFactory<RTImage, RTAudio, RTVideo> mMediaFactory;
+    private RTMediaFactory<RTImage, RTGif, RTAudio, RTVideo> mMediaFactory;
 
     // used to check if selection has changed
     private int mOldSelStart = -1;
@@ -170,7 +174,7 @@ void onAddMedia(RTMedia media) {
      * @param listener     The RTEditTextListener (the RTManager)
      * @param mediaFactory The RTMediaFactory
      */
-    void register(RTEditTextListener listener, RTMediaFactory<RTImage, RTAudio, RTVideo> mediaFactory) {
+    void register(RTEditTextListener listener, RTMediaFactory<RTImage, RTGif, RTAudio, RTVideo> mediaFactory) {
         mListener = listener;
         mMediaFactory = mediaFactory;
     }
@@ -292,7 +296,7 @@ public void setRichTextEditing(boolean useRTFormatting, String content) {
         }
 
         RTText rtText = useRTFormatting ?
-                new RTHtml<RTImage, RTAudio, RTVideo>(RTFormat.HTML, content) :
+                new RTHtml<RTImage, RTGif, RTAudio, RTVideo>(RTFormat.HTML, content) :
                 new RTPlainText(content);
 
         setText(rtText);
@@ -476,7 +480,7 @@ private void addSpanWatcher() {
     }
 
     synchronized private void setParagraphsAreUp2Date(boolean value) {
-        if (! mIgnoreParagraphChanges) {
+        if (!mIgnoreParagraphChanges) {
             mParagraphsAreUp2Date = value;
         }
     }
@@ -515,12 +519,11 @@ public Parcelable onSaveInstanceState() {
 
     @Override
     public void onRestoreInstanceState(Parcelable state) {
-        if(state instanceof SavedState) {
-            SavedState savedState = (SavedState)state;
+        if (state instanceof SavedState) {
+            SavedState savedState = (SavedState) state;
             super.onRestoreInstanceState(savedState.getSuperState());
             setRichTextEditing(savedState.useRTFormatting(), savedState.getContent());
-        }
-        else {
+        } else {
             super.onRestoreInstanceState(state);
         }
 
@@ -568,6 +571,7 @@ public void writeToParcel(Parcel out, int flags) {
                     public SavedState createFromParcel(Parcel in) {
                         return new SavedState(in);
                     }
+
                     public SavedState[] newArray(int size) {
                         return new SavedState[size];
                     }
@@ -618,7 +622,7 @@ public <V extends Object, C extends RTSpan<V>> void applyEffect(Effect<V, C> eff
                 if (mListener != null && !mIgnoreTextChanges) {
                     Spannable newSpannable = cloneSpannable();
                     mListener.onTextChanged(this, oldSpannable, newSpannable, getSelectionStart(), getSelectionEnd(),
-                                            getSelectionStart(), getSelectionEnd());
+                            getSelectionStart(), getSelectionEnd());
                 }
                 mLayoutChanged = true;
             }
@@ -627,10 +631,18 @@ public <V extends Object, C extends RTSpan<V>> void applyEffect(Effect<V, C> eff
 
     @Override
     /* LinkSpanListener */
-    public void onClick(LinkSpan linkSpan) {
+    public void onLinkClicked(LinkSpan linkSpan) {
         if (mUseRTFormatting && mListener != null) {
             mListener.onClick(this, linkSpan);
         }
     }
 
+    /* BarcodeSpanListener */
+    @Override
+    public void onBarcodeClicked(BarcodeSpan barcodeSpan) {
+        if (mUseRTFormatting && mListener != null) {
+            mListener.onClick(this, barcodeSpan);
+        }
+    }
+
 }
\ No newline at end of file
diff --git a/RTEditor/src/main/java/com/onegravity/rteditor/RTEditTextListener.java b/RTEditor/src/main/java/com/onegravity/rteditor/RTEditTextListener.java
index 228c96d3..78e69f13 100644
--- a/RTEditor/src/main/java/com/onegravity/rteditor/RTEditTextListener.java
+++ b/RTEditor/src/main/java/com/onegravity/rteditor/RTEditTextListener.java
@@ -18,6 +18,7 @@
 
 import android.text.Spannable;
 
+import com.onegravity.rteditor.spans.BarcodeSpan;
 import com.onegravity.rteditor.spans.LinkSpan;
 
 /**
@@ -53,11 +54,16 @@ void onTextChanged(RTEditText editor, Spannable before, Spannable after,
     /**
      * A link in a LinkSpan has been clicked.
      */
-    public void onClick(RTEditText editor, LinkSpan span);
+    void onClick(RTEditText editor, LinkSpan span);
+
+    /**
+     * A barcode in a BarcodeSpan has been clicked.
+     */
+    void onClick(RTEditText editor, BarcodeSpan span);
 
     /**
      * Rich text editing was enabled/disabled for this editor.
      */
-    public void onRichTextEditingChanged(RTEditText editor, boolean useRichText);
+    void onRichTextEditingChanged(RTEditText editor, boolean useRichText);
 
 }
diff --git a/RTEditor/src/main/java/com/onegravity/rteditor/RTEditorMovementMethod.java b/RTEditor/src/main/java/com/onegravity/rteditor/RTEditorMovementMethod.java
index a120afa1..817477b5 100644
--- a/RTEditor/src/main/java/com/onegravity/rteditor/RTEditorMovementMethod.java
+++ b/RTEditor/src/main/java/com/onegravity/rteditor/RTEditorMovementMethod.java
@@ -30,6 +30,8 @@
 import android.view.MotionEvent;
 import android.widget.TextView;
 
+import com.onegravity.rteditor.spans.BarcodeSpan;
+
 /**
  * ArrowKeyMovementMethod does support selection of text but not the clicking of links.
  * LinkMovementMethod does support clicking of links but not the selection of text.
@@ -69,9 +71,12 @@ public boolean onTouchEvent(TextView widget, Spannable buffer, MotionEvent event
                     return true;
                 }
             }
-            /*else {
-                Selection.removeSelection(buffer);
-            }*/
+            else {
+                ClickableSpan[] link = buffer.getSpans(0, buffer.length(), BarcodeSpan.class);
+                if (link.length != 0) {
+                    link[0].onClick(widget);
+                }
+            }
 
         }
 
diff --git a/RTEditor/src/main/java/com/onegravity/rteditor/RTManager.java b/RTEditor/src/main/java/com/onegravity/rteditor/RTManager.java
index aad66bb0..f3ad0036 100644
--- a/RTEditor/src/main/java/com/onegravity/rteditor/RTManager.java
+++ b/RTEditor/src/main/java/com/onegravity/rteditor/RTManager.java
@@ -17,10 +17,10 @@
 package com.onegravity.rteditor;
 
 import android.content.Intent;
+import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.os.Handler;
 import android.text.Editable;
-import android.text.Layout;
 import android.text.Layout.Alignment;
 import android.text.Spannable;
 import android.text.Spanned;
@@ -31,13 +31,14 @@
 import android.view.animation.Animation.AnimationListener;
 import android.widget.Toast;
 
-import com.onegravity.rteditor.BarcodeFragment.BarcodeEvent;
-import com.onegravity.rteditor.LinkFragment.Link;
-import com.onegravity.rteditor.LinkFragment.LinkEvent;
 import com.onegravity.rteditor.RTOperationManager.TextChangeOperation;
 import com.onegravity.rteditor.api.RTApi;
+import com.onegravity.rteditor.api.media.RTGif;
 import com.onegravity.rteditor.api.media.RTImage;
 import com.onegravity.rteditor.api.media.RTMedia;
+import com.onegravity.rteditor.barcode.Barcode;
+import com.onegravity.rteditor.barcode.BarcodeEvent;
+import com.onegravity.rteditor.barcode.BarcodeFragment;
 import com.onegravity.rteditor.effects.AbsoluteSizeEffect;
 import com.onegravity.rteditor.effects.AlignmentEffect;
 import com.onegravity.rteditor.effects.BackgroundColorEffect;
@@ -55,8 +56,13 @@
 import com.onegravity.rteditor.effects.TypefaceEffect;
 import com.onegravity.rteditor.effects.UnderlineEffect;
 import com.onegravity.rteditor.fonts.RTTypeface;
+import com.onegravity.rteditor.link.Link;
+import com.onegravity.rteditor.link.LinkEvent;
+import com.onegravity.rteditor.link.LinkFragment;
 import com.onegravity.rteditor.media.choose.MediaChooserActivity;
 import com.onegravity.rteditor.media.choose.MediaEvent;
+import com.onegravity.rteditor.spans.BarcodeSpan;
+import com.onegravity.rteditor.spans.GifSpan;
 import com.onegravity.rteditor.spans.ImageSpan;
 import com.onegravity.rteditor.spans.LinkSpan;
 import com.onegravity.rteditor.spans.RTSpan;
@@ -68,6 +74,7 @@
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
 
+import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.List;
@@ -89,7 +96,6 @@ public class RTManager implements RTToolbarListener, RTEditTextListener {
     private static final String ID_01_LINK_FRAGMENT = "ID_01_LINK_FRAGMENT";
     private static final String ID_02_BARCODE_FRAGMENT = "ID_02_BARCODE_FRAGMENT";
 
-
     /*
      * The toolbar(s) may automatically be shown or hidden when a rich text
      * editor gains or loses focus depending on the ToolbarVisibility setting.
@@ -456,32 +462,35 @@ public void onCreateLink() {
         }
     }
 
+    @Override
+    public void onInsertBarcode() {
+        RTEditText editor = getActiveEditor();
+        if (editor != null) {
+            mRTApi.openDialogFragment(ID_02_BARCODE_FRAGMENT, BarcodeFragment.newInstance(null, null, 0));
+        }
+    }
+
     @Override
     /* @inheritDoc */
     public void onPickImage() {
         onPickCaptureImage(MediaAction.PICK_PICTURE);
     }
 
+    @Override
+    public void onPickGif() {
+        onPickCaptureImage(MediaAction.PICK_GIF);
+    }
+
     @Override
     /* @inheritDoc */
     public void onCaptureImage() {
         onPickCaptureImage(MediaAction.CAPTURE_PICTURE);
     }
 
-    @Override
-    public void onInsertBarcode() {
-        RTEditText editor = getActiveEditor();
-        if (editor != null) {
-            String data;
-            int width = 200;
-            data = editor.getSelectedText();
-
-            mRTApi.openDialogFragment(ID_02_BARCODE_FRAGMENT, BarcodeFragment.newInstance(data, width));
-        }
-    }
 
     private void onPickCaptureImage(MediaAction mediaAction) {
         RTEditText editor = getActiveEditor();
+
         if (editor != null && mRTApi != null) {
             mActiveEditor = editor.getId();
 
@@ -493,9 +502,9 @@ private void onPickCaptureImage(MediaAction mediaAction) {
         }
     }
 
-    /* called from onEventMainThread(MediaEvent) */
-    private void insertImage(final RTEditText editor, final RTImage image) {
-        if (image != null && editor != null) {
+    /* called from onEventMainThread(MediaEvent) and from onEventMainThread(BarcodeEvent event) */
+    private void insertImage(final RTEditText editor, final RTImage image, final RTGif gif, Barcode barcode) {
+        if (editor != null) {
             Selection selection = new Selection(editor);
             Editable str = editor.getText();
 
@@ -507,14 +516,79 @@ private void insertImage(final RTEditText editor, final RTImage image) {
                 // now add the actual image and inform the RTOperationManager about the operation
                 Spannable oldSpannable = editor.cloneSpannable();
 
-                ImageSpan imageSpan = new ImageSpan(image, false);
-                str.setSpan(imageSpan, selection.start(), selection.end() + 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+                if (image != null) {
+                    ImageSpan imageSpan = new ImageSpan(image, false);
+                    str.setSpan(imageSpan, selection.start(), selection.end() + 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+
+                    if (barcode != null) {
+                        BarcodeSpan barcodeSpan = new BarcodeSpan(barcode);
+                        str.setSpan(barcodeSpan, selection.start(), selection.end() + 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+                    }
+                }
+
+                if (gif != null) {
+                    Drawable drawable = gif.getDrawable();
+                    drawable.setCallback(new Drawable.Callback() {
+                        @Override
+                        public void invalidateDrawable(Drawable who) {
+                            editor.invalidate();
+                        }
+
+                        @Override
+                        public void scheduleDrawable(Drawable who, Runnable what, long when) {
+                            editor.postDelayed(what, when);
+                        }
+
+                        @Override
+                        public void unscheduleDrawable(Drawable who, Runnable what) {
+                            editor.removeCallbacks(what);
+                        }
+                    });
+                    gif.setDrawable(drawable);
+
+                    GifSpan gifSpan = new GifSpan(gif, false);
+
+
+                    str.setSpan(gifSpan, selection.start(), selection.end() + 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+                }
                 int selStartAfter = editor.getSelectionStart();
                 int selEndAfter = editor.getSelectionEnd();
                 editor.onAddMedia(image);
 
                 Spannable newSpannable = editor.cloneSpannable();
 
+                mOPManager.executed(editor, new TextChangeOperation(oldSpannable, newSpannable,
+                        selection.start(), selection.end(), selStartAfter, selEndAfter));
+            } catch (OutOfMemoryError e) {
+                str.delete(selection.start(), selection.end() + 1);
+                mRTApi.makeText(R.string.rte_add_image_error, Toast.LENGTH_LONG).show();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+    private void removeImage(final RTEditText editor, final Barcode barcode) {
+        if (editor != null && barcode != null) {
+            Selection selection = new Selection(editor);
+            Editable str = editor.getText();
+            try {
+                Spannable oldSpannable = editor.cloneSpannable();
+                barcode.getImage().remove();
+                int start;
+                int stop;
+                if (selection.start() == 0) {
+                    start = 0;
+                    stop = 1;
+                } else {
+                    start = selection.start() - 1;
+                    stop = selection.end();
+                }
+                str.delete(start, stop);
+
+                int selStartAfter = editor.getSelectionStart();
+                int selEndAfter = editor.getSelectionEnd();
+                Spannable newSpannable = editor.cloneSpannable();
                 mOPManager.executed(editor, new TextChangeOperation(oldSpannable, newSpannable,
                         selection.start(), selection.end(), selStartAfter, selEndAfter));
             } catch (OutOfMemoryError e) {
@@ -704,35 +778,6 @@ public void onClick(RTEditText editor, LinkSpan span) {
         }
     }
 
-    private String getLinkText(RTEditText editor, RTSpan<String> span) {
-        Spannable text = editor.getText();
-        final int spanStart = text.getSpanStart(span);
-        final int spanEnd = text.getSpanEnd(span);
-        String linkText = null;
-        if (spanStart >= 0 && spanEnd >= 0 && spanEnd <= text.length()) {
-            linkText = text.subSequence(spanStart, spanEnd).toString();
-            mLinkSelection = new Selection(spanStart, spanEnd);
-        } else {
-            mLinkSelection = editor.getSelection();
-        }
-        return linkText;
-    }
-
-    /**
-     * Media file was picked -> process the result.
-     */
-    @Subscribe(sticky = true, threadMode = ThreadMode.MAIN)
-    public void onEventMainThread(MediaEvent event) {
-
-        RTEditText editor = mEditors.get(mActiveEditor);
-        RTMedia media = event.getMedia();
-        if (editor != null && media instanceof RTImage) {
-            insertImage(editor, (RTImage) media);
-            EventBus.getDefault().removeStickyEvent(event);
-            mActiveEditor = Integer.MAX_VALUE;
-        }
-    }
-
     /**
      * LinkFragment has closed -> process the result.
      */
@@ -772,24 +817,72 @@ public void onEventMainThread(LinkEvent event) {
         }
     }
 
+    private String getLinkText(RTEditText editor, RTSpan<String> span) {
+        Spannable text = editor.getText();
+        final int spanStart = text.getSpanStart(span);
+        final int spanEnd = text.getSpanEnd(span);
+        String linkText = null;
+        if (spanStart >= 0 && spanEnd >= 0 && spanEnd <= text.length()) {
+            linkText = text.subSequence(spanStart, spanEnd).toString();
+            mLinkSelection = new Selection(spanStart, spanEnd);
+        } else {
+            mLinkSelection = editor.getSelection();
+        }
+        return linkText;
+    }
+
     /**
      * Media file was picked -> process the result.
      */
     @Subscribe(sticky = true, threadMode = ThreadMode.MAIN)
-    public void onEventMainThread(BarcodeEvent event) {
-        RTEditText editor = getActiveEditor();
-        RTImage media = event.getBarcode().getImage();
-        if (editor != null && media != null) {
-            insertImage(editor, media);
+    public void onEventMainThread(MediaEvent event) {
+        RTEditText editor = mEditors.get(mActiveEditor);
+        RTMedia media = event.getMedia();
+        if (editor != null && media instanceof RTImage) {
+            insertImage(editor, (RTImage) media, null, null);
             EventBus.getDefault().removeStickyEvent(event);
             mActiveEditor = Integer.MAX_VALUE;
         }
+
+        if (editor != null && media instanceof RTGif) {
+            insertImage(editor, null, (RTGif) media, null);
+            EventBus.getDefault().removeStickyEvent(event);
+            mActiveEditor = Integer.MAX_VALUE;
+        }
+    }
+
+
+    @Override
+    /* @inheritDoc */
+    public void onClick(RTEditText editor, BarcodeSpan span) {
+        Barcode barcode = span.getValue();
+        mRTApi.openDialogFragment(ID_02_BARCODE_FRAGMENT, BarcodeFragment.newInstance(barcode.getPath(), barcode.getEncodeText(), barcode.getWidth()));
     }
 
+    /**
+     * Barcode created -> insert the barcode image.
+     */
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onEventMainThread(BarcodeEvent event) {
+        final String fragmentTag = event.getFragmentTag();
+        if (!event.wasCancelled() && ID_02_BARCODE_FRAGMENT.equals(fragmentTag)) {
+            RTEditText editor = getActiveEditor();
+            RTImage media = event.getBarcode().getImage();
+            boolean remove = event.getBarcode().getRemoveRequest();
+            if (editor != null && media != null) {
+                if (!remove) {
+                    insertImage(editor, media, null, event.getBarcode());
+                    mActiveEditor = Integer.MAX_VALUE;
+                } else {
+                    removeImage(editor, event.getBarcode());
+                }
+            }
+        }
+    }
 
     @Override
     public void onRichTextEditingChanged(RTEditText editor, boolean useRichText) {
         updateToolbarVisibility();
     }
 
-}
\ No newline at end of file
+}
diff --git a/RTEditor/src/main/java/com/onegravity/rteditor/RTToolbar.java b/RTEditor/src/main/java/com/onegravity/rteditor/RTToolbar.java
index 98855282..c04a0345 100644
--- a/RTEditor/src/main/java/com/onegravity/rteditor/RTToolbar.java
+++ b/RTEditor/src/main/java/com/onegravity/rteditor/RTToolbar.java
@@ -35,19 +35,19 @@ public interface RTToolbar {
      * There can be only one since this should be the RTManager and there's only
      * one of those (per layout).
      */
-    public void setToolbarListener(RTToolbarListener listener);
+    void setToolbarListener(RTToolbarListener listener);
 
     /**
      * Remove this toolbar's listener.
      */
-    public void removeToolbarListener();
+    void removeToolbarListener();
 
     /**
      * We can have more than one toolbar identified by this unique Id
      * (unique per layout).
      * It can be implemented e.g. by using a static counter.
      */
-    public int getId();
+    int getId();
 
     /**
      * This is merely a way to store the container in which the toolbar is shown
@@ -56,46 +56,46 @@ public interface RTToolbar {
      *
      * @param toolbarContainer The ViewGroup that contains this RTToolbar.
      */
-    public void setToolbarContainer(ViewGroup toolbarContainer);
+    void setToolbarContainer(ViewGroup toolbarContainer);
 
     /**
      * @return The ViewGroup that contains this RTToolbar.
      */
-    public ViewGroup getToolbarContainer();
+    ViewGroup getToolbarContainer();
 
-    public void setBold(boolean enabled);
+    void setBold(boolean enabled);
 
-    public void setItalic(boolean enabled);
+    void setItalic(boolean enabled);
 
-    public void setUnderline(boolean enabled);
+    void setUnderline(boolean enabled);
 
-    public void setStrikethrough(boolean enabled);
+    void setStrikethrough(boolean enabled);
 
-    public void setSuperscript(boolean enabled);
+    void setSuperscript(boolean enabled);
 
-    public void setSubscript(boolean enabled);
+    void setSubscript(boolean enabled);
 
-    public void setBullet(boolean enabled);
+    void setBullet(boolean enabled);
 
-    public void setNumber(boolean enabled);
+    void setNumber(boolean enabled);
 
-    public void setAlignment(Layout.Alignment alignment);
+    void setAlignment(Layout.Alignment alignment);
 
-    public void setFont(RTTypeface typeface);
+    void setFont(RTTypeface typeface);
 
     /**
      * Set the text size.
      *
      * @param size the text size, if -1 then no text size is set (e.g. when selection spans more than one text size)
      */
-    public void setFontSize(int size);
+    void setFontSize(int size);
 
-    public void setFontColor(int color);
+    void setFontColor(int color);
 
-    public void setBGColor(int color);
+    void setBGColor(int color);
 
-    public void removeFontColor();
+    void removeFontColor();
 
-    public void removeBGColor();
+    void removeBGColor();
 
-}
\ No newline at end of file
+}
diff --git a/RTEditor/src/main/java/com/onegravity/rteditor/RTToolbarListener.java b/RTEditor/src/main/java/com/onegravity/rteditor/RTToolbarListener.java
index e6a8df98..9616838a 100644
--- a/RTEditor/src/main/java/com/onegravity/rteditor/RTToolbarListener.java
+++ b/RTEditor/src/main/java/com/onegravity/rteditor/RTToolbarListener.java
@@ -25,19 +25,21 @@
  */
 public interface RTToolbarListener {
 
-    public <V, C extends RTSpan<V>> void onEffectSelected(Effect<V, C> effect, V value);
+    <V, C extends RTSpan<V>> void onEffectSelected(Effect<V, C> effect, V value);
 
-    public void onUndo();
+    void onUndo();
 
-    public void onRedo();
+    void onRedo();
 
-    public void onClearFormatting();
+    void onClearFormatting();
 
-    public void onCreateLink();
+    void onCreateLink();
 
-    public void onPickImage();
+    void onPickImage();
 
-    public void onCaptureImage();
+    void onPickGif();
 
-    public void onInsertBarcode();
+    void onCaptureImage();
+
+    void onInsertBarcode();
 }
diff --git a/RTEditor/src/main/java/com/onegravity/rteditor/api/RTApi.java b/RTEditor/src/main/java/com/onegravity/rteditor/api/RTApi.java
index 1806c079..94a4d05f 100644
--- a/RTEditor/src/main/java/com/onegravity/rteditor/api/RTApi.java
+++ b/RTEditor/src/main/java/com/onegravity/rteditor/api/RTApi.java
@@ -22,14 +22,18 @@
 import android.content.res.TypedArray;
 import android.support.annotation.AttrRes;
 import android.util.AndroidRuntimeException;
+import android.util.Log;
 import android.widget.Toast;
 
 import com.onegravity.rteditor.R;
 import com.onegravity.rteditor.api.media.RTAudio;
+import com.onegravity.rteditor.api.media.RTGif;
 import com.onegravity.rteditor.api.media.RTImage;
 import com.onegravity.rteditor.api.media.RTMediaSource;
 import com.onegravity.rteditor.api.media.RTVideo;
 
+import java.io.IOException;
+
 /**
  * The RTApi is a convenience class that combines the RTProxy and the
  * RTMediaFactory implementations in one class and acts as a proxy to them. It
@@ -43,7 +47,7 @@
  * as extra in an Intent) the receiver of that Intent will be able to use the
  * RTMediaFactory but not the RTProxy part.
  */
-public class RTApi implements RTProxy, RTMediaFactory<RTImage, RTAudio, RTVideo> {
+public class RTApi implements RTProxy, RTMediaFactory<RTImage, RTGif, RTAudio, RTVideo> {
 
     private static final long serialVersionUID = -3877685955074371741L;
 
@@ -98,14 +102,14 @@ public static boolean useDarkTheme() {
      */
 
     transient final private RTProxy mRTProxy;    // not Serializable
-    final private RTMediaFactory<RTImage, RTAudio, RTVideo> mMediaFactory;
+    final private RTMediaFactory<RTImage, RTGif, RTAudio, RTVideo> mMediaFactory;
 
     /**
      * @param context      Can be an Application or an Activity context
      * @param rtProxy      The RTProxy provided by the app.
      * @param mediaFactory the RTMediaFactory provided by the app.
      */
-    public RTApi(Context context, RTProxy rtProxy, RTMediaFactory<RTImage, RTAudio, RTVideo> mediaFactory) {
+    public RTApi(Context context, RTProxy rtProxy, RTMediaFactory<RTImage, RTGif, RTAudio, RTVideo> mediaFactory) {
         synchronized (sTheLock) {
             sAppContext = context.getApplicationContext();
         }
@@ -182,7 +186,7 @@ public void removeFragment(String fragmentTag) {
      * Since the class is part of the app and not the rich text editor component
      * we allow access through this method as a convenience.
      */
-    public RTMediaFactory<RTImage, RTAudio, RTVideo> getMediaFactory() {
+    public RTMediaFactory<RTImage, RTGif, RTAudio, RTVideo> getMediaFactory() {
         return mMediaFactory;
     }
 
@@ -192,6 +196,11 @@ public RTImage createImage(RTMediaSource mediaSource) {
         return mMediaFactory.createImage(mediaSource);
     }
 
+    @Override
+    public RTGif createGif(RTMediaSource mediaSource) throws IOException {
+        return mMediaFactory.createGif(mediaSource);
+    }
+
     @Override
     /* @inheritDoc */
     public RTAudio createAudio(RTMediaSource mediaSource) {
@@ -210,6 +219,11 @@ public RTImage createImage(String path) {
         return mMediaFactory.createImage(path);
     }
 
+    @Override
+    public RTGif createGif(String path) throws IOException {
+        return mMediaFactory.createGif(path);
+    }
+
     @Override
     /* @inheritDoc */
     public RTAudio createAudio(String path) {
diff --git a/RTEditor/src/main/java/com/onegravity/rteditor/api/RTMediaFactory.java b/RTEditor/src/main/java/com/onegravity/rteditor/api/RTMediaFactory.java
index d91ac541..e2616843 100644
--- a/RTEditor/src/main/java/com/onegravity/rteditor/api/RTMediaFactory.java
+++ b/RTEditor/src/main/java/com/onegravity/rteditor/api/RTMediaFactory.java
@@ -17,10 +17,12 @@
 package com.onegravity.rteditor.api;
 
 import com.onegravity.rteditor.api.media.RTAudio;
+import com.onegravity.rteditor.api.media.RTGif;
 import com.onegravity.rteditor.api.media.RTImage;
 import com.onegravity.rteditor.api.media.RTMediaSource;
 import com.onegravity.rteditor.api.media.RTVideo;
 
+import java.io.IOException;
 import java.io.Serializable;
 
 /**
@@ -31,7 +33,7 @@
  *
  * @see RTMediaFactoryImpl
  */
-public interface RTMediaFactory<I extends RTImage, A extends RTAudio, V extends RTVideo> extends Serializable {
+public interface RTMediaFactory<I extends RTImage, G extends RTGif, A extends RTAudio, V extends RTVideo> extends Serializable {
 
     /**
      * Use case 1: Inserting media objects into the rich text editor.
@@ -43,6 +45,8 @@ public interface RTMediaFactory<I extends RTImage, A extends RTAudio, V extends
      */
     public I createImage(RTMediaSource mediaSource);
 
+    public G createGif(RTMediaSource mediaSource) throws IOException;
+
     public A createAudio(RTMediaSource mediaSource);
 
     public V createVideo(RTMediaSource mediaSource);
@@ -68,6 +72,8 @@ public interface RTMediaFactory<I extends RTImage, A extends RTAudio, V extends
      */
     public I createImage(String path);
 
+    public G createGif(String path) throws IOException;
+
     public A createAudio(String path);
 
     public V createVideo(String path);
diff --git a/RTEditor/src/main/java/com/onegravity/rteditor/api/RTMediaFactoryImpl.java b/RTEditor/src/main/java/com/onegravity/rteditor/api/RTMediaFactoryImpl.java
index f1ae11a3..e879d003 100644
--- a/RTEditor/src/main/java/com/onegravity/rteditor/api/RTMediaFactoryImpl.java
+++ b/RTEditor/src/main/java/com/onegravity/rteditor/api/RTMediaFactoryImpl.java
@@ -21,6 +21,8 @@
 
 import com.onegravity.rteditor.api.media.RTAudio;
 import com.onegravity.rteditor.api.media.RTAudioImpl;
+import com.onegravity.rteditor.api.media.RTGif;
+import com.onegravity.rteditor.api.media.RTGifImpl;
 import com.onegravity.rteditor.api.media.RTImage;
 import com.onegravity.rteditor.api.media.RTImageImpl;
 import com.onegravity.rteditor.api.media.RTMediaSource;
@@ -29,7 +31,6 @@
 import com.onegravity.rteditor.api.media.RTVideoImpl;
 import com.onegravity.rteditor.media.MediaUtils;
 import com.onegravity.rteditor.utils.Helper;
-
 import com.onegravity.rteditor.utils.io.IOUtils;
 
 import java.io.File;
@@ -38,12 +39,14 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 
+import pl.droidsonroids.gif.GifDrawable;
+
 /**
  * This is a basic implementation of the RTMediaFactory using either the
  * internal (as in Context.context.getFilesDir() or the primary external
  * file system (as in Context.getExternalFilesDir(String).
  */
-public class RTMediaFactoryImpl implements RTMediaFactory<RTImage, RTAudio, RTVideo> {
+public class RTMediaFactoryImpl implements RTMediaFactory<RTImage, RTGif, RTAudio, RTVideo> {
     private static final long serialVersionUID = 6970361368051595063L;
 
     private File mStoragePath;
@@ -87,6 +90,16 @@ public RTImage createImage(RTMediaSource mediaSource) {
                 new RTImageImpl(targetFile.getAbsolutePath());
     }
 
+    @Override
+     /* @inheritDoc */
+    public RTGif createGif(RTMediaSource mediaSource) throws IOException {
+        File targetFile = loadMedia(mediaSource);
+        if (targetFile == null) return null;
+        GifDrawable gd = new GifDrawable(targetFile.getPath());
+        gd.setBounds(0, 0, gd.getIntrinsicWidth(), gd.getIntrinsicHeight());
+        return new RTGifImpl(targetFile.getPath(), gd);
+    }
+
     @Override
     /* @inheritDoc */
     public RTAudio createAudio(RTMediaSource mediaSource) {
@@ -143,6 +156,14 @@ public RTImage createImage(String path) {
         return new RTImageImpl(path);
     }
 
+    @Override
+     /* @inheritDoc */
+    public RTGif createGif(String path) throws IOException {
+        GifDrawable gd = new GifDrawable(path);
+        gd.setBounds(0, 0, gd.getIntrinsicWidth(), gd.getIntrinsicHeight());
+        return new RTGifImpl(path, gd);
+    }
+
     @Override
     /* @inheritDoc */
     public RTAudio createAudio(String path) {
diff --git a/RTEditor/src/main/java/com/onegravity/rteditor/api/format/RTEditable.java b/RTEditor/src/main/java/com/onegravity/rteditor/api/format/RTEditable.java
index a4f71674..9fbf6d5e 100644
--- a/RTEditor/src/main/java/com/onegravity/rteditor/api/format/RTEditable.java
+++ b/RTEditor/src/main/java/com/onegravity/rteditor/api/format/RTEditable.java
@@ -22,6 +22,7 @@
 import com.onegravity.rteditor.RTEditText;
 import com.onegravity.rteditor.api.RTMediaFactory;
 import com.onegravity.rteditor.api.media.RTAudio;
+import com.onegravity.rteditor.api.media.RTGif;
 import com.onegravity.rteditor.api.media.RTImage;
 import com.onegravity.rteditor.api.media.RTVideo;
 import com.onegravity.rteditor.converter.ConverterSpannedToHtml;
@@ -29,7 +30,7 @@
 
 /**
  * RTText representing rich text in android.text.Spanned format.
- *
+ * <p>
  * Use this class if the source text is an RTEditText.
  * This allows to pre-process the text before converting it (e.g. to eliminate
  * certain spans and to clean up the paragraph formatting).
@@ -46,13 +47,13 @@ public RTEditable(RTEditText editor) {
     }
 
     @Override
-    public RTText convertTo(RTFormat destFormat, RTMediaFactory<RTImage, RTAudio, RTVideo> mediaFactory) {
+    public RTText convertTo(RTFormat destFormat, RTMediaFactory<RTImage, RTGif, RTAudio, RTVideo> mediaFactory) {
         if (destFormat instanceof RTFormat.Html) {
             clean();
             return new ConverterSpannedToHtml().convert(mEditor.getText(), (RTFormat.Html) destFormat);
         } else if (destFormat instanceof RTFormat.PlainText) {
             clean();
-            RTHtml<RTImage, RTAudio, RTVideo> rtHtml = new ConverterSpannedToHtml().convert(mEditor.getText(), RTFormat.HTML);
+            RTHtml<RTImage, RTGif, RTAudio, RTVideo> rtHtml = new ConverterSpannedToHtml().convert(mEditor.getText(), RTFormat.HTML);
             RTText rtText = rtHtml.convertTo(RTFormat.PLAIN_TEXT, mediaFactory);
             return new RTPlainText(rtText.getText());
         }
diff --git a/RTEditor/src/main/java/com/onegravity/rteditor/api/format/RTHtml.java b/RTEditor/src/main/java/com/onegravity/rteditor/api/format/RTHtml.java
index 92154849..0638ef48 100644
--- a/RTEditor/src/main/java/com/onegravity/rteditor/api/format/RTHtml.java
+++ b/RTEditor/src/main/java/com/onegravity/rteditor/api/format/RTHtml.java
@@ -18,6 +18,7 @@
 
 import com.onegravity.rteditor.api.RTMediaFactory;
 import com.onegravity.rteditor.api.media.RTAudio;
+import com.onegravity.rteditor.api.media.RTGif;
 import com.onegravity.rteditor.api.media.RTImage;
 import com.onegravity.rteditor.api.media.RTVideo;
 import com.onegravity.rteditor.converter.ConverterHtmlToSpanned;
@@ -32,7 +33,7 @@
  * The text may contain referenced images.
  * Audio and video files aren't supported yet.
  */
-public class RTHtml<I extends RTImage, A extends RTAudio, V extends RTVideo> extends RTText {
+public class RTHtml<I extends RTImage, G extends RTGif, A extends RTAudio, V extends RTVideo> extends RTText {
 
     private List<I> mImages;
 
@@ -60,7 +61,7 @@ public List<I> getImages() {
     }
 
     @Override
-    public RTText convertTo(RTFormat destFormat, RTMediaFactory<RTImage, RTAudio, RTVideo> mediaFactory) {
+    public RTText convertTo(RTFormat destFormat, RTMediaFactory<RTImage, RTGif, RTAudio, RTVideo> mediaFactory) {
         if (destFormat instanceof RTFormat.PlainText) {
             return ConverterHtmlToText.convert(this);
         } else if (destFormat instanceof RTFormat.Spanned) {
diff --git a/RTEditor/src/main/java/com/onegravity/rteditor/api/format/RTPlainText.java b/RTEditor/src/main/java/com/onegravity/rteditor/api/format/RTPlainText.java
index d855af56..45fd8417 100644
--- a/RTEditor/src/main/java/com/onegravity/rteditor/api/format/RTPlainText.java
+++ b/RTEditor/src/main/java/com/onegravity/rteditor/api/format/RTPlainText.java
@@ -20,6 +20,7 @@
 
 import com.onegravity.rteditor.api.RTMediaFactory;
 import com.onegravity.rteditor.api.media.RTAudio;
+import com.onegravity.rteditor.api.media.RTGif;
 import com.onegravity.rteditor.api.media.RTImage;
 import com.onegravity.rteditor.api.media.RTVideo;
 import com.onegravity.rteditor.converter.ConverterTextToHtml;
@@ -40,7 +41,7 @@ public String getText() {
     }
 
     @Override
-    public RTText convertTo(RTFormat destFormat, RTMediaFactory<RTImage, RTAudio, RTVideo> mediaFactory) {
+    public RTText convertTo(RTFormat destFormat, RTMediaFactory<RTImage, RTGif, RTAudio, RTVideo> mediaFactory) {
         if (destFormat instanceof RTFormat.Html) {
             return ConverterTextToHtml.convert(this);
         } else if (destFormat instanceof RTFormat.Spanned) {
diff --git a/RTEditor/src/main/java/com/onegravity/rteditor/api/format/RTText.java b/RTEditor/src/main/java/com/onegravity/rteditor/api/format/RTText.java
index 8889afa6..2a39f0a7 100644
--- a/RTEditor/src/main/java/com/onegravity/rteditor/api/format/RTText.java
+++ b/RTEditor/src/main/java/com/onegravity/rteditor/api/format/RTText.java
@@ -18,6 +18,7 @@
 
 import com.onegravity.rteditor.api.RTMediaFactory;
 import com.onegravity.rteditor.api.media.RTAudio;
+import com.onegravity.rteditor.api.media.RTGif;
 import com.onegravity.rteditor.api.media.RTImage;
 import com.onegravity.rteditor.api.media.RTVideo;
 
@@ -75,7 +76,7 @@ public CharSequence getText() {
      * @return The converted RTText
      * @throws UnsupportedOperationException if this RTText doesn't support the conversion.
      */
-    public RTText convertTo(RTFormat destFormat, RTMediaFactory<RTImage, RTAudio, RTVideo> mediaFactory) {
+    public RTText convertTo(RTFormat destFormat, RTMediaFactory<RTImage, RTGif, RTAudio, RTVideo> mediaFactory) {
         if (destFormat == mRTFormat) {
             return this;
         }
diff --git a/RTEditor/src/main/java/com/onegravity/rteditor/api/media/RTGif.java b/RTEditor/src/main/java/com/onegravity/rteditor/api/media/RTGif.java
new file mode 100644
index 00000000..d3419829
--- /dev/null
+++ b/RTEditor/src/main/java/com/onegravity/rteditor/api/media/RTGif.java
@@ -0,0 +1,32 @@
+/*
+ * <!--
+ *   Copyright (C) 2015-2016 Emanuel Moecklin
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ *   -->
+ */
+
+package com.onegravity.rteditor.api.media;
+
+import android.graphics.drawable.Drawable;
+
+import java.io.IOException;
+
+/**
+ * Each embedded image must implement this interface
+ */
+public interface RTGif extends RTMedia {
+    public Drawable getDrawable() throws IOException;
+
+    public void setDrawable(Drawable drawable);
+}
\ No newline at end of file
diff --git a/RTEditor/src/main/java/com/onegravity/rteditor/api/media/RTGifImpl.java b/RTEditor/src/main/java/com/onegravity/rteditor/api/media/RTGifImpl.java
new file mode 100644
index 00000000..187d5f97
--- /dev/null
+++ b/RTEditor/src/main/java/com/onegravity/rteditor/api/media/RTGifImpl.java
@@ -0,0 +1,48 @@
+/*
+ * <!--
+ *   Copyright (C) 2015-2016 Emanuel Moecklin
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ *   -->
+ */
+
+package com.onegravity.rteditor.api.media;
+
+import android.graphics.drawable.Drawable;
+
+import java.io.IOException;
+
+/**
+ * This is a basic implementation of the RTImage interface.
+ */
+public class RTGifImpl extends RTMediaImpl implements RTGif {
+    private static final long serialVersionUID = -5252562131414951720L;
+
+    Drawable mDrawable;
+
+    public RTGifImpl(String filePath, Drawable drawable) {
+        super(filePath);
+        this.mDrawable = drawable;
+
+    }
+
+    @Override
+    public Drawable getDrawable() throws IOException {
+        return mDrawable;
+    }
+
+    @Override
+    public void setDrawable(Drawable drawable) {
+        this.mDrawable = drawable;
+    }
+}
\ No newline at end of file
diff --git a/RTEditor/src/main/java/com/onegravity/rteditor/api/media/RTImage.java b/RTEditor/src/main/java/com/onegravity/rteditor/api/media/RTImage.java
index 511c5fec..23ec81f8 100644
--- a/RTEditor/src/main/java/com/onegravity/rteditor/api/media/RTImage.java
+++ b/RTEditor/src/main/java/com/onegravity/rteditor/api/media/RTImage.java
@@ -20,4 +20,6 @@
  * Each embedded image must implement this interface
  */
 public interface RTImage extends RTMedia {
+    int getWidthDP();
+    int getHeightDP();
 }
\ No newline at end of file
diff --git a/RTEditor/src/main/java/com/onegravity/rteditor/api/media/RTImageImpl.java b/RTEditor/src/main/java/com/onegravity/rteditor/api/media/RTImageImpl.java
index fa87abda..292530ad 100644
--- a/RTEditor/src/main/java/com/onegravity/rteditor/api/media/RTImageImpl.java
+++ b/RTEditor/src/main/java/com/onegravity/rteditor/api/media/RTImageImpl.java
@@ -16,6 +16,8 @@
 
 package com.onegravity.rteditor.api.media;
 
+import com.onegravity.rteditor.utils.Helper;
+
 /**
  * This is a basic implementation of the RTImage interface.
  */
@@ -26,4 +28,13 @@ public RTImageImpl(String filePath) {
         super(filePath);
     }
 
+    @Override
+    public int getWidthDP() {
+        return Helper.convertPixelsToDp(getWidth());
+    }
+
+    @Override
+    public int getHeightDP() {
+        return Helper.convertPixelsToDp(getHeight());
+    }
 }
\ No newline at end of file
diff --git a/RTEditor/src/main/java/com/onegravity/rteditor/api/media/RTMediaType.java b/RTEditor/src/main/java/com/onegravity/rteditor/api/media/RTMediaType.java
index 6a953d5e..43488f20 100644
--- a/RTEditor/src/main/java/com/onegravity/rteditor/api/media/RTMediaType.java
+++ b/RTEditor/src/main/java/com/onegravity/rteditor/api/media/RTMediaType.java
@@ -27,6 +27,7 @@
  */
 public enum RTMediaType {
     IMAGE("images"),
+    GIF("gifs"),
     VIDEO("videos"),
     AUDIO("audios");
 
diff --git a/RTEditor/src/main/java/com/onegravity/rteditor/barcode/Barcode.java b/RTEditor/src/main/java/com/onegravity/rteditor/barcode/Barcode.java
new file mode 100644
index 00000000..a98b6a52
--- /dev/null
+++ b/RTEditor/src/main/java/com/onegravity/rteditor/barcode/Barcode.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright (C) 2016 Emanuel Moecklin
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.onegravity.rteditor.barcode;
+
+import android.graphics.Bitmap;
+
+import com.onegravity.rteditor.api.format.RTFormat;
+import com.onegravity.rteditor.api.media.RTImage;
+
+/**
+ * Represents a Barcode.
+ */
+public class Barcode {
+    final private RTImage mBarcode;
+    final private Bitmap mBitmap;
+    final private String mEncodeText;
+    final private int mWidth;
+    private boolean mRemoveRequest = false;
+
+    Barcode(RTImage barcode, String encodeText, int width) {
+        mBarcode = barcode;
+        mBitmap = null;
+        mEncodeText = encodeText;
+        mWidth = width;
+    }
+
+    Barcode(Bitmap bitmap, String encodeText, int width) {
+        mBarcode = null;
+        mBitmap = bitmap;
+        mEncodeText = encodeText;
+        mWidth = width;
+    }
+
+    public Barcode(RTImage mBarcode, Bitmap mBitmap, String mEncodeText, int mWidth) {
+        this.mBarcode = mBarcode;
+        this.mBitmap = mBitmap;
+        this.mEncodeText = mEncodeText;
+        this.mWidth = mWidth;
+    }
+
+    public RTImage getImage() {
+        return mBarcode;
+    }
+
+    public Bitmap getBitmap() {
+        return mBitmap;
+    }
+
+    public String getEncodeText() {
+        return mEncodeText;
+    }
+
+    public int getWidth() {
+        return mWidth;
+    }
+
+    public boolean isValid() {
+        return !mEncodeText.isEmpty() && mWidth != 0;
+    }
+
+    public String getPath() {
+        return mBarcode.getFilePath(RTFormat.PLAIN_TEXT);
+    }
+
+    public boolean getRemoveRequest() {
+        return mRemoveRequest;
+    }
+
+    public void setRemoveRequest(boolean remove) {
+        mRemoveRequest = remove;
+    }
+}
diff --git a/RTEditor/src/main/java/com/onegravity/rteditor/barcode/BarcodeEvent.java b/RTEditor/src/main/java/com/onegravity/rteditor/barcode/BarcodeEvent.java
new file mode 100644
index 00000000..0387b579
--- /dev/null
+++ b/RTEditor/src/main/java/com/onegravity/rteditor/barcode/BarcodeEvent.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2016 Emanuel Moecklin
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.onegravity.rteditor.barcode;
+
+import android.app.Fragment;
+import android.util.Log;
+
+/**
+ * This event is broadcast via EventBus when the dialog closes.
+ * It's received by the RTManager to update the active editor.
+ */
+public class BarcodeEvent {
+    private final String mFragmentTag;
+    private final Barcode mBarcode;
+    private final boolean mWasCancelled;
+
+    BarcodeEvent(Fragment fragment, Barcode barcode, boolean wasCancelled) {
+        mFragmentTag = fragment.getTag();
+        mBarcode = barcode;
+        mWasCancelled = wasCancelled;
+    }
+
+    public String getFragmentTag() {
+        return mFragmentTag;
+    }
+
+    public Barcode getBarcode() {
+        return mBarcode;
+    }
+
+    public boolean wasCancelled() {
+        return mWasCancelled;
+    }
+}
diff --git a/RTEditor/src/main/java/com/onegravity/rteditor/barcode/BarcodeFragment.java b/RTEditor/src/main/java/com/onegravity/rteditor/barcode/BarcodeFragment.java
new file mode 100644
index 00000000..9fb09faa
--- /dev/null
+++ b/RTEditor/src/main/java/com/onegravity/rteditor/barcode/BarcodeFragment.java
@@ -0,0 +1,320 @@
+/*
+ * Copyright (C) 2016 Emanuel Moecklin
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.onegravity.rteditor.barcode;
+
+import android.annotation.SuppressLint;
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.app.DialogFragment;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.graphics.Bitmap;
+import android.os.AsyncTask;
+import android.os.Bundle;
+import android.os.Environment;
+import android.support.annotation.NonNull;
+import android.util.DisplayMetrics;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.EditText;
+import android.widget.ProgressBar;
+import android.widget.TextView;
+
+import com.google.zxing.BarcodeFormat;
+import com.google.zxing.EncodeHintType;
+import com.google.zxing.MultiFormatWriter;
+import com.google.zxing.WriterException;
+import com.google.zxing.common.BitMatrix;
+import com.onegravity.rteditor.R;
+import com.onegravity.rteditor.api.media.RTImage;
+
+import org.greenrobot.eventbus.EventBus;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.EnumMap;
+import java.util.Map;
+import java.util.UUID;
+
+import static android.graphics.Color.BLACK;
+import static android.graphics.Color.WHITE;
+
+/**
+ * A DialogFragment to add, modify or remove QR Codes from Spanned text.
+ */
+
+public class BarcodeFragment extends DialogFragment {
+
+    private static final String BARCODE_PATH = "barcode_path";
+    private static final String BARCODE_DATA = "barcode_data";
+    private static final String BARCODE_WIDTH = "barcode_width";
+
+    EditText dataView, widthView;
+    ProgressBar progressBar;
+
+    public static BarcodeFragment newInstance(String filePath, String encodeText, int width) {
+        BarcodeFragment fragment = new BarcodeFragment();
+        Bundle args = new Bundle();
+        if (encodeText != null) {
+            args.putString(BARCODE_PATH, filePath);
+            args.putString(BARCODE_DATA, encodeText);
+            args.putInt(BARCODE_WIDTH, width);
+        }
+        fragment.setArguments(args);
+        return fragment;
+    }
+
+    public BarcodeFragment() {
+    }
+
+    @NonNull
+    @SuppressLint("InflateParams")
+    @Override
+    public final Dialog onCreateDialog(Bundle savedInstanceState) {
+        Context context = getActivity();
+        LayoutInflater li = LayoutInflater.from(context);
+        View bodyView = li.inflate(R.layout.rte_barcode_body, null);
+        View headerView = li.inflate(R.layout.rte_barcode_header, null);
+
+        progressBar = (ProgressBar) headerView.findViewById(R.id.progressBar);
+
+
+        Bundle args = getArguments();
+
+        // barcode data
+        final String data = args.getString(BARCODE_DATA);
+        dataView = ((EditText) bodyView.findViewById(R.id.barcodeData));
+        if (data != null) {
+            dataView.setText(data);
+        }
+
+        // barcode width
+        int width = args.getInt(BARCODE_WIDTH);
+        widthView = ((EditText) bodyView.findViewById(R.id.barcodeWidth));
+        if (width > 10) {
+            widthView.setText(String.valueOf(width));
+        }
+
+        final TextView errorView = (TextView) headerView.findViewById(R.id.barcodeError);
+        final String filePath = args.getString(BARCODE_PATH);
+
+        AlertDialog.Builder builder = new AlertDialog.Builder(context)
+                .setCustomTitle(headerView)
+                .setView(bodyView)
+                .setCancelable(false)
+                .setPositiveButton(android.R.string.ok, null)//We override the onClick method bellow
+                .setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        EventBus.getDefault().post(new BarcodeEvent(BarcodeFragment.this, new Barcode(null, null, null, 0), true));
+                    }
+                });
+
+        if (data != null && filePath != null) {
+            builder.setNeutralButton("Remove", new DialogInterface.OnClickListener() {
+                @Override
+                public void onClick(DialogInterface dialog, int which) {
+                    removeBarcode(filePath);
+                }
+            });
+        }
+
+        final AlertDialog dialog = builder.create();
+
+        //Override the onClick method of the Positive Button, so as to not close the dialog when Click.
+        //The dialog is closed when the image is saved onPostExecute.
+        dialog.setOnShowListener(new DialogInterface.OnShowListener() {
+            @Override
+            public void onShow(DialogInterface d) {
+                dialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        try {
+                            if (data == null && filePath == null) {
+                                validate(dataView, widthView, errorView);
+                            } else {
+                                removeBarcode(filePath);
+                                validate(dataView, widthView, errorView);
+                            }
+                        } catch (WriterException | IOException e) {
+                            e.printStackTrace();
+                        }
+                    }
+                });
+            }
+        });
+
+        return dialog;
+    }
+
+    public void removeBarcode(String filePath) {
+        Barcode barcode = new Barcode(new BarcodeImage(filePath), null, 0);
+        barcode.setRemoveRequest(true);
+        EventBus.getDefault().post(new BarcodeEvent(BarcodeFragment.this, barcode, false));
+    }
+
+
+    private void validate(EditText dataView, EditText widthView, TextView errorView) throws WriterException, IOException {
+        final String data = dataView.getText().toString().trim();
+        int width = 100;    // default size of the QR code in DP
+        String widthString = widthView.getText().toString();
+        try {
+            width = Integer.parseInt(widthString);
+        } catch (NumberFormatException ignore) {
+        }
+
+        String errorMessage = null;
+
+        if (!data.isEmpty()) {
+            if (width <= 400) {
+                FileSaveAsyncTask task = new FileSaveAsyncTask(getActivity());
+                task.execute(data, String.valueOf(width));
+            } else {
+                errorMessage = getString(R.string.rte_barcode_big_image);
+            }
+        } else {
+            errorMessage = getString(R.string.rte_barcode_no_data);
+        }
+
+        errorView.setText(errorMessage != null ? errorMessage : "");
+    }
+
+
+    @Override
+    public void onCancel(DialogInterface dialog) {
+        super.onCancel(dialog);
+        EventBus.getDefault().post(new BarcodeEvent(BarcodeFragment.this, null, true));
+    }
+
+    private class FileSaveAsyncTask extends AsyncTask<String, Integer, RTImage> {
+        Activity activity;
+        String data;
+        int width;
+
+        FileSaveAsyncTask(Activity activity) {
+            this.activity = activity;
+        }
+
+        /**
+         * Disable the edit text fields and show the progress bar
+         */
+        @Override
+        protected void onPreExecute() {
+            progressBar.setVisibility(View.VISIBLE);
+            dataView.setFocusable(false);
+            dataView.setBackgroundResource(R.drawable.shape_disabled);
+            widthView.setFocusable(false);
+        }
+
+        @Override
+        protected RTImage doInBackground(String... params) {
+            String uniqueFileName = UUID.randomUUID().toString().replaceAll("-", "");
+            String directory = Environment.getExternalStorageDirectory().getAbsolutePath() + "/Android/data/" + activity.getPackageName() + "/files/images";
+
+            data = params[0];
+
+            /*Transform the DP value into PX*/
+            width = Integer.parseInt(params[1]) * (activity.getResources().getDisplayMetrics().densityDpi / DisplayMetrics.DENSITY_DEFAULT);
+
+            File dir = new File(directory);
+            if (!dir.exists()) dir.mkdirs();
+            final String filePath = directory + "/BARCODE-" + params[1] + "_" + uniqueFileName + ".bmp";
+
+            try {
+                Bitmap bitmap = encodeAsBitmap(data, width);//create the qr image
+
+                ByteArrayOutputStream byteOutputStream = new ByteArrayOutputStream();
+                bitmap.compress(Bitmap.CompressFormat.PNG, 100, byteOutputStream);
+                byte[] mBitmapData = byteOutputStream.toByteArray();
+                ByteArrayInputStream inputStream = new ByteArrayInputStream(mBitmapData);
+
+                OutputStream outputStream = new FileOutputStream(filePath);
+                byteOutputStream.writeTo(outputStream);
+
+                byte[] buffer = new byte[1024];
+                int lengthOfFile = mBitmapData.length;
+                int totalWritten = 0;
+                int bufferedBytes = 0;
+
+                while ((bufferedBytes = inputStream.read(buffer)) > 0) {
+                    totalWritten += bufferedBytes;
+                    publishProgress((int) ((totalWritten * 100) / lengthOfFile));
+                    outputStream.write(buffer, 0, bufferedBytes);
+                }
+            } catch (Exception ignore) {
+            }
+
+            return new BarcodeImage(filePath);
+        }
+
+        @Override
+        protected void onProgressUpdate(Integer... values) {
+            progressBar.setProgress(values[0]);
+        }
+
+        @Override
+        protected void onPostExecute(RTImage image) {
+            BarcodeEvent event = new BarcodeEvent(BarcodeFragment.this, new Barcode(image, data, width), false);
+            EventBus.getDefault().post(event);
+            dismiss();//we override the onClick of the positive button so the dialog doesn't dismiss on click
+        }
+
+        Bitmap encodeAsBitmap(String data, int width) throws WriterException, IllegalArgumentException {
+            if (data == null) {
+                return null;
+            }
+
+            BarcodeFormat format = BarcodeFormat.QR_CODE;
+            String encoding = "UTF-8";
+
+            Map<EncodeHintType, Object> hints = new EnumMap<>(EncodeHintType.class);
+            hints.put(EncodeHintType.CHARACTER_SET, encoding);
+
+            MultiFormatWriter writer = new MultiFormatWriter();
+            BitMatrix result;
+
+            try {
+                result = writer.encode(data, format, width, width, hints);
+            } catch (IllegalArgumentException iae) {
+                return null;
+            }
+
+            int imageWidth = result.getWidth();
+            int imageHeight = result.getHeight();
+            int[] pixels = new int[imageWidth * imageHeight];
+
+            for (int y = 0; y < imageHeight; y++) {
+                int offset = y * imageWidth;
+                for (int x = 0; x < imageWidth; x++) {
+                    pixels[offset + x] = result.get(x, y) ? BLACK : WHITE;
+                }
+            }
+
+            Bitmap bitmap = Bitmap.createBitmap(imageWidth, imageHeight, Bitmap.Config.ARGB_8888);
+            bitmap.setPixels(pixels, 0, imageWidth, 0, 0, imageWidth, imageHeight);
+            return bitmap;
+        }
+
+    }
+
+}
diff --git a/RTEditor/src/main/java/com/onegravity/rteditor/barcode/BarcodeImage.java b/RTEditor/src/main/java/com/onegravity/rteditor/barcode/BarcodeImage.java
new file mode 100644
index 00000000..94ea40d9
--- /dev/null
+++ b/RTEditor/src/main/java/com/onegravity/rteditor/barcode/BarcodeImage.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2016 Emanuel Moecklin
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.onegravity.rteditor.barcode;
+
+import com.onegravity.rteditor.api.media.RTImageImpl;
+
+/**
+ * This class represents a barcode image.
+ */
+public class BarcodeImage extends RTImageImpl {
+
+    public BarcodeImage(String filePath) {
+        super(filePath);
+    }
+
+}
diff --git a/RTEditor/src/main/java/com/onegravity/rteditor/converter/ConverterHtmlToSpanned.java b/RTEditor/src/main/java/com/onegravity/rteditor/converter/ConverterHtmlToSpanned.java
index a17a0fa6..631e4b98 100644
--- a/RTEditor/src/main/java/com/onegravity/rteditor/converter/ConverterHtmlToSpanned.java
+++ b/RTEditor/src/main/java/com/onegravity/rteditor/converter/ConverterHtmlToSpanned.java
@@ -29,6 +29,7 @@
 import com.onegravity.rteditor.api.format.RTHtml;
 import com.onegravity.rteditor.api.format.RTSpanned;
 import com.onegravity.rteditor.api.media.RTAudio;
+import com.onegravity.rteditor.api.media.RTGif;
 import com.onegravity.rteditor.api.media.RTImage;
 import com.onegravity.rteditor.api.media.RTVideo;
 import com.onegravity.rteditor.converter.tagsoup.HTMLSchema;
@@ -82,7 +83,7 @@ public class ConverterHtmlToSpanned implements ContentHandler {
     };
 
     private String mSource;
-    private RTMediaFactory<? extends RTImage, ? extends RTAudio, ? extends RTVideo> mMediaFactory;
+    private RTMediaFactory<? extends RTImage, ? extends RTGif, ? extends RTAudio, ? extends RTVideo> mMediaFactory;
     private Parser mParser;
     private SpannableStringBuilder mResult;
 
@@ -111,8 +112,8 @@ private static class HtmlParser {
         private static final HTMLSchema SCHEMA = new HTMLSchema();
     }
 
-    public RTSpanned convert(RTHtml<? extends RTImage, ? extends RTAudio, ? extends RTVideo> input,
-                             RTMediaFactory<? extends RTImage, ? extends RTAudio, ? extends RTVideo> mediaFactory) {
+    public RTSpanned convert(RTHtml<? extends RTImage, ? extends RTGif, ? extends RTAudio, ? extends RTVideo> input,
+                             RTMediaFactory<? extends RTImage, ? extends RTGif, ? extends RTAudio, ? extends RTVideo> mediaFactory) {
         mSource = input.getText();
         mMediaFactory = mediaFactory;
 
@@ -792,16 +793,35 @@ private static class Div {
         }
     }
 
-    private static class Bold {}
-    private static class Italic {}
-    private static class Underline {}
-    private static class Strikethrough {}
-    private static class Super {}
-    private static class Sub {}
-    private static class Big {}
-    private static class Small {}
-    private static class Monospace {}
-    private static class Blockquote {}
+    private static class Bold {
+    }
+
+    private static class Italic {
+    }
+
+    private static class Underline {
+    }
+
+    private static class Strikethrough {
+    }
+
+    private static class Super {
+    }
+
+    private static class Sub {
+    }
+
+    private static class Big {
+    }
+
+    private static class Small {
+    }
+
+    private static class Monospace {
+    }
+
+    private static class Blockquote {
+    }
 
     private abstract static class List {
         int mNrOfIndents;
@@ -845,7 +865,7 @@ Font setBGColor(String color) {
             mBGColor = color;
             return this;
         }
-        
+
         private Font setFontFace(String fontFace) {
             mFontFace = fontFace;
             return this;
diff --git a/RTEditor/src/main/java/com/onegravity/rteditor/converter/ConverterHtmlToText.java b/RTEditor/src/main/java/com/onegravity/rteditor/converter/ConverterHtmlToText.java
index 841d3f04..6c81870a 100644
--- a/RTEditor/src/main/java/com/onegravity/rteditor/converter/ConverterHtmlToText.java
+++ b/RTEditor/src/main/java/com/onegravity/rteditor/converter/ConverterHtmlToText.java
@@ -24,6 +24,7 @@
 import com.onegravity.rteditor.api.format.RTHtml;
 import com.onegravity.rteditor.api.format.RTPlainText;
 import com.onegravity.rteditor.api.media.RTAudio;
+import com.onegravity.rteditor.api.media.RTGif;
 import com.onegravity.rteditor.api.media.RTImage;
 import com.onegravity.rteditor.api.media.RTVideo;
 
@@ -54,7 +55,7 @@ public class ConverterHtmlToText {
     private static final char NBSP_CHARACTER = (char) 0x00a0;    // utf-8 non-breaking space
     private static final char NBSP_REPLACEMENT = (char) 0x20;    // space
 
-    public static RTPlainText convert(RTHtml<? extends RTImage, ? extends RTAudio, ? extends RTVideo> input) {
+    public static RTPlainText convert(RTHtml<? extends RTImage, ? extends RTGif, ? extends RTAudio, ? extends RTVideo> input) {
         String result = Html.fromHtml(input.getText(), null, new HtmlToTextTagHandler())
                 .toString()
                 .replace(PREVIEW_OBJECT_CHARACTER, PREVIEW_OBJECT_REPLACEMENT)
diff --git a/RTEditor/src/main/java/com/onegravity/rteditor/converter/ConverterSpannedToHtml.java b/RTEditor/src/main/java/com/onegravity/rteditor/converter/ConverterSpannedToHtml.java
index 51dff5d7..ed20f896 100644
--- a/RTEditor/src/main/java/com/onegravity/rteditor/converter/ConverterSpannedToHtml.java
+++ b/RTEditor/src/main/java/com/onegravity/rteditor/converter/ConverterSpannedToHtml.java
@@ -26,20 +26,24 @@
 import android.text.style.SubscriptSpan;
 import android.text.style.SuperscriptSpan;
 import android.text.style.URLSpan;
-import com.onegravity.rteditor.spans.UnderlineSpan;
+import android.util.Log;
 
 import com.onegravity.rteditor.api.format.RTFormat;
 import com.onegravity.rteditor.api.format.RTHtml;
 import com.onegravity.rteditor.api.media.RTAudio;
+import com.onegravity.rteditor.api.media.RTGif;
 import com.onegravity.rteditor.api.media.RTImage;
 import com.onegravity.rteditor.api.media.RTVideo;
 import com.onegravity.rteditor.converter.tagsoup.util.StringEscapeUtils;
 import com.onegravity.rteditor.spans.AudioSpan;
+import com.onegravity.rteditor.spans.BarcodeSpan;
 import com.onegravity.rteditor.spans.BoldSpan;
-import com.onegravity.rteditor.spans.TypefaceSpan;
+import com.onegravity.rteditor.spans.GifSpan;
 import com.onegravity.rteditor.spans.ImageSpan;
 import com.onegravity.rteditor.spans.ItalicSpan;
 import com.onegravity.rteditor.spans.LinkSpan;
+import com.onegravity.rteditor.spans.TypefaceSpan;
+import com.onegravity.rteditor.spans.UnderlineSpan;
 import com.onegravity.rteditor.spans.VideoSpan;
 import com.onegravity.rteditor.utils.Helper;
 import com.onegravity.rteditor.utils.Paragraph;
@@ -76,7 +80,7 @@ public class ConverterSpannedToHtml {
     /**
      * Converts a spanned text to HTML
      */
-    public RTHtml<RTImage, RTAudio, RTVideo> convert(final Spanned text, RTFormat.Html rtFormat) {
+    public RTHtml<RTImage, RTGif, RTAudio, RTVideo> convert(final Spanned text, RTFormat.Html rtFormat) {
         mText = text;
         mRTFormat = rtFormat;
 
@@ -87,7 +91,7 @@ public RTHtml<RTImage, RTAudio, RTVideo> convert(final Spanned text, RTFormat.Ht
         // convert paragraphs
         convertParagraphs();
 
-        return new RTHtml<RTImage, RTAudio, RTVideo>(rtFormat, mOut.toString(), mImages);
+        return new RTHtml<RTImage, RTGif, RTAudio, RTVideo>(rtFormat, mOut.toString(), mImages);
     }
 
     // ****************************************** Process Paragraphs *******************************************
@@ -344,6 +348,15 @@ else if (style instanceof TypefaceSpan) {
             mOut.append("<a href=\"");
             mOut.append(((URLSpan) style).getURL());
             mOut.append("\">");
+        } else if (style instanceof BarcodeSpan) {
+            BarcodeSpan span = ((BarcodeSpan) style);
+            RTImage image = span.getValue().getImage();
+            mImages.add(image);
+            String filePath = image.getFilePath(mRTFormat);
+            int height = image.getHeightDP();
+            mOut.append("<img src=\"" + filePath + "\" height=\"" + height + "\" width=\"" + height + "\">");
+            Log.d("path", filePath);
+            return false;    // don't output the dummy character underlying the image.
         } else if (style instanceof ImageSpan) {
             ImageSpan span = ((ImageSpan) style);
             RTImage image = span.getImage();
@@ -351,6 +364,13 @@ else if (style instanceof TypefaceSpan) {
             String filePath = image.getFilePath(mRTFormat);
             mOut.append("<img src=\"" + filePath + "\">");
             return false;    // don't output the dummy character underlying the image.
+        } else if (style instanceof GifSpan) {
+            GifSpan span = ((GifSpan) style);
+            RTGif gif = span.getGif();
+            //mImages.add(gif); ??
+            String filePath = gif.getFilePath(mRTFormat);
+            mOut.append("<img src=\"" + filePath + "\">");
+            return false;    // don't output the dummy character underlying the image.
         } else if (style instanceof AudioSpan) {
             AudioSpan span = ((AudioSpan) style);
             RTAudio audio = span.getAudio();
diff --git a/RTEditor/src/main/java/com/onegravity/rteditor/converter/ConverterTextToHtml.java b/RTEditor/src/main/java/com/onegravity/rteditor/converter/ConverterTextToHtml.java
index 02001022..18de62e8 100644
--- a/RTEditor/src/main/java/com/onegravity/rteditor/converter/ConverterTextToHtml.java
+++ b/RTEditor/src/main/java/com/onegravity/rteditor/converter/ConverterTextToHtml.java
@@ -23,6 +23,7 @@
 import com.onegravity.rteditor.api.format.RTHtml;
 import com.onegravity.rteditor.api.format.RTPlainText;
 import com.onegravity.rteditor.api.media.RTAudio;
+import com.onegravity.rteditor.api.media.RTGif;
 import com.onegravity.rteditor.api.media.RTImage;
 import com.onegravity.rteditor.api.media.RTVideo;
 
@@ -41,10 +42,10 @@ public class ConverterTextToHtml {
 
     private static final boolean USE_REPLACE_ALL = false;
 
-    public static RTHtml<RTImage, RTAudio, RTVideo> convert(RTPlainText input) {
+    public static RTHtml<RTImage, RTGif, RTAudio, RTVideo> convert(RTPlainText input) {
         String text = input.getText();
         String result = convert(text);
-        return new RTHtml<RTImage, RTAudio, RTVideo>(RTFormat.HTML, result);
+        return new RTHtml<RTImage, RTGif, RTAudio, RTVideo>(RTFormat.HTML, result);
     }
 
     public static String convert(String text) {
diff --git a/RTEditor/src/main/java/com/onegravity/rteditor/converter/tagsoup/HTMLSchema.java b/RTEditor/src/main/java/com/onegravity/rteditor/converter/tagsoup/HTMLSchema.java
index e95c4258..68867fee 100644
--- a/RTEditor/src/main/java/com/onegravity/rteditor/converter/tagsoup/HTMLSchema.java
+++ b/RTEditor/src/main/java/com/onegravity/rteditor/converter/tagsoup/HTMLSchema.java
@@ -262,11 +262,11 @@ public HTMLSchema() {
         parent("wbr", "body");
         parent("xmp", "body");
         attribute("a", "hreflang", "NMTOKEN", null);
-        attribute("a", "shape", "CDATA", "rect");
+        attribute("a", "shape_enabled", "CDATA", "rect");
         attribute("a", "tabindex", "NMTOKEN", null);
         attribute("applet", "align", "NMTOKEN", null);
         attribute("area", "nohref", "BOOLEAN", null);
-        attribute("area", "shape", "CDATA", "rect");
+        attribute("area", "shape_enabled", "CDATA", "rect");
         attribute("area", "tabindex", "NMTOKEN", null);
         attribute("br", "clear", "CDATA", "none");
         attribute("button", "disabled", "BOOLEAN", null);
diff --git a/RTEditor/src/main/java/com/onegravity/rteditor/link/Link.java b/RTEditor/src/main/java/com/onegravity/rteditor/link/Link.java
new file mode 100644
index 00000000..30ca9e0b
--- /dev/null
+++ b/RTEditor/src/main/java/com/onegravity/rteditor/link/Link.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2016 Emanuel Moecklin
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.onegravity.rteditor.link;
+
+/**
+ * The Link class describes a link (link text and an URL).
+ */
+public class Link {
+    final private String mLinkText;
+    final private String mUrl;
+
+    Link(String linkText, String url) {
+        mLinkText = linkText;
+        mUrl = url;
+    }
+
+    public String getLinkText() {
+        return mLinkText;
+    }
+
+    public String getUrl() {
+        return mUrl;
+    }
+
+    public boolean isValid() {
+        return mUrl != null && mUrl.length() > 0 && mLinkText != null && mLinkText.length() > 0;
+    }
+}
+
diff --git a/RTEditor/src/main/java/com/onegravity/rteditor/link/LinkEvent.java b/RTEditor/src/main/java/com/onegravity/rteditor/link/LinkEvent.java
new file mode 100644
index 00000000..f8db9b07
--- /dev/null
+++ b/RTEditor/src/main/java/com/onegravity/rteditor/link/LinkEvent.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2016 Emanuel Moecklin
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.onegravity.rteditor.link;
+
+import android.app.Fragment;
+
+/**
+ * This event is broadcast via EventBus when the dialog closes.
+ * It's received by the RTManager to update the active editor.
+ */
+public class LinkEvent {
+    private final String mFragmentTag;
+    private final Link mLink;
+    private final boolean mWasCancelled;
+
+    LinkEvent(Fragment fragment, Link link, boolean wasCancelled) {
+        mFragmentTag = fragment.getTag();
+        mLink = link;
+        mWasCancelled = wasCancelled;
+    }
+
+    public String getFragmentTag() {
+        return mFragmentTag;
+    }
+
+    public Link getLink() {
+        return mLink;
+    }
+
+    public boolean wasCancelled() {
+        return mWasCancelled;
+    }
+}
+
diff --git a/RTEditor/src/main/java/com/onegravity/rteditor/LinkFragment.java b/RTEditor/src/main/java/com/onegravity/rteditor/link/LinkFragment.java
similarity index 82%
rename from RTEditor/src/main/java/com/onegravity/rteditor/LinkFragment.java
rename to RTEditor/src/main/java/com/onegravity/rteditor/link/LinkFragment.java
index 9692f420..84952c0c 100644
--- a/RTEditor/src/main/java/com/onegravity/rteditor/LinkFragment.java
+++ b/RTEditor/src/main/java/com/onegravity/rteditor/link/LinkFragment.java
@@ -14,12 +14,11 @@
  * limitations under the License.
  */
 
-package com.onegravity.rteditor;
+package com.onegravity.rteditor.link;
 
 import android.annotation.SuppressLint;
 import android.app.Dialog;
 import android.app.DialogFragment;
-import android.app.Fragment;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.net.Uri;
@@ -29,6 +28,7 @@
 import android.view.View;
 import android.widget.TextView;
 
+import com.onegravity.rteditor.R;
 import com.onegravity.rteditor.utils.Helper;
 import com.onegravity.rteditor.utils.validator.EmailValidator;
 import com.onegravity.rteditor.utils.validator.UrlValidator;
@@ -45,59 +45,6 @@ public class LinkFragment extends DialogFragment {
     private static final String LINK_ADDRESS = "link_address";
     private static final String LINK_TEXT = "link_text";
 
-    /**
-     * The Link class describes a link (link text and an URL).
-     */
-    static class Link {
-        final private String mLinkText;
-        final private String mUrl;
-
-        private Link(String linkText, String url) {
-            mLinkText = linkText;
-            mUrl = url;
-        }
-
-        public String getLinkText() {
-            return mLinkText;
-        }
-
-        public String getUrl() {
-            return mUrl;
-        }
-
-        public boolean isValid() {
-            return mUrl != null && mUrl.length() > 0 && mLinkText != null && mLinkText.length() > 0;
-        }
-    }
-
-    /**
-     * This event is broadcast via EventBus when the dialog closes.
-     * It's received by the RTManager to update the active editor.
-     */
-    static class LinkEvent {
-        private final String mFragmentTag;
-        private final Link mLink;
-        private final boolean mWasCancelled;
-
-        public LinkEvent(Fragment fragment, Link link, boolean wasCancelled) {
-            mFragmentTag = fragment.getTag();
-            mLink = link;
-            mWasCancelled = wasCancelled;
-        }
-
-        public String getFragmentTag() {
-            return mFragmentTag;
-        }
-
-        public Link getLink() {
-            return mLink;
-        }
-
-        public boolean wasCancelled() {
-            return mWasCancelled;
-        }
-    }
-
     private static final UrlValidator sUrlValidator = new UrlValidator(UrlValidator.ALLOW_2_SLASHES + UrlValidator.ALLOW_ALL_SCHEMES);
     private static final EmailValidator sEmailValidator = EmailValidator.getInstance(false);
 
diff --git a/RTEditor/src/main/java/com/onegravity/rteditor/media/choose/AudioChooserManager.java b/RTEditor/src/main/java/com/onegravity/rteditor/media/choose/AudioChooserManager.java
index 32f96b26..091427fc 100644
--- a/RTEditor/src/main/java/com/onegravity/rteditor/media/choose/AudioChooserManager.java
+++ b/RTEditor/src/main/java/com/onegravity/rteditor/media/choose/AudioChooserManager.java
@@ -21,6 +21,7 @@
 
 import com.onegravity.rteditor.api.RTMediaFactory;
 import com.onegravity.rteditor.api.media.RTAudio;
+import com.onegravity.rteditor.api.media.RTGif;
 import com.onegravity.rteditor.api.media.RTImage;
 import com.onegravity.rteditor.api.media.RTVideo;
 import com.onegravity.rteditor.media.MonitoredActivity;
@@ -37,7 +38,7 @@ public interface AudioChooserListener extends MediaChooserListener {
     }
 
     AudioChooserManager(MonitoredActivity activity,
-                        MediaAction mediaAction, RTMediaFactory<RTImage, RTAudio, RTVideo> mediaFactory,
+                        MediaAction mediaAction, RTMediaFactory<RTImage, RTGif, RTAudio, RTVideo> mediaFactory,
                         AudioChooserListener listener, Bundle savedInstanceState) {
         super(activity, mediaAction, mediaFactory, listener, savedInstanceState);
     }
diff --git a/RTEditor/src/main/java/com/onegravity/rteditor/media/choose/GifChooserManager.java b/RTEditor/src/main/java/com/onegravity/rteditor/media/choose/GifChooserManager.java
new file mode 100644
index 00000000..127a0136
--- /dev/null
+++ b/RTEditor/src/main/java/com/onegravity/rteditor/media/choose/GifChooserManager.java
@@ -0,0 +1,89 @@
+/*
+ * <!--
+ *   Copyright (C) 2015-2016 Emanuel Moecklin
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ *   -->
+ */
+
+package com.onegravity.rteditor.media.choose;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.util.Log;
+
+import com.onegravity.rteditor.R;
+import com.onegravity.rteditor.api.RTMediaFactory;
+import com.onegravity.rteditor.api.media.RTAudio;
+import com.onegravity.rteditor.api.media.RTGif;
+import com.onegravity.rteditor.api.media.RTImage;
+import com.onegravity.rteditor.api.media.RTVideo;
+import com.onegravity.rteditor.media.MonitoredActivity;
+import com.onegravity.rteditor.media.choose.processor.GifProcessor;
+import com.onegravity.rteditor.media.choose.processor.GifProcessor.GifProcessorListener;
+import com.onegravity.rteditor.utils.Constants.MediaAction;
+
+class GifChooserManager extends MediaChooserManager implements GifProcessorListener {
+
+    public interface GifChooserListener extends MediaChooserListener {
+        /**
+         * Callback method to inform the caller that an gif file has been processed
+         */
+        public void onGifChosen(RTGif gif);
+    }
+
+    private GifChooserListener mListener;
+
+    GifChooserManager(MonitoredActivity activity, MediaAction mediaAction,
+                      RTMediaFactory<RTImage, RTGif, RTAudio, RTVideo> mediaFactory,
+                      GifChooserListener listener, Bundle savedInstanceState) {
+        super(activity, mediaAction, mediaFactory, listener, savedInstanceState);
+        mListener = listener;
+    }
+
+    @SuppressWarnings("incomplete-switch")
+    @Override
+    boolean chooseMedia() throws IllegalArgumentException {
+        if (mListener == null) {
+            throw new IllegalArgumentException("GifChooserListener cannot be null");
+        }
+
+        Intent intent = new Intent(Intent.ACTION_GET_CONTENT, null)
+                .addCategory(Intent.CATEGORY_OPENABLE)
+                .setType("image/gif");
+        String title = mActivity.getString(R.string.rte_pick_gif);
+        startActivity(Intent.createChooser(intent, title));
+        return true;
+    }
+
+
+    @SuppressWarnings("incomplete-switch")
+    @Override
+    void processMedia(MediaAction mediaAction, Intent data) {
+        String originalFile = determineOriginalFile(data);
+        if (originalFile != null) {
+            GifProcessor processor = new GifProcessor(originalFile, mMediaFactory, this);
+            startBackgroundJob(processor);
+        }
+    }
+
+
+    @Override
+    /* GifProcessorListener */
+    public void onGifProcessed(RTGif gif) {
+        if (mListener != null) {
+            mListener.onGifChosen(gif);
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/RTEditor/src/main/java/com/onegravity/rteditor/media/choose/ImageChooserManager.java b/RTEditor/src/main/java/com/onegravity/rteditor/media/choose/ImageChooserManager.java
index 456ef1de..db826911 100644
--- a/RTEditor/src/main/java/com/onegravity/rteditor/media/choose/ImageChooserManager.java
+++ b/RTEditor/src/main/java/com/onegravity/rteditor/media/choose/ImageChooserManager.java
@@ -27,6 +27,7 @@
 import com.onegravity.rteditor.R;
 import com.onegravity.rteditor.api.RTMediaFactory;
 import com.onegravity.rteditor.api.media.RTAudio;
+import com.onegravity.rteditor.api.media.RTGif;
 import com.onegravity.rteditor.api.media.RTImage;
 import com.onegravity.rteditor.api.media.RTVideo;
 import com.onegravity.rteditor.media.MediaUtils;
@@ -51,7 +52,7 @@ public interface ImageChooserListener extends MediaChooserListener {
     private ImageChooserListener mListener;
 
     ImageChooserManager(MonitoredActivity activity, MediaAction mediaAction,
-                        RTMediaFactory<RTImage, RTAudio, RTVideo> mediaFactory,
+                        RTMediaFactory<RTImage, RTGif, RTAudio, RTVideo> mediaFactory,
                         ImageChooserListener listener, Bundle savedInstanceState) {
 
         super(activity, mediaAction, mediaFactory, listener, savedInstanceState);
diff --git a/RTEditor/src/main/java/com/onegravity/rteditor/media/choose/MediaChooserActivity.java b/RTEditor/src/main/java/com/onegravity/rteditor/media/choose/MediaChooserActivity.java
index d5305f7c..2d503c3a 100644
--- a/RTEditor/src/main/java/com/onegravity/rteditor/media/choose/MediaChooserActivity.java
+++ b/RTEditor/src/main/java/com/onegravity/rteditor/media/choose/MediaChooserActivity.java
@@ -19,16 +19,19 @@
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
+import android.util.Log;
 import android.widget.Toast;
 
 import com.onegravity.rteditor.api.RTMediaFactory;
 import com.onegravity.rteditor.api.format.RTFormat;
 import com.onegravity.rteditor.api.media.RTAudio;
+import com.onegravity.rteditor.api.media.RTGif;
 import com.onegravity.rteditor.api.media.RTImage;
 import com.onegravity.rteditor.api.media.RTMedia;
 import com.onegravity.rteditor.api.media.RTVideo;
 import com.onegravity.rteditor.media.MonitoredActivity;
 import com.onegravity.rteditor.media.choose.AudioChooserManager.AudioChooserListener;
+import com.onegravity.rteditor.media.choose.GifChooserManager.GifChooserListener;
 import com.onegravity.rteditor.media.choose.ImageChooserManager.ImageChooserListener;
 import com.onegravity.rteditor.media.choose.VideoChooserManager.VideoChooserListener;
 import com.onegravity.rteditor.media.crop.CropImageActivity;
@@ -39,6 +42,7 @@
 
 public class MediaChooserActivity extends MonitoredActivity implements
         ImageChooserListener,
+        GifChooserListener,
         AudioChooserListener,
         VideoChooserListener {
 
@@ -47,7 +51,7 @@ public class MediaChooserActivity extends MonitoredActivity implements
     public static final String EXTRA_MEDIA_ACTION = PREFIX + "EXTRA_MEDIA_ACTION";
     public static final String EXTRA_MEDIA_FACTORY = PREFIX + "EXTRA_MEDIA_FACTORY";
 
-    private RTMediaFactory<RTImage, RTAudio, RTVideo> mMediaFactory;
+    private RTMediaFactory<RTImage, RTGif, RTAudio, RTVideo> mMediaFactory;
     private MediaAction mMediaAction;
 
     transient private MediaChooserManager mMediaChooserMgr;
@@ -66,7 +70,7 @@ protected void onCreate(Bundle savedInstanceState) {
         if (extras != null) {
             String mediaAction = extras.getString(EXTRA_MEDIA_ACTION);
             mMediaAction = mediaAction == null ? null : MediaAction.valueOf(mediaAction);
-            mMediaFactory = (RTMediaFactory<RTImage, RTAudio, RTVideo>) extras.getSerializable(EXTRA_MEDIA_FACTORY);
+            mMediaFactory = (RTMediaFactory<RTImage, RTGif, RTAudio, RTVideo>) extras.getSerializable(EXTRA_MEDIA_FACTORY);
         }
 
         if (mMediaAction != null) {
@@ -76,12 +80,15 @@ protected void onCreate(Bundle savedInstanceState) {
             }
 
             switch (mMediaAction) {
-
                 case PICK_PICTURE:
                 case CAPTURE_PICTURE:
                     mMediaChooserMgr = new ImageChooserManager(this, mMediaAction, mMediaFactory, this, savedInstanceState);
                     break;
 
+                case PICK_GIF:
+                    mMediaChooserMgr = new GifChooserManager(this, mMediaAction, mMediaFactory, this, savedInstanceState);
+                    break;
+
                 case PICK_VIDEO:
                 case CAPTURE_VIDEO:
                     mMediaChooserMgr = new VideoChooserManager(this, mMediaAction, mMediaFactory, this, savedInstanceState);
@@ -92,7 +99,6 @@ protected void onCreate(Bundle savedInstanceState) {
                     mMediaChooserMgr = new AudioChooserManager(this, mMediaAction, mMediaFactory, this, savedInstanceState);
                     break;
             }
-
             if (mMediaChooserMgr == null) {
                 finish();
             } else if (!isWorkInProgress()) {
@@ -135,12 +141,14 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
 
             if (requestCode == MediaAction.PICK_PICTURE.requestCode() && data != null) {
                 mMediaChooserMgr.processMedia(MediaAction.PICK_PICTURE, data);
+            } else if (requestCode == MediaAction.PICK_GIF.requestCode()) {
+                mMediaChooserMgr.processMedia(MediaAction.PICK_GIF, data);
             } else if (requestCode == MediaAction.CAPTURE_PICTURE.requestCode()) {
                 mMediaChooserMgr.processMedia(MediaAction.CAPTURE_PICTURE, data);    // data may be null here
             } else if (requestCode == Constants.CROP_IMAGE) {
                 String path = data.getStringExtra(CropImageActivity.IMAGE_DESTINATION_FILE);
                 if (path != null && mSelectedMedia instanceof RTImage) {
-                    EventBus.getDefault().postSticky( new MediaEvent(mSelectedMedia) );
+                    EventBus.getDefault().postSticky(new MediaEvent(mSelectedMedia));
                     finish();
                 }
             }
@@ -168,24 +176,30 @@ public void run() {
                             .putExtra(CropImageActivity.IMAGE_SOURCE_FILE, filePath)
                             .putExtra(CropImageActivity.IMAGE_DESTINATION_FILE, filePath)
 
-                                    // allow CropImage activity to re-scale image
+                            // allow CropImage activity to re-scale image
                             .putExtra(CropImageActivity.SCALE, true)
                             .putExtra(CropImageActivity.SCALE_UP_IF_NEEDED, false)
 
-                                    // no fixed aspect ratio
+                            // no fixed aspect ratio
                             .putExtra(CropImageActivity.ASPECT_X, 0)
                             .putExtra(CropImageActivity.ASPECT_Y, 0);
 
                     // start activity CropImageActivity
                     startActivityForResult(intent, Constants.CROP_IMAGE);
                 } else {
-                    EventBus.getDefault().postSticky( new MediaEvent(mSelectedMedia) );
+                    EventBus.getDefault().postSticky(new MediaEvent(mSelectedMedia));
                     finish();
                 }
             }
         });
     }
 
+    @Override
+    public void onGifChosen(final RTGif gif) {
+        EventBus.getDefault().postSticky(new MediaEvent(gif));
+        finish();
+    }
+
     @Override
     /* AudioChooserListener */
     public void onAudioChosen(RTAudio audio) {
diff --git a/RTEditor/src/main/java/com/onegravity/rteditor/media/choose/MediaChooserManager.java b/RTEditor/src/main/java/com/onegravity/rteditor/media/choose/MediaChooserManager.java
index a6d8cd52..30bbac54 100644
--- a/RTEditor/src/main/java/com/onegravity/rteditor/media/choose/MediaChooserManager.java
+++ b/RTEditor/src/main/java/com/onegravity/rteditor/media/choose/MediaChooserManager.java
@@ -21,9 +21,9 @@
 import android.os.Bundle;
 
 import com.onegravity.rteditor.R;
-import com.onegravity.rteditor.api.RTApi;
 import com.onegravity.rteditor.api.RTMediaFactory;
 import com.onegravity.rteditor.api.media.RTAudio;
+import com.onegravity.rteditor.api.media.RTGif;
 import com.onegravity.rteditor.api.media.RTImage;
 import com.onegravity.rteditor.api.media.RTVideo;
 import com.onegravity.rteditor.media.MediaUtils;
@@ -42,7 +42,7 @@ public interface MediaChooserListener {
     }
 
     transient protected MonitoredActivity mActivity;
-    transient protected RTMediaFactory<RTImage, RTAudio, RTVideo> mMediaFactory;
+    transient protected RTMediaFactory<RTImage, RTGif, RTAudio, RTVideo> mMediaFactory;
 
     // the type of chooser (see MediaChooserActivity.REQUEST_PICK_PICTURE etc.)
     transient protected MediaAction mMediaAction;
@@ -54,7 +54,7 @@ public interface MediaChooserListener {
     private String mOriginalFile;
 
     MediaChooserManager(MonitoredActivity activity, MediaAction mediaAction,
-                        RTMediaFactory<RTImage, RTAudio, RTVideo> mediaFactory,
+                        RTMediaFactory<RTImage, RTGif, RTAudio, RTVideo> mediaFactory,
                         MediaChooserListener listener, Bundle savedInstanceState) {
         mActivity = activity;
         mMediaFactory = mediaFactory;
@@ -73,7 +73,7 @@ void onSaveInstanceState(Bundle outState) {
     /**
      * Call this method, to start the chooser, i.e, The camera app or the gallery depending upon the type
      *
-     * @param False if it's not possible to choose a media (e.g. when no sdcard is available to take a picture)
+     * @return False if it's not possible to choose a media (e.g. when no sdcard is available to take a picture)
      * @throws IllegalArgumentException
      */
     abstract boolean chooseMedia() throws IllegalArgumentException;
diff --git a/RTEditor/src/main/java/com/onegravity/rteditor/media/choose/VideoChooserManager.java b/RTEditor/src/main/java/com/onegravity/rteditor/media/choose/VideoChooserManager.java
index 00bc72bc..d4594d36 100644
--- a/RTEditor/src/main/java/com/onegravity/rteditor/media/choose/VideoChooserManager.java
+++ b/RTEditor/src/main/java/com/onegravity/rteditor/media/choose/VideoChooserManager.java
@@ -27,6 +27,7 @@
 import com.onegravity.rteditor.R;
 import com.onegravity.rteditor.api.RTMediaFactory;
 import com.onegravity.rteditor.api.media.RTAudio;
+import com.onegravity.rteditor.api.media.RTGif;
 import com.onegravity.rteditor.api.media.RTImage;
 import com.onegravity.rteditor.api.media.RTVideo;
 import com.onegravity.rteditor.media.MediaUtils;
@@ -51,7 +52,7 @@ public interface VideoChooserListener extends MediaChooserListener {
     private VideoChooserListener mListener;
 
     VideoChooserManager(MonitoredActivity activity, MediaAction mediaAction,
-                        RTMediaFactory<RTImage, RTAudio, RTVideo> mediaFactory,
+                        RTMediaFactory<RTImage, RTGif, RTAudio, RTVideo> mediaFactory,
                         VideoChooserListener listener, Bundle savedInstanceState) {
 
         super(activity, mediaAction, mediaFactory, listener, savedInstanceState);
diff --git a/RTEditor/src/main/java/com/onegravity/rteditor/media/choose/processor/AudioProcessor.java b/RTEditor/src/main/java/com/onegravity/rteditor/media/choose/processor/AudioProcessor.java
index d174f5d7..64165790 100644
--- a/RTEditor/src/main/java/com/onegravity/rteditor/media/choose/processor/AudioProcessor.java
+++ b/RTEditor/src/main/java/com/onegravity/rteditor/media/choose/processor/AudioProcessor.java
@@ -18,6 +18,7 @@
 
 import com.onegravity.rteditor.api.RTMediaFactory;
 import com.onegravity.rteditor.api.media.RTAudio;
+import com.onegravity.rteditor.api.media.RTGif;
 import com.onegravity.rteditor.api.media.RTImage;
 import com.onegravity.rteditor.api.media.RTVideo;
 
@@ -29,7 +30,7 @@ public interface AudioProcessorListener extends MediaProcessorListener {
         public void onAudioProcessed(RTAudio audio);
     }
 
-    public AudioProcessor(String originalFile, RTMediaFactory<RTImage, RTAudio, RTVideo> mediaFactory, AudioProcessorListener listener) {
+    public AudioProcessor(String originalFile, RTMediaFactory<RTImage, RTGif, RTAudio, RTVideo> mediaFactory, AudioProcessorListener listener) {
         super(originalFile, mediaFactory, listener);
     }
 
diff --git a/RTEditor/src/main/java/com/onegravity/rteditor/media/choose/processor/GifProcessor.java b/RTEditor/src/main/java/com/onegravity/rteditor/media/choose/processor/GifProcessor.java
new file mode 100644
index 00000000..2cbc9943
--- /dev/null
+++ b/RTEditor/src/main/java/com/onegravity/rteditor/media/choose/processor/GifProcessor.java
@@ -0,0 +1,62 @@
+/*
+ * <!--
+ *   Copyright (C) 2015-2016 Emanuel Moecklin
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ *   -->
+ */
+
+package com.onegravity.rteditor.media.choose.processor;
+
+import com.onegravity.rteditor.api.RTMediaFactory;
+import com.onegravity.rteditor.api.media.RTAudio;
+import com.onegravity.rteditor.api.media.RTGif;
+import com.onegravity.rteditor.api.media.RTImage;
+import com.onegravity.rteditor.api.media.RTMediaSource;
+import com.onegravity.rteditor.api.media.RTMediaType;
+import com.onegravity.rteditor.api.media.RTVideo;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+public class GifProcessor extends MediaProcessor {
+
+    public interface GifProcessorListener extends MediaProcessorListener {
+        public void onGifProcessed(RTGif image);
+    }
+
+    private GifProcessorListener mListener;
+
+    public GifProcessor(String originalFile, RTMediaFactory<RTImage, RTGif, RTAudio, RTVideo> mediaFactory, GifProcessorListener listener) {
+        super(originalFile, mediaFactory, listener);
+        mListener = listener;
+    }
+
+    @Override
+    protected void processMedia() throws IOException, Exception {
+        InputStream in = super.getInputStream();
+        if (in == null) {
+            if (mListener != null) {
+                mListener.onError("No file found to process");
+            }
+        } else {
+            RTMediaSource source = new RTMediaSource(RTMediaType.GIF, in, getOriginalFile(), getMimeType());
+            RTGif gif = mMediaFactory.createGif(source);
+            if (gif != null && mListener != null) {
+                mListener.onGifProcessed(gif);
+            }
+        }
+
+    }
+
+}
\ No newline at end of file
diff --git a/RTEditor/src/main/java/com/onegravity/rteditor/media/choose/processor/ImageProcessor.java b/RTEditor/src/main/java/com/onegravity/rteditor/media/choose/processor/ImageProcessor.java
index d00a0cc4..6c2e642e 100644
--- a/RTEditor/src/main/java/com/onegravity/rteditor/media/choose/processor/ImageProcessor.java
+++ b/RTEditor/src/main/java/com/onegravity/rteditor/media/choose/processor/ImageProcessor.java
@@ -18,6 +18,7 @@
 
 import com.onegravity.rteditor.api.RTMediaFactory;
 import com.onegravity.rteditor.api.media.RTAudio;
+import com.onegravity.rteditor.api.media.RTGif;
 import com.onegravity.rteditor.api.media.RTImage;
 import com.onegravity.rteditor.api.media.RTMediaSource;
 import com.onegravity.rteditor.api.media.RTMediaType;
@@ -34,7 +35,7 @@ public interface ImageProcessorListener extends MediaProcessorListener {
 
     private ImageProcessorListener mListener;
 
-    public ImageProcessor(String originalFile, RTMediaFactory<RTImage, RTAudio, RTVideo> mediaFactory, ImageProcessorListener listener) {
+    public ImageProcessor(String originalFile, RTMediaFactory<RTImage, RTGif, RTAudio, RTVideo> mediaFactory, ImageProcessorListener listener) {
         super(originalFile, mediaFactory, listener);
         mListener = listener;
     }
diff --git a/RTEditor/src/main/java/com/onegravity/rteditor/media/choose/processor/MediaProcessor.java b/RTEditor/src/main/java/com/onegravity/rteditor/media/choose/processor/MediaProcessor.java
index 69777405..9aaf1af8 100644
--- a/RTEditor/src/main/java/com/onegravity/rteditor/media/choose/processor/MediaProcessor.java
+++ b/RTEditor/src/main/java/com/onegravity/rteditor/media/choose/processor/MediaProcessor.java
@@ -24,9 +24,9 @@
 import com.onegravity.rteditor.api.RTApi;
 import com.onegravity.rteditor.api.RTMediaFactory;
 import com.onegravity.rteditor.api.media.RTAudio;
+import com.onegravity.rteditor.api.media.RTGif;
 import com.onegravity.rteditor.api.media.RTImage;
 import com.onegravity.rteditor.api.media.RTVideo;
-
 import com.onegravity.rteditor.utils.io.FilenameUtils;
 import com.onegravity.rteditor.utils.io.IOUtils;
 
@@ -48,9 +48,9 @@ public interface MediaProcessorListener {
 
     final private String mOriginalFile;
 
-    protected final RTMediaFactory<RTImage, RTAudio, RTVideo> mMediaFactory;
+    protected final RTMediaFactory<RTImage, RTGif, RTAudio, RTVideo> mMediaFactory;
 
-    public MediaProcessor(String originalFile, RTMediaFactory<RTImage, RTAudio, RTVideo> mediaFactory, MediaProcessorListener listener) {
+    public MediaProcessor(String originalFile, RTMediaFactory<RTImage, RTGif, RTAudio, RTVideo> mediaFactory, MediaProcessorListener listener) {
         mOriginalFile = originalFile;
         mMediaFactory = mediaFactory;
         mListener = listener;
diff --git a/RTEditor/src/main/java/com/onegravity/rteditor/media/choose/processor/VideoProcessor.java b/RTEditor/src/main/java/com/onegravity/rteditor/media/choose/processor/VideoProcessor.java
index b40be127..834f1dec 100644
--- a/RTEditor/src/main/java/com/onegravity/rteditor/media/choose/processor/VideoProcessor.java
+++ b/RTEditor/src/main/java/com/onegravity/rteditor/media/choose/processor/VideoProcessor.java
@@ -18,6 +18,7 @@
 
 import com.onegravity.rteditor.api.RTMediaFactory;
 import com.onegravity.rteditor.api.media.RTAudio;
+import com.onegravity.rteditor.api.media.RTGif;
 import com.onegravity.rteditor.api.media.RTImage;
 import com.onegravity.rteditor.api.media.RTVideo;
 
@@ -29,7 +30,7 @@ public interface VideoProcessorListener extends MediaProcessorListener {
         public void onVideoProcessed(RTVideo video);
     }
 
-    public VideoProcessor(String originalFile, RTMediaFactory<RTImage, RTAudio, RTVideo> mediaFactory, VideoProcessorListener listener) {
+    public VideoProcessor(String originalFile, RTMediaFactory<RTImage, RTGif, RTAudio, RTVideo> mediaFactory, VideoProcessorListener listener) {
         super(originalFile, mediaFactory, listener);
     }
 
diff --git a/RTEditor/src/main/java/com/onegravity/rteditor/spans/BarcodeSpan.java b/RTEditor/src/main/java/com/onegravity/rteditor/spans/BarcodeSpan.java
new file mode 100644
index 00000000..083192ee
--- /dev/null
+++ b/RTEditor/src/main/java/com/onegravity/rteditor/spans/BarcodeSpan.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2015-2016 Emanuel Moecklin
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.onegravity.rteditor.spans;
+
+import android.text.style.ClickableSpan;
+import android.view.View;
+
+import com.onegravity.rteditor.barcode.Barcode;
+
+/**
+ * A wrapper around an android.text.style.ClickableSpan that forwards clicks to the
+ * View it's embedded in.
+ * That View is the RTEditText which implements the BarcodeSpanListener interface.
+ */
+public class BarcodeSpan extends ClickableSpan {
+
+    public interface BarcodeSpanListener {
+        void onBarcodeClicked(BarcodeSpan linkSpan);
+    }
+
+    private final Barcode mBarcode;
+
+    public BarcodeSpan(Barcode barcode) {
+        mBarcode = barcode;
+    }
+
+    @Override
+    public void onClick(View view) {
+        if (view instanceof BarcodeSpanListener) {
+            ((BarcodeSpanListener) view).onBarcodeClicked(this);
+        }
+    }
+
+    public Barcode getValue() {
+        return mBarcode;
+    }
+
+}
diff --git a/RTEditor/src/main/java/com/onegravity/rteditor/spans/GifSpan.java b/RTEditor/src/main/java/com/onegravity/rteditor/spans/GifSpan.java
new file mode 100644
index 00000000..d5b4c797
--- /dev/null
+++ b/RTEditor/src/main/java/com/onegravity/rteditor/spans/GifSpan.java
@@ -0,0 +1,41 @@
+/*
+ * <!--
+ *   Copyright (C) 2015-2016 Emanuel Moecklin
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ *   -->
+ */
+
+package com.onegravity.rteditor.spans;
+
+import android.graphics.drawable.Drawable;
+
+import com.onegravity.rteditor.api.media.RTGif;
+
+import java.io.IOException;
+
+/**
+ * An ImageSpan representing an embedded gif.
+ */
+public class GifSpan extends MediaSpan {
+
+    public GifSpan(final RTGif image, boolean isSaved) throws IOException {
+        super(image, isSaved, image.getDrawable());
+    }
+
+    public RTGif getGif() {
+        return (RTGif) mMedia;
+    }
+
+
+}
\ No newline at end of file
diff --git a/RTEditor/src/main/java/com/onegravity/rteditor/spans/LinkSpan.java b/RTEditor/src/main/java/com/onegravity/rteditor/spans/LinkSpan.java
index 4a44d43c..630fc59c 100644
--- a/RTEditor/src/main/java/com/onegravity/rteditor/spans/LinkSpan.java
+++ b/RTEditor/src/main/java/com/onegravity/rteditor/spans/LinkSpan.java
@@ -27,7 +27,7 @@
 public class LinkSpan extends URLSpan implements RTSpan<String> {
 
     public interface LinkSpanListener {
-        public void onClick(LinkSpan linkSpan);
+        void onLinkClicked(LinkSpan linkSpan);
     }
 
     public LinkSpan(String url) {
@@ -37,7 +37,7 @@ public LinkSpan(String url) {
     @Override
     public void onClick(View view) {
         if (view instanceof LinkSpanListener) {
-            ((LinkSpanListener) view).onClick(this);
+            ((LinkSpanListener) view).onLinkClicked(this);
         }
     }
 
diff --git a/RTEditor/src/main/java/com/onegravity/rteditor/spans/MediaSpan.java b/RTEditor/src/main/java/com/onegravity/rteditor/spans/MediaSpan.java
index 3f52c00f..0dae0f5f 100644
--- a/RTEditor/src/main/java/com/onegravity/rteditor/spans/MediaSpan.java
+++ b/RTEditor/src/main/java/com/onegravity/rteditor/spans/MediaSpan.java
@@ -16,6 +16,8 @@
 
 package com.onegravity.rteditor.spans;
 
+import android.graphics.drawable.Drawable;
+
 import com.onegravity.rteditor.api.RTApi;
 import com.onegravity.rteditor.api.format.RTFormat;
 import com.onegravity.rteditor.api.media.RTMedia;
@@ -39,6 +41,12 @@ public MediaSpan(RTMedia media, boolean isSaved) {
         mIsSaved = isSaved;
     }
 
+    public MediaSpan(RTMedia media, boolean isSaved, Drawable drawable) {
+        super(drawable);
+        mMedia = media;
+        mIsSaved = isSaved;
+    }
+
     public RTMedia getMedia() {
         return mMedia;
     }
diff --git a/RTEditor/src/main/java/com/onegravity/rteditor/spans/RTSpan.java b/RTEditor/src/main/java/com/onegravity/rteditor/spans/RTSpan.java
index af128a6f..b99a001b 100644
--- a/RTEditor/src/main/java/com/onegravity/rteditor/spans/RTSpan.java
+++ b/RTEditor/src/main/java/com/onegravity/rteditor/spans/RTSpan.java
@@ -21,6 +21,6 @@
  */
 public interface RTSpan<V> {
 
-    public V getValue();
+    V getValue();
 
 }
diff --git a/RTEditor/src/main/java/com/onegravity/rteditor/utils/Constants.java b/RTEditor/src/main/java/com/onegravity/rteditor/utils/Constants.java
index 16b200b3..758459e9 100644
--- a/RTEditor/src/main/java/com/onegravity/rteditor/utils/Constants.java
+++ b/RTEditor/src/main/java/com/onegravity/rteditor/utils/Constants.java
@@ -24,11 +24,12 @@ public abstract class Constants {
      */
     public enum MediaAction {
         PICK_PICTURE(101),
-        PICK_VIDEO(102),
-        PICK_AUDIO(103),
-        CAPTURE_PICTURE(104),
-        CAPTURE_VIDEO(105),
-        CAPTURE_AUDIO(106);
+        PICK_GIF(102),
+        PICK_VIDEO(103),
+        PICK_AUDIO(104),
+        CAPTURE_PICTURE(105),
+        CAPTURE_VIDEO(106),
+        CAPTURE_AUDIO(107);
 
         private int mRequestCode;
 
@@ -41,6 +42,6 @@ public int requestCode() {
         }
     }
 
-    public final static int CROP_IMAGE = 107;
+    public final static int CROP_IMAGE = 108;
 
 }
diff --git a/RTEditor/src/main/java/com/onegravity/rteditor/utils/Helper.java b/RTEditor/src/main/java/com/onegravity/rteditor/utils/Helper.java
index d1ac8ef3..ccfb93e7 100644
--- a/RTEditor/src/main/java/com/onegravity/rteditor/utils/Helper.java
+++ b/RTEditor/src/main/java/com/onegravity/rteditor/utils/Helper.java
@@ -81,6 +81,26 @@ public static int convertSpToPx(int spSize) {
         return Math.round((float) spSize / getDisplayDensity4Fonts());
     }
 
+    /**
+     * This method converts dp unit to equivalent pixels, depending on device density.
+     *
+     * @param dp A value in dp (density independent pixels) unit. Which we need to convert into pixels
+     * @return A int value to represent px equivalent to dp depending on device density
+     */
+    public static int convertDpToPixel(int dp) {
+        return dp * (getDisplayMetrics().densityDpi / DisplayMetrics.DENSITY_DEFAULT);
+    }
+
+    /**
+     * This method converts device specific pixels to density independent pixels.
+     *
+     * @param px A value in px (pixels) unit. Which we need to convert into db
+     * @return A int value to represent dp equivalent to px value
+     */
+    public static int convertPixelsToDp(int px) {
+        return px / (getDisplayMetrics().densityDpi / DisplayMetrics.DENSITY_DEFAULT);
+    }
+
     private static DisplayMetrics getDisplayMetrics() {
         Display display = ((WindowManager) RTApi.getApplicationContext().getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay();
         DisplayMetrics metrics = new DisplayMetrics();
@@ -112,6 +132,7 @@ public static int getLeadingMarging() {
 
     /**
      * This method encodes the query part of an url
+     *
      * @param url an url (e.g. http://www.1gravity.com?query=üö)
      * @return The url with an encoded query, e.g. http://www.1gravity.com?query%3D%C3%BC%C3%B6
      */
@@ -133,23 +154,24 @@ public static String encodeUrl(String url) {
 
             URI baseUri = new URI(uri.getScheme(), uri.getAuthority(), uri.getPath(), null, uri.getFragment());
             return baseUri + queryString;
+        } catch (UnsupportedEncodingException ignore) {
+        } catch (URISyntaxException ignore) {
         }
-        catch (UnsupportedEncodingException ignore) {}
-        catch (URISyntaxException ignore) {}
 
         return uri.toString();
     }
 
     /**
      * This method decodes an url with encoded query string
+     *
      * @param url an url with encoded query string (e.g. http://www.1gravity.com?query%C3%BC%C3%B6)
      * @return The decoded url, e.g. http://www.1gravity.com?query=üö
      */
     public static String decodeQuery(String url) {
         try {
             return URLDecoder.decode(url, "UTF-8");
+        } catch (UnsupportedEncodingException ignore) {
         }
-        catch (UnsupportedEncodingException ignore) {}
 
         return url;
     }
@@ -201,9 +223,8 @@ public static boolean isRTL(CharSequence s, int start, int end) {
 
         try {
             Bidi bidi = new Bidi(s.subSequence(start, end).toString(), Bidi.DIRECTION_DEFAULT_LEFT_TO_RIGHT);
-            return ! bidi.baseIsLeftToRight();
-        }
-        catch (IndexOutOfBoundsException e) {
+            return !bidi.baseIsLeftToRight();
+        } catch (IndexOutOfBoundsException e) {
             return false;
         }
     }
diff --git a/RTEditor/src/main/res/drawable-hdpi/ic_menu_close_clear_cancel_dark.png b/RTEditor/src/main/res/drawable-hdpi/ic_menu_close_clear_cancel_dark.png
deleted file mode 100644
index 8cac43c9..00000000
Binary files a/RTEditor/src/main/res/drawable-hdpi/ic_menu_close_clear_cancel_dark.png and /dev/null differ
diff --git a/RTEditor/src/main/res/drawable-hdpi/ic_menu_close_clear_cancel_light.png b/RTEditor/src/main/res/drawable-hdpi/ic_menu_close_clear_cancel_light.png
deleted file mode 100644
index 354c3b59..00000000
Binary files a/RTEditor/src/main/res/drawable-hdpi/ic_menu_close_clear_cancel_light.png and /dev/null differ
diff --git a/RTEditor/src/main/res/drawable-hdpi/ic_menu_rotate_left_dark.png b/RTEditor/src/main/res/drawable-hdpi/ic_menu_rotate_left_dark.png
deleted file mode 100644
index 7b040876..00000000
Binary files a/RTEditor/src/main/res/drawable-hdpi/ic_menu_rotate_left_dark.png and /dev/null differ
diff --git a/RTEditor/src/main/res/drawable-hdpi/ic_menu_rotate_left_light.png b/RTEditor/src/main/res/drawable-hdpi/ic_menu_rotate_left_light.png
deleted file mode 100644
index ff67bf8a..00000000
Binary files a/RTEditor/src/main/res/drawable-hdpi/ic_menu_rotate_left_light.png and /dev/null differ
diff --git a/RTEditor/src/main/res/drawable-hdpi/ic_menu_rotate_right_dark.png b/RTEditor/src/main/res/drawable-hdpi/ic_menu_rotate_right_dark.png
deleted file mode 100644
index fb3b149f..00000000
Binary files a/RTEditor/src/main/res/drawable-hdpi/ic_menu_rotate_right_dark.png and /dev/null differ
diff --git a/RTEditor/src/main/res/drawable-hdpi/ic_menu_rotate_right_light.png b/RTEditor/src/main/res/drawable-hdpi/ic_menu_rotate_right_light.png
deleted file mode 100644
index f2eb2d26..00000000
Binary files a/RTEditor/src/main/res/drawable-hdpi/ic_menu_rotate_right_light.png and /dev/null differ
diff --git a/RTEditor/src/main/res/drawable-hdpi/ic_menu_save_dark.png b/RTEditor/src/main/res/drawable-hdpi/ic_menu_save_dark.png
deleted file mode 100644
index 2c2dcd8e..00000000
Binary files a/RTEditor/src/main/res/drawable-hdpi/ic_menu_save_dark.png and /dev/null differ
diff --git a/RTEditor/src/main/res/drawable-hdpi/ic_menu_save_light.png b/RTEditor/src/main/res/drawable-hdpi/ic_menu_save_light.png
deleted file mode 100644
index b78afa7e..00000000
Binary files a/RTEditor/src/main/res/drawable-hdpi/ic_menu_save_light.png and /dev/null differ
diff --git a/RTEditor/src/main/res/drawable-mdpi/ic_menu_close_clear_cancel_dark.png b/RTEditor/src/main/res/drawable-mdpi/ic_menu_close_clear_cancel_dark.png
deleted file mode 100644
index e3f30d86..00000000
Binary files a/RTEditor/src/main/res/drawable-mdpi/ic_menu_close_clear_cancel_dark.png and /dev/null differ
diff --git a/RTEditor/src/main/res/drawable-mdpi/ic_menu_close_clear_cancel_light.png b/RTEditor/src/main/res/drawable-mdpi/ic_menu_close_clear_cancel_light.png
deleted file mode 100644
index e4043363..00000000
Binary files a/RTEditor/src/main/res/drawable-mdpi/ic_menu_close_clear_cancel_light.png and /dev/null differ
diff --git a/RTEditor/src/main/res/drawable-mdpi/ic_menu_rotate_left_dark.png b/RTEditor/src/main/res/drawable-mdpi/ic_menu_rotate_left_dark.png
deleted file mode 100644
index c4e298d8..00000000
Binary files a/RTEditor/src/main/res/drawable-mdpi/ic_menu_rotate_left_dark.png and /dev/null differ
diff --git a/RTEditor/src/main/res/drawable-mdpi/ic_menu_rotate_left_light.png b/RTEditor/src/main/res/drawable-mdpi/ic_menu_rotate_left_light.png
deleted file mode 100644
index f7c19ee7..00000000
Binary files a/RTEditor/src/main/res/drawable-mdpi/ic_menu_rotate_left_light.png and /dev/null differ
diff --git a/RTEditor/src/main/res/drawable-mdpi/ic_menu_rotate_right_dark.png b/RTEditor/src/main/res/drawable-mdpi/ic_menu_rotate_right_dark.png
deleted file mode 100644
index c29cb875..00000000
Binary files a/RTEditor/src/main/res/drawable-mdpi/ic_menu_rotate_right_dark.png and /dev/null differ
diff --git a/RTEditor/src/main/res/drawable-mdpi/ic_menu_rotate_right_light.png b/RTEditor/src/main/res/drawable-mdpi/ic_menu_rotate_right_light.png
deleted file mode 100644
index d6c9dbef..00000000
Binary files a/RTEditor/src/main/res/drawable-mdpi/ic_menu_rotate_right_light.png and /dev/null differ
diff --git a/RTEditor/src/main/res/drawable-mdpi/ic_menu_save_dark.png b/RTEditor/src/main/res/drawable-mdpi/ic_menu_save_dark.png
deleted file mode 100644
index 8a73823a..00000000
Binary files a/RTEditor/src/main/res/drawable-mdpi/ic_menu_save_dark.png and /dev/null differ
diff --git a/RTEditor/src/main/res/drawable-mdpi/ic_menu_save_light.png b/RTEditor/src/main/res/drawable-mdpi/ic_menu_save_light.png
deleted file mode 100644
index 449d4a87..00000000
Binary files a/RTEditor/src/main/res/drawable-mdpi/ic_menu_save_light.png and /dev/null differ
diff --git a/RTEditor/src/main/res/drawable-xhdpi/ic_menu_close_clear_cancel_dark.png b/RTEditor/src/main/res/drawable-xhdpi/ic_menu_close_clear_cancel_dark.png
deleted file mode 100644
index 1021f1d5..00000000
Binary files a/RTEditor/src/main/res/drawable-xhdpi/ic_menu_close_clear_cancel_dark.png and /dev/null differ
diff --git a/RTEditor/src/main/res/drawable-xhdpi/ic_menu_close_clear_cancel_light.png b/RTEditor/src/main/res/drawable-xhdpi/ic_menu_close_clear_cancel_light.png
deleted file mode 100644
index f4396faf..00000000
Binary files a/RTEditor/src/main/res/drawable-xhdpi/ic_menu_close_clear_cancel_light.png and /dev/null differ
diff --git a/RTEditor/src/main/res/drawable-xhdpi/ic_menu_rotate_left_dark.png b/RTEditor/src/main/res/drawable-xhdpi/ic_menu_rotate_left_dark.png
deleted file mode 100644
index 0e6fcef1..00000000
Binary files a/RTEditor/src/main/res/drawable-xhdpi/ic_menu_rotate_left_dark.png and /dev/null differ
diff --git a/RTEditor/src/main/res/drawable-xhdpi/ic_menu_rotate_left_light.png b/RTEditor/src/main/res/drawable-xhdpi/ic_menu_rotate_left_light.png
deleted file mode 100644
index 2bf0a0cb..00000000
Binary files a/RTEditor/src/main/res/drawable-xhdpi/ic_menu_rotate_left_light.png and /dev/null differ
diff --git a/RTEditor/src/main/res/drawable-xhdpi/ic_menu_rotate_right_dark.png b/RTEditor/src/main/res/drawable-xhdpi/ic_menu_rotate_right_dark.png
deleted file mode 100644
index 28a9d08d..00000000
Binary files a/RTEditor/src/main/res/drawable-xhdpi/ic_menu_rotate_right_dark.png and /dev/null differ
diff --git a/RTEditor/src/main/res/drawable-xhdpi/ic_menu_rotate_right_light.png b/RTEditor/src/main/res/drawable-xhdpi/ic_menu_rotate_right_light.png
deleted file mode 100644
index 2be221ee..00000000
Binary files a/RTEditor/src/main/res/drawable-xhdpi/ic_menu_rotate_right_light.png and /dev/null differ
diff --git a/RTEditor/src/main/res/drawable-xhdpi/ic_menu_save_dark.png b/RTEditor/src/main/res/drawable-xhdpi/ic_menu_save_dark.png
deleted file mode 100644
index 32ad729d..00000000
Binary files a/RTEditor/src/main/res/drawable-xhdpi/ic_menu_save_dark.png and /dev/null differ
diff --git a/RTEditor/src/main/res/drawable-xhdpi/ic_menu_save_light.png b/RTEditor/src/main/res/drawable-xhdpi/ic_menu_save_light.png
deleted file mode 100644
index 641c332f..00000000
Binary files a/RTEditor/src/main/res/drawable-xhdpi/ic_menu_save_light.png and /dev/null differ
diff --git a/RTEditor/src/main/res/drawable-xxhdpi/ic_menu_close_clear_cancel_dark.png b/RTEditor/src/main/res/drawable-xxhdpi/ic_menu_close_clear_cancel_dark.png
deleted file mode 100644
index fe63c3a5..00000000
Binary files a/RTEditor/src/main/res/drawable-xxhdpi/ic_menu_close_clear_cancel_dark.png and /dev/null differ
diff --git a/RTEditor/src/main/res/drawable-xxhdpi/ic_menu_close_clear_cancel_light.png b/RTEditor/src/main/res/drawable-xxhdpi/ic_menu_close_clear_cancel_light.png
deleted file mode 100644
index 28095336..00000000
Binary files a/RTEditor/src/main/res/drawable-xxhdpi/ic_menu_close_clear_cancel_light.png and /dev/null differ
diff --git a/RTEditor/src/main/res/drawable-xxhdpi/ic_menu_rotate_left_dark.png b/RTEditor/src/main/res/drawable-xxhdpi/ic_menu_rotate_left_dark.png
deleted file mode 100644
index c1d4bfcc..00000000
Binary files a/RTEditor/src/main/res/drawable-xxhdpi/ic_menu_rotate_left_dark.png and /dev/null differ
diff --git a/RTEditor/src/main/res/drawable-xxhdpi/ic_menu_rotate_left_light.png b/RTEditor/src/main/res/drawable-xxhdpi/ic_menu_rotate_left_light.png
deleted file mode 100644
index 5e9748d7..00000000
Binary files a/RTEditor/src/main/res/drawable-xxhdpi/ic_menu_rotate_left_light.png and /dev/null differ
diff --git a/RTEditor/src/main/res/drawable-xxhdpi/ic_menu_rotate_right_dark.png b/RTEditor/src/main/res/drawable-xxhdpi/ic_menu_rotate_right_dark.png
deleted file mode 100644
index 837489ae..00000000
Binary files a/RTEditor/src/main/res/drawable-xxhdpi/ic_menu_rotate_right_dark.png and /dev/null differ
diff --git a/RTEditor/src/main/res/drawable-xxhdpi/ic_menu_rotate_right_light.png b/RTEditor/src/main/res/drawable-xxhdpi/ic_menu_rotate_right_light.png
deleted file mode 100644
index 41fb7a8d..00000000
Binary files a/RTEditor/src/main/res/drawable-xxhdpi/ic_menu_rotate_right_light.png and /dev/null differ
diff --git a/RTEditor/src/main/res/drawable-xxhdpi/ic_menu_save_dark.png b/RTEditor/src/main/res/drawable-xxhdpi/ic_menu_save_dark.png
deleted file mode 100644
index e31def92..00000000
Binary files a/RTEditor/src/main/res/drawable-xxhdpi/ic_menu_save_dark.png and /dev/null differ
diff --git a/RTEditor/src/main/res/drawable-xxhdpi/ic_menu_save_light.png b/RTEditor/src/main/res/drawable-xxhdpi/ic_menu_save_light.png
deleted file mode 100644
index b2e63940..00000000
Binary files a/RTEditor/src/main/res/drawable-xxhdpi/ic_menu_save_light.png and /dev/null differ
diff --git a/RTEditor/src/main/res/drawable/camera_crop_height.png b/RTEditor/src/main/res/drawable/camera_crop_height.png
deleted file mode 100644
index 956f4071..00000000
Binary files a/RTEditor/src/main/res/drawable/camera_crop_height.png and /dev/null differ
diff --git a/RTEditor/src/main/res/drawable/camera_crop_height.xml b/RTEditor/src/main/res/drawable/camera_crop_height.xml
new file mode 100644
index 00000000..ab7827cd
--- /dev/null
+++ b/RTEditor/src/main/res/drawable/camera_crop_height.xml
@@ -0,0 +1,31 @@
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportHeight="24.0"
+        android:viewportWidth="24.0">
+    <path
+        android:pathData="M 12,2 C 6.48,2 2,6.48 2,12 2,17.52 6.48,22 12,22 17.52,22 22,17.52 22,12 22,6.48 17.52,2 12,2 Z"
+        android:strokeColor="#FF000000"
+        android:strokeWidth="1"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M 12 5.5 L 8.5 9 L 11 9 L 11 11 L 11 13 L 11 15 L 8.5 15 L 12 18.5 L 15.5 15 L 13 15 L 13 13 L 13 11 L 13 9 L 15.5 9 L 12 5.5 z "/>
+</vector>
diff --git a/RTEditor/src/main/res/drawable/camera_crop_width.png b/RTEditor/src/main/res/drawable/camera_crop_width.png
deleted file mode 100644
index 528345f9..00000000
Binary files a/RTEditor/src/main/res/drawable/camera_crop_width.png and /dev/null differ
diff --git a/RTEditor/src/main/res/drawable/camera_crop_width.xml b/RTEditor/src/main/res/drawable/camera_crop_width.xml
new file mode 100644
index 00000000..88d6c1c1
--- /dev/null
+++ b/RTEditor/src/main/res/drawable/camera_crop_width.xml
@@ -0,0 +1,31 @@
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportHeight="24.0"
+        android:viewportWidth="24.0">
+    <path
+        android:pathData="M 12,2 C 6.48,2 2,6.48 2,12 2,17.52 6.48,22 12,22 17.52,22 22,17.52 22,12 22,6.48 17.52,2 12,2 Z"
+        android:strokeColor="#FF000000"
+        android:strokeWidth="1"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M 18.5,12 15,8.5 15,11 13,11 11,11 9,11 9,8.5 5.5,12 9,15.5 9,13 l 2,0 2,0 2,0 0,2.5 3.5,-3.5 z"/>
+</vector>
diff --git a/RTEditor/src/main/res/drawable/ic_menu_close_clear_cancel_dark.xml b/RTEditor/src/main/res/drawable/ic_menu_close_clear_cancel_dark.xml
new file mode 100644
index 00000000..04abce2f
--- /dev/null
+++ b/RTEditor/src/main/res/drawable/ic_menu_close_clear_cancel_dark.xml
@@ -0,0 +1,27 @@
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
+</vector>
diff --git a/RTEditor/src/main/res/drawable/ic_menu_close_clear_cancel_light.xml b/RTEditor/src/main/res/drawable/ic_menu_close_clear_cancel_light.xml
new file mode 100644
index 00000000..e54621b6
--- /dev/null
+++ b/RTEditor/src/main/res/drawable/ic_menu_close_clear_cancel_light.xml
@@ -0,0 +1,27 @@
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#000000"
+        android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
+</vector>
diff --git a/RTEditor/src/main/res/drawable/ic_menu_rotate_left_dark.xml b/RTEditor/src/main/res/drawable/ic_menu_rotate_left_dark.xml
new file mode 100644
index 00000000..7d7906db
--- /dev/null
+++ b/RTEditor/src/main/res/drawable/ic_menu_rotate_left_dark.xml
@@ -0,0 +1,27 @@
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportHeight="24.0"
+        android:viewportWidth="24.0">
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M7.11,8.53L5.7,7.11C4.8,8.27 4.24,9.61 4.07,11h2.02c0.14,-0.87 0.49,-1.72 1.02,-2.47zM6.09,13L4.07,13c0.17,1.39 0.72,2.73 1.62,3.89l1.41,-1.42c-0.52,-0.75 -0.87,-1.59 -1.01,-2.47zM7.1,18.32c1.16,0.9 2.51,1.44 3.9,1.61L11,17.9c-0.87,-0.15 -1.71,-0.49 -2.46,-1.03L7.1,18.32zM13,4.07L13,1L8.45,5.55 13,10L13,6.09c2.84,0.48 5,2.94 5,5.91s-2.16,5.43 -5,5.91v2.02c3.95,-0.49 7,-3.85 7,-7.93s-3.05,-7.44 -7,-7.93z"/>
+</vector>
diff --git a/RTEditor/src/main/res/drawable/ic_menu_rotate_left_light.xml b/RTEditor/src/main/res/drawable/ic_menu_rotate_left_light.xml
new file mode 100644
index 00000000..a0687183
--- /dev/null
+++ b/RTEditor/src/main/res/drawable/ic_menu_rotate_left_light.xml
@@ -0,0 +1,27 @@
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M7.11,8.53L5.7,7.11C4.8,8.27 4.24,9.61 4.07,11h2.02c0.14,-0.87 0.49,-1.72 1.02,-2.47zM6.09,13L4.07,13c0.17,1.39 0.72,2.73 1.62,3.89l1.41,-1.42c-0.52,-0.75 -0.87,-1.59 -1.01,-2.47zM7.1,18.32c1.16,0.9 2.51,1.44 3.9,1.61L11,17.9c-0.87,-0.15 -1.71,-0.49 -2.46,-1.03L7.1,18.32zM13,4.07L13,1L8.45,5.55 13,10L13,6.09c2.84,0.48 5,2.94 5,5.91s-2.16,5.43 -5,5.91v2.02c3.95,-0.49 7,-3.85 7,-7.93s-3.05,-7.44 -7,-7.93z"/>
+</vector>
diff --git a/RTEditor/src/main/res/drawable/ic_menu_rotate_right_dark.xml b/RTEditor/src/main/res/drawable/ic_menu_rotate_right_dark.xml
new file mode 100644
index 00000000..97cf2310
--- /dev/null
+++ b/RTEditor/src/main/res/drawable/ic_menu_rotate_right_dark.xml
@@ -0,0 +1,27 @@
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M7.11,8.53L5.7,7.11C4.8,8.27 4.24,9.61 4.07,11h2.02c0.14,-0.87 0.49,-1.72 1.02,-2.47zM6.09,13L4.07,13c0.17,1.39 0.72,2.73 1.62,3.89l1.41,-1.42c-0.52,-0.75 -0.87,-1.59 -1.01,-2.47zM7.1,18.32c1.16,0.9 2.51,1.44 3.9,1.61L11,17.9c-0.87,-0.15 -1.71,-0.49 -2.46,-1.03L7.1,18.32zM13,4.07L13,1L8.45,5.55 13,10L13,6.09c2.84,0.48 5,2.94 5,5.91s-2.16,5.43 -5,5.91v2.02c3.95,-0.49 7,-3.85 7,-7.93s-3.05,-7.44 -7,-7.93z"/>
+</vector>
diff --git a/RTEditor/src/main/res/drawable/ic_menu_rotate_right_light.xml b/RTEditor/src/main/res/drawable/ic_menu_rotate_right_light.xml
new file mode 100644
index 00000000..a0687183
--- /dev/null
+++ b/RTEditor/src/main/res/drawable/ic_menu_rotate_right_light.xml
@@ -0,0 +1,27 @@
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M7.11,8.53L5.7,7.11C4.8,8.27 4.24,9.61 4.07,11h2.02c0.14,-0.87 0.49,-1.72 1.02,-2.47zM6.09,13L4.07,13c0.17,1.39 0.72,2.73 1.62,3.89l1.41,-1.42c-0.52,-0.75 -0.87,-1.59 -1.01,-2.47zM7.1,18.32c1.16,0.9 2.51,1.44 3.9,1.61L11,17.9c-0.87,-0.15 -1.71,-0.49 -2.46,-1.03L7.1,18.32zM13,4.07L13,1L8.45,5.55 13,10L13,6.09c2.84,0.48 5,2.94 5,5.91s-2.16,5.43 -5,5.91v2.02c3.95,-0.49 7,-3.85 7,-7.93s-3.05,-7.44 -7,-7.93z"/>
+</vector>
diff --git a/RTEditor/src/main/res/drawable/ic_menu_save_dark.xml b/RTEditor/src/main/res/drawable/ic_menu_save_dark.xml
new file mode 100644
index 00000000..5b17b794
--- /dev/null
+++ b/RTEditor/src/main/res/drawable/ic_menu_save_dark.xml
@@ -0,0 +1,27 @@
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M17,3L5,3c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,7l-4,-4zM12,19c-1.66,0 -3,-1.34 -3,-3s1.34,-3 3,-3 3,1.34 3,3 -1.34,3 -3,3zM15,9L5,9L5,5h10v4z"/>
+</vector>
diff --git a/RTEditor/src/main/res/drawable/ic_menu_save_light.xml b/RTEditor/src/main/res/drawable/ic_menu_save_light.xml
new file mode 100644
index 00000000..e9941c7e
--- /dev/null
+++ b/RTEditor/src/main/res/drawable/ic_menu_save_light.xml
@@ -0,0 +1,27 @@
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M17,3L5,3c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,7l-4,-4zM12,19c-1.66,0 -3,-1.34 -3,-3s1.34,-3 3,-3 3,1.34 3,3 -1.34,3 -3,3zM15,9L5,9L5,5h10v4z"/>
+</vector>
diff --git a/RTEditor/src/main/res/drawable/indicator_autocrop.png b/RTEditor/src/main/res/drawable/indicator_autocrop.png
deleted file mode 100644
index a8a2c1ed..00000000
Binary files a/RTEditor/src/main/res/drawable/indicator_autocrop.png and /dev/null differ
diff --git a/RTEditor/src/main/res/drawable/indicator_autocrop.xml b/RTEditor/src/main/res/drawable/indicator_autocrop.xml
new file mode 100644
index 00000000..a9b100fc
--- /dev/null
+++ b/RTEditor/src/main/res/drawable/indicator_autocrop.xml
@@ -0,0 +1,27 @@
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#E72DAD"
+        android:pathData="M17,15h2V7c0,-1.1 -0.9,-2 -2,-2H9v2h8v8zM7,17V1H5v4H1v2h4v10c0,1.1 0.9,2 2,2h10v4h2v-4h4v-2H7z"/>
+</vector>
diff --git a/RTEditor/src/main/res/drawable/shape_disabled.xml b/RTEditor/src/main/res/drawable/shape_disabled.xml
new file mode 100644
index 00000000..ebc6b25d
--- /dev/null
+++ b/RTEditor/src/main/res/drawable/shape_disabled.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="1dp"/>
+
+    <stroke
+        android:width="1dp"
+        android:color="#FFFFFF"/>
+</shape>
\ No newline at end of file
diff --git a/RTEditor/src/main/res/drawable/shape_enabled.xml b/RTEditor/src/main/res/drawable/shape_enabled.xml
new file mode 100644
index 00000000..da12f4ad
--- /dev/null
+++ b/RTEditor/src/main/res/drawable/shape_enabled.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="1dp"/>
+
+    <stroke
+        android:width="1dp"
+        android:color="#9c9c9c"/>
+</shape>
\ No newline at end of file
diff --git a/RTEditor/src/main/res/layout/rte_barcode.xml b/RTEditor/src/main/res/layout/rte_barcode.xml
deleted file mode 100644
index 4992027f..00000000
--- a/RTEditor/src/main/res/layout/rte_barcode.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_gravity="center"
-    android:orientation="vertical"
-    android:paddingBottom="@dimen/dialog_margin_top_bottom"
-    android:paddingLeft="@dimen/dialog_margin_left_right"
-    android:paddingRight="@dimen/dialog_margin_left_right"
-    android:paddingTop="@dimen/dialog_margin_top_bottom">
-
-    <EditText
-        android:id="@+id/barcodeData"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:hint="@string/rte_barcode_enter_text"
-        android:inputType="text"/>
-
-    <EditText
-        android:id="@+id/barcodeWidth"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:hint="@string/rte_barcode_enter_width"
-        android:inputType="number"/>
-
-    <ProgressBar
-        android:id="@+id/progressBar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:visibility="gone"/>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/RTEditor/src/main/res/layout/rte_barcode_body.xml b/RTEditor/src/main/res/layout/rte_barcode_body.xml
new file mode 100644
index 00000000..07c95a10
--- /dev/null
+++ b/RTEditor/src/main/res/layout/rte_barcode_body.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:gravity="center"
+    android:orientation="vertical"
+    android:paddingBottom="@dimen/dialog_margin_top_bottom"
+    android:paddingLeft="@dimen/dialog_margin_left_right"
+    android:paddingRight="@dimen/dialog_margin_left_right"
+    android:paddingTop="@dimen/dialog_margin_top_bottom">
+
+    <EditText
+        android:id="@+id/barcodeData"
+        android:layout_width="match_parent"
+        android:layout_height="150dp"
+        android:background="@drawable/shape_enabled"
+        android:gravity="top"
+        android:hint="@string/rte_barcode_enter_text"
+        android:padding="4dp"/>
+
+    <EditText
+        android:id="@+id/barcodeWidth"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:hint="@string/rte_barcode_enter_width"
+        android:inputType="number"/>
+
+
+</LinearLayout>
\ No newline at end of file
diff --git a/RTEditor/src/main/res/layout/rte_barcode_header.xml b/RTEditor/src/main/res/layout/rte_barcode_header.xml
new file mode 100644
index 00000000..67adf374
--- /dev/null
+++ b/RTEditor/src/main/res/layout/rte_barcode_header.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:orientation="vertical"
+              android:paddingLeft="@dimen/dialog_margin_left_right"
+              android:paddingRight="@dimen/dialog_margin_left_right"
+              android:paddingTop="@dimen/dialog_margin_top_bottom">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
+        <TextView
+            android:id="@+id/textView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="@string/rte_create_barcode"
+            android:textColor="@android:color/black"
+            android:textSize="20sp"/>
+
+        <ProgressBar
+            android:id="@+id/progressBar"
+            style="?android:attr/progressBarStyleSmallTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_weight="1"
+            android:max="100"
+            android:visibility="gone"/>
+
+    </LinearLayout>
+
+    <TextView
+        android:id="@+id/barcodeError"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:textColor="@android:color/holo_red_dark"/>
+
+
+</LinearLayout>
\ No newline at end of file
diff --git a/RTEditor/src/main/res/layout/rte_crop_image.xml b/RTEditor/src/main/res/layout/rte_crop_image.xml
index a6d46bf3..b80555b8 100644
--- a/RTEditor/src/main/res/layout/rte_crop_image.xml
+++ b/RTEditor/src/main/res/layout/rte_crop_image.xml
@@ -1,17 +1,19 @@
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/RTEditor/src/main/res/layout/rte_link.xml b/RTEditor/src/main/res/layout/rte_link.xml
index 7116f1cd..d51330a0 100644
--- a/RTEditor/src/main/res/layout/rte_link.xml
+++ b/RTEditor/src/main/res/layout/rte_link.xml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <LinearLayout
diff --git a/RTEditor/src/main/res/menu/rte_crop_image.xml b/RTEditor/src/main/res/menu/rte_crop_image.xml
index 848ec3b5..0582aba1 100644
--- a/RTEditor/src/main/res/menu/rte_crop_image.xml
+++ b/RTEditor/src/main/res/menu/rte_crop_image.xml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/RTEditor/src/main/res/values-ca/rte_strings.xml b/RTEditor/src/main/res/values-ca/rte_strings.xml
index 2fc52aa5..ece8e54c 100644
--- a/RTEditor/src/main/res/values-ca/rte_strings.xml
+++ b/RTEditor/src/main/res/values-ca/rte_strings.xml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
diff --git a/RTEditor/src/main/res/values-da/rte_strings.xml b/RTEditor/src/main/res/values-da/rte_strings.xml
index f75bcb18..2b25ccee 100644
--- a/RTEditor/src/main/res/values-da/rte_strings.xml
+++ b/RTEditor/src/main/res/values-da/rte_strings.xml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
diff --git a/RTEditor/src/main/res/values-de/rte_strings.xml b/RTEditor/src/main/res/values-de/rte_strings.xml
index 019ad27e..cd97e708 100644
--- a/RTEditor/src/main/res/values-de/rte_strings.xml
+++ b/RTEditor/src/main/res/values-de/rte_strings.xml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
diff --git a/RTEditor/src/main/res/values-es/rte_strings.xml b/RTEditor/src/main/res/values-es/rte_strings.xml
index bbf42048..6e694201 100644
--- a/RTEditor/src/main/res/values-es/rte_strings.xml
+++ b/RTEditor/src/main/res/values-es/rte_strings.xml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
diff --git a/RTEditor/src/main/res/values-fa/rte_strings.xml b/RTEditor/src/main/res/values-fa/rte_strings.xml
index e2b00c36..3332cf34 100644
--- a/RTEditor/src/main/res/values-fa/rte_strings.xml
+++ b/RTEditor/src/main/res/values-fa/rte_strings.xml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
diff --git a/RTEditor/src/main/res/values-fr/rte_strings.xml b/RTEditor/src/main/res/values-fr/rte_strings.xml
index c82954bb..8893c2dc 100644
--- a/RTEditor/src/main/res/values-fr/rte_strings.xml
+++ b/RTEditor/src/main/res/values-fr/rte_strings.xml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
diff --git a/RTEditor/src/main/res/values-hu/rte_strings.xml b/RTEditor/src/main/res/values-hu/rte_strings.xml
index 91ed832f..fb3da716 100644
--- a/RTEditor/src/main/res/values-hu/rte_strings.xml
+++ b/RTEditor/src/main/res/values-hu/rte_strings.xml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
diff --git a/RTEditor/src/main/res/values-it/rte_strings.xml b/RTEditor/src/main/res/values-it/rte_strings.xml
index c790b4b6..6ac9cbdc 100644
--- a/RTEditor/src/main/res/values-it/rte_strings.xml
+++ b/RTEditor/src/main/res/values-it/rte_strings.xml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
diff --git a/RTEditor/src/main/res/values-ja/rte_strings.xml b/RTEditor/src/main/res/values-ja/rte_strings.xml
index 3cd947e3..43071681 100644
--- a/RTEditor/src/main/res/values-ja/rte_strings.xml
+++ b/RTEditor/src/main/res/values-ja/rte_strings.xml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
diff --git a/RTEditor/src/main/res/values-ko/rte_strings.xml b/RTEditor/src/main/res/values-ko/rte_strings.xml
index c7ae5420..8b4cecbf 100644
--- a/RTEditor/src/main/res/values-ko/rte_strings.xml
+++ b/RTEditor/src/main/res/values-ko/rte_strings.xml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
diff --git a/RTEditor/src/main/res/values-lv/rte_strings.xml b/RTEditor/src/main/res/values-lv/rte_strings.xml
index 5df4825d..817498f8 100644
--- a/RTEditor/src/main/res/values-lv/rte_strings.xml
+++ b/RTEditor/src/main/res/values-lv/rte_strings.xml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
diff --git a/RTEditor/src/main/res/values-nl/rte_strings.xml b/RTEditor/src/main/res/values-nl/rte_strings.xml
index d311236b..4e26b00b 100644
--- a/RTEditor/src/main/res/values-nl/rte_strings.xml
+++ b/RTEditor/src/main/res/values-nl/rte_strings.xml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
diff --git a/RTEditor/src/main/res/values-pl/rte_strings.xml b/RTEditor/src/main/res/values-pl/rte_strings.xml
index 1c26af55..2f01fec3 100644
--- a/RTEditor/src/main/res/values-pl/rte_strings.xml
+++ b/RTEditor/src/main/res/values-pl/rte_strings.xml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
diff --git a/RTEditor/src/main/res/values-pt-rBR/rte_strings.xml b/RTEditor/src/main/res/values-pt-rBR/rte_strings.xml
index 34d8bf6d..200cbb15 100644
--- a/RTEditor/src/main/res/values-pt-rBR/rte_strings.xml
+++ b/RTEditor/src/main/res/values-pt-rBR/rte_strings.xml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
diff --git a/RTEditor/src/main/res/values-ru/rte_strings.xml b/RTEditor/src/main/res/values-ru/rte_strings.xml
index 0fcc192b..be1cadb8 100644
--- a/RTEditor/src/main/res/values-ru/rte_strings.xml
+++ b/RTEditor/src/main/res/values-ru/rte_strings.xml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
diff --git a/RTEditor/src/main/res/values-sv/rte_strings.xml b/RTEditor/src/main/res/values-sv/rte_strings.xml
index 2517c41b..a7784903 100644
--- a/RTEditor/src/main/res/values-sv/rte_strings.xml
+++ b/RTEditor/src/main/res/values-sv/rte_strings.xml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
diff --git a/RTEditor/src/main/res/values-tr/rte_strings.xml b/RTEditor/src/main/res/values-tr/rte_strings.xml
index 662196fd..6cc0e4d2 100644
--- a/RTEditor/src/main/res/values-tr/rte_strings.xml
+++ b/RTEditor/src/main/res/values-tr/rte_strings.xml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
diff --git a/RTEditor/src/main/res/values-zh-rCN/rte_strings.xml b/RTEditor/src/main/res/values-zh-rCN/rte_strings.xml
index f19b5b06..db27203d 100644
--- a/RTEditor/src/main/res/values-zh-rCN/rte_strings.xml
+++ b/RTEditor/src/main/res/values-zh-rCN/rte_strings.xml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
diff --git a/RTEditor/src/main/res/values-zh-rTW/rte_strings.xml b/RTEditor/src/main/res/values-zh-rTW/rte_strings.xml
index 2294f324..c189580e 100644
--- a/RTEditor/src/main/res/values-zh-rTW/rte_strings.xml
+++ b/RTEditor/src/main/res/values-zh-rTW/rte_strings.xml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
diff --git a/RTEditor/src/main/res/values/rte_attrs.xml b/RTEditor/src/main/res/values/rte_attrs.xml
index b4c6d0cb..b8e45cab 100644
--- a/RTEditor/src/main/res/values/rte_attrs.xml
+++ b/RTEditor/src/main/res/values/rte_attrs.xml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <resources>
diff --git a/RTEditor/src/main/res/values/rte_dimens.xml b/RTEditor/src/main/res/values/rte_dimens.xml
index 33906330..9659fda7 100644
--- a/RTEditor/src/main/res/values/rte_dimens.xml
+++ b/RTEditor/src/main/res/values/rte_dimens.xml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <resources>
diff --git a/RTEditor/src/main/res/values/rte_strings.xml b/RTEditor/src/main/res/values/rte_strings.xml
index eba7bc6a..7a7d8991 100644
--- a/RTEditor/src/main/res/values/rte_strings.xml
+++ b/RTEditor/src/main/res/values/rte_strings.xml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
@@ -34,6 +36,7 @@
     
     <!-- Media Library -->
     <string name="rte_pick_image">Select an image</string>
+    <string name="rte_pick_gif">Select a gif</string>
     <string name="rte_pick_audio">Select an audio file</string>
     <string name="rte_pick_video">Select a video</string>
     <string name="rte_processing_image">Processing image\u2026</string>
diff --git a/RTEditor/src/main/res/values/rte_themes.xml b/RTEditor/src/main/res/values/rte_themes.xml
index 3d981c98..b6edf64c 100644
--- a/RTEditor/src/main/res/values/rte_themes.xml
+++ b/RTEditor/src/main/res/values/rte_themes.xml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2016 Emanuel Moecklin
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
+  ~
+  ~   Copyright (C) 2015-2016 Emanuel Moecklin
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
   -->
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
diff --git a/build.gradle b/build.gradle
index 09c6e378..cd1bf829 100644
--- a/build.gradle
+++ b/build.gradle
@@ -19,7 +19,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.0'
+        classpath 'com.android.tools.build:gradle:2.2.2'
     }
 }