Merge pull request #224 from wordpress-mobile/issue/update-app

0nko · web-flow · commit da3dee440803 · 2017-02-05T12:22:47.000+01:00
Issue/update app
diff --git a/app/src/main/res/drawable-hdpi/ic_action_redo.png b/app/src/main/res/drawable-hdpi/ic_action_redo.png
diff --git a/app/src/main/res/drawable-hdpi/ic_action_undo.png b/app/src/main/res/drawable-hdpi/ic_action_undo.png
diff --git a/app/src/main/res/drawable-mdpi/ic_action_redo.png b/app/src/main/res/drawable-mdpi/ic_action_redo.png
diff --git a/app/src/main/res/drawable-mdpi/ic_action_undo.png b/app/src/main/res/drawable-mdpi/ic_action_undo.png
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_redo.png b/app/src/main/res/drawable-xhdpi/ic_action_redo.png
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_undo.png b/app/src/main/res/drawable-xhdpi/ic_action_undo.png
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_redo.png b/app/src/main/res/drawable-xxhdpi/ic_action_redo.png
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_undo.png b/app/src/main/res/drawable-xxhdpi/ic_action_undo.png
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_action_redo.png b/app/src/main/res/drawable-xxxhdpi/ic_action_redo.png
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_action_undo.png b/app/src/main/res/drawable-xxxhdpi/ic_action_undo.png
diff --git a/app/src/main/res/drawable/ic_action_redo_white_24dp.xml b/app/src/main/res/drawable/ic_action_redo_white_24dp.xml
@@ -0,0 +1,13 @@
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0" >
+
+    <path
+        android:fillColor="#ffffffff"
+        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" >
+    </path>
+
+</vector>
diff --git a/app/src/main/res/drawable/ic_action_undo_white_24dp.xml b/app/src/main/res/drawable/ic_action_undo_white_24dp.xml
@@ -0,0 +1,13 @@
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0" >
+
+    <path
+        android:fillColor="#ffffffff"
+        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" >
+    </path>
+
+</vector>
diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml
@@ -7,15 +7,15 @@
 
     <item
         android:id="@+id/undo"
-        android:icon="@drawable/ic_action_undo"
+        android:icon="@drawable/ic_action_undo_white_24dp"
         android:title="@string/menu_undo"
         app:showAsAction="always"
         tools:ignore="AlwaysShowAction" >
     </item>
 
     <item
         android:id="@+id/redo"
-        android:icon="@drawable/ic_action_redo"
+        android:icon="@drawable/ic_action_redo_white_24dp"
         android:title="@string/menu_redo"
         app:showAsAction="always"
         tools:ignore="AlwaysShowAction" >
diff --git a/aztec/src/main/res/drawable/format_bar_button_bold.xml b/aztec/src/main/res/drawable/format_bar_button_bold.xml
@@ -7,9 +7,9 @@
     android:viewportHeight="44"
     android:viewportWidth="44" >
 
-    <!-- @color/grey -->
+    <!-- @color/grey_darken_20 -->
     <path
-        android:fillColor="#ff87a6bc"
+        android:fillColor="#ff4f748e"
         android:pathData="M17,15.009h4.547c2.126,0,3.671,0.303,4.632,0.907c0.962,0.605,1.442,1.567,1.442,2.887 c0,0.896-0.211,1.63-0.631,2.205c-0.421,0.574-0.98,0.919-1.678,1.036v0.103c0.951,0.212,1.637,0.608,2.057,1.189 C27.79,23.916,28,24.688,28,25.652c0,1.367-0.494,2.434-1.482,3.199C25.529,29.617,24.186,30,22.491,30H17V15.009z M20,20.946 h2.027c0.862,0,1.486-0.133,1.872-0.4c0.387-0.267,0.579-0.708,0.579-1.323c0-0.574-0.21-0.986-0.63-1.236 c-0.421-0.249-1.087-0.374-1.996-0.374H20V20.946z M20,23.469v3.906h2.253c0.876,0,1.521-0.167,1.939-0.502 s0.626-0.848,0.626-1.539c0-1.244-0.889-1.865-2.668-1.865H20z" >
     </path>
 
diff --git a/aztec/src/main/res/drawable/format_bar_button_bold_disabled.xml b/aztec/src/main/res/drawable/format_bar_button_bold_disabled.xml
@@ -7,9 +7,9 @@
     android:viewportHeight="44"
     android:viewportWidth="44" >
 
-    <!-- @color/grey_lighten_30 -->
+    <!-- @color/grey_lighten_20 -->
     <path
-        android:fillColor="#ffa8bece"
+        android:fillColor="#ffc8d7e1"
         android:pathData="M17,15.009h4.547c2.126,0,3.671,0.303,4.632,0.907c0.962,0.605,1.442,1.567,1.442,2.887 c0,0.896-0.211,1.63-0.631,2.205c-0.421,0.574-0.98,0.919-1.678,1.036v0.103c0.951,0.212,1.637,0.608,2.057,1.189 C27.79,23.916,28,24.688,28,25.652c0,1.367-0.494,2.434-1.482,3.199C25.529,29.617,24.186,30,22.491,30H17V15.009z M20,20.946 h2.027c0.862,0,1.486-0.133,1.872-0.4c0.387-0.267,0.579-0.708,0.579-1.323c0-0.574-0.21-0.986-0.63-1.236 c-0.421-0.249-1.087-0.374-1.996-0.374H20V20.946z M20,23.469v3.906h2.253c0.876,0,1.521-0.167,1.939-0.502 s0.626-0.848,0.626-1.539c0-1.244-0.889-1.865-2.668-1.865H20z" >
     </path>
 
diff --git a/aztec/src/main/res/drawable/format_bar_button_header.xml b/aztec/src/main/res/drawable/format_bar_button_header.xml
@@ -7,9 +7,9 @@
     android:viewportHeight="44"
     android:viewportWidth="44" >
 
-    <!-- @color/grey -->
+    <!-- @color/grey_darken_20 -->
     <path
-        android:fillColor="#ff87a6bc"
+        android:fillColor="#ff4f748e"
         android:pathData="M12.5,14v3h5v12h3V17h5v-3H12.5z M31.5,19h-9v3h3v7h3v-7h3V19z" >
     </path>
 
diff --git a/aztec/src/main/res/drawable/format_bar_button_header_disabled.xml b/aztec/src/main/res/drawable/format_bar_button_header_disabled.xml
@@ -7,9 +7,9 @@
     android:viewportHeight="44"
     android:viewportWidth="44" >
 
-    <!-- @color/grey_lighten_30 -->
+    <!-- @color/grey_lighten_20 -->
     <path
-        android:fillColor="#ffa8bece"
+        android:fillColor="#ffc8d7e1"
         android:pathData="M12.5,14v3h5v12h3V17h5v-3H12.5z M31.5,19h-9v3h3v7h3v-7h3V19z" >
     </path>
 
diff --git a/aztec/src/main/res/drawable/format_bar_button_html.xml b/aztec/src/main/res/drawable/format_bar_button_html.xml
@@ -7,9 +7,9 @@
     android:viewportHeight="44"
     android:viewportWidth="44" >
 
-    <!-- @color/grey -->
+    <!-- @color/grey_darken_20 -->
     <path
-        android:fillColor="#ff87a6bc"
+        android:fillColor="#ff4f748e"
         android:pathData="M19.4,26.6L14.8,22l4.6-4.6L18,16l-6,6l6,6L19.4,26.6z M24.6,26.6l4.6-4.6l-4.6-4.6L26,16l6,6l-6,6C26,28,24.6,26.6,24.6,26.6z" >
     </path>
 
diff --git a/aztec/src/main/res/drawable/format_bar_button_html_disabled.xml b/aztec/src/main/res/drawable/format_bar_button_html_disabled.xml
@@ -7,9 +7,9 @@
     android:viewportHeight="44"
     android:viewportWidth="44" >
 
-    <!-- @color/grey_lighten_30 -->
+    <!-- @color/grey_lighten_20 -->
     <path
-        android:fillColor="#ffa8bece"
+        android:fillColor="#ffc8d7e1"
         android:pathData="M19.4,26.6L14.8,22l4.6-4.6L18,16l-6,6l6,6L19.4,26.6z M24.6,26.6l4.6-4.6l-4.6-4.6L26,16l6,6l-6,6C26,28,24.6,26.6,24.6,26.6z" >
     </path>
 
diff --git a/aztec/src/main/res/drawable/format_bar_button_italic.xml b/aztec/src/main/res/drawable/format_bar_button_italic.xml
@@ -7,8 +7,9 @@
     android:viewportHeight="44"
     android:viewportWidth="44" >
 
+    <!-- @color/grey_darken_20 -->
     <path
-        android:fillColor="#ff87a6bc"
+        android:fillColor="#ff4f748e"
         android:pathData="M 20.536 15 L 20.109 17 L 21.609 17 L 19.263 28 L 17.763 28 L 17.336 30 L 23.464 30 L 23.89 28 L 22.39 28 L 24.737 17 L 26.237 17 L 26.664 15 Z" >
     </path>
 
diff --git a/aztec/src/main/res/drawable/format_bar_button_italic_disabled.xml b/aztec/src/main/res/drawable/format_bar_button_italic_disabled.xml
@@ -7,9 +7,9 @@
     android:viewportHeight="44"
     android:viewportWidth="44" >
 
-    <!-- @color/grey_lighten_30 -->
+    <!-- @color/grey_lighten_20 -->
     <path
-        android:fillColor="#ffa8bece"
+        android:fillColor="#ffc8d7e1"
         android:pathData="M 20.536 15 L 20.109 17 L 21.609 17 L 19.263 28 L 17.763 28 L 17.336 30 L 23.464 30 L 23.89 28 L 22.39 28 L 24.737 17 L 26.237 17 L 26.664 15 Z" >
     </path>
 
diff --git a/aztec/src/main/res/drawable/format_bar_button_link.xml b/aztec/src/main/res/drawable/format_bar_button_link.xml
@@ -7,9 +7,9 @@
     android:viewportHeight="44"
     android:viewportWidth="44" >
 
-    <!-- @color/grey -->
+    <!-- @color/grey_darken_20 -->
     <path
-        android:fillColor="#ff87a6bc"
+        android:fillColor="#ff4f748e"
         android:pathData="M27,23H17v-2h10V23z M28,17h-1c-1.631,0-3.065,0.792-3.977,2H27h1c1.103,0,2,0.897,2,2v2 c0,1.103-0.897,2-2,2h-1h-3.977c0.913,1.208,2.347,2,3.977,2h1c2.209,0,4-1.791,4-4v-2C32,18.791,30.209,17,28,17z M12,21v2 c0,2.209,1.791,4,4,4h1c1.63,0,3.065-0.792,3.977-2H17h-1c-1.103,0-2-0.897-2-2v-2c0-1.103,0.897-2,2-2h1h3.977 c-0.913-1.208-2.347-2-3.977-2h-1C13.791,17,12,18.791,12,21z" >
     </path>
 
diff --git a/aztec/src/main/res/drawable/format_bar_button_link_disabled.xml b/aztec/src/main/res/drawable/format_bar_button_link_disabled.xml
@@ -7,9 +7,9 @@
     android:viewportHeight="44"
     android:viewportWidth="44" >
 
-    <!-- @color/grey_lighten_30 -->
+    <!-- @color/grey_lighten_20 -->
     <path
-        android:fillColor="#ffa8bece"
+        android:fillColor="#ffc8d7e1"
         android:pathData="M27,23H17v-2h10V23z M28,17h-1c-1.631,0-3.065,0.792-3.977,2H27h1c1.103,0,2,0.897,2,2v2 c0,1.103-0.897,2-2,2h-1h-3.977c0.913,1.208,2.347,2,3.977,2h1c2.209,0,4-1.791,4-4v-2C32,18.791,30.209,17,28,17z M12,21v2 c0,2.209,1.791,4,4,4h1c1.63,0,3.065-0.792,3.977-2H17h-1c-1.103,0-2-0.897-2-2v-2c0-1.103,0.897-2,2-2h1h3.977 c-0.913-1.208-2.347-2-3.977-2h-1C13.791,17,12,18.791,12,21z" >
     </path>
 
diff --git a/aztec/src/main/res/drawable/format_bar_button_media.xml b/aztec/src/main/res/drawable/format_bar_button_media.xml
@@ -7,9 +7,9 @@
     android:viewportHeight="44"
     android:viewportWidth="44" >
 
-    <!-- @color/grey -->
+    <!-- @color/grey_darken_20 -->
     <path
-        android:fillColor="#ff87a6bc"
+        android:fillColor="#ff4f748e"
         android:pathData="M33,14v2h-3v3h-2v-3h-3v-2h3v-3h2v3H33z M24.5,21c0.828,0,1.5-0.672,1.5-1.5S25.328,18,24.5,18 S23,18.672,23,19.5S23.672,21,24.5,21z M28,24.234l-0.513-0.57c-0.794-0.885-2.181-0.885-2.976,0l-0.656,0.731L19,19l-3,3.333V16h7 v-2h-7c-1.105,0-2,0.895-2,2v12c0,1.105,0.895,2,2,2h12c1.105,0,2-0.895,2-2v-7h-2V24.234z" >
     </path>
 
diff --git a/aztec/src/main/res/drawable/format_bar_button_media_disabled.xml b/aztec/src/main/res/drawable/format_bar_button_media_disabled.xml
@@ -7,9 +7,9 @@
     android:viewportHeight="44"
     android:viewportWidth="44" >
 
-    <!-- @color/grey_lighten_30 -->
+    <!-- @color/grey_lighten_20 -->
     <path
-        android:fillColor="#ffa8bece"
+        android:fillColor="#ffc8d7e1"
         android:pathData="M33,14v2h-3v3h-2v-3h-3v-2h3v-3h2v3H33z M24.5,21c0.828,0,1.5-0.672,1.5-1.5S25.328,18,24.5,18 S23,18.672,23,19.5S23.672,21,24.5,21z M28,24.234l-0.513-0.57c-0.794-0.885-2.181-0.885-2.976,0l-0.656,0.731L19,19l-3,3.333V16h7 v-2h-7c-1.105,0-2,0.895-2,2v12c0,1.105,0.895,2,2,2h12c1.105,0,2-0.895,2-2v-7h-2V24.234z" >
     </path>
 
diff --git a/aztec/src/main/res/drawable/format_bar_button_more.xml b/aztec/src/main/res/drawable/format_bar_button_more.xml
@@ -7,9 +7,9 @@
     android:viewportHeight="44"
     android:viewportWidth="44" >
 
-    <!-- @color/grey -->
+    <!-- @color/grey_darken_20 -->
     <path
-        android:fillColor="#ff87a6bc"
+        android:fillColor="#ff4f748e"
         android:pathData="M13,15h18v4H13V15z M13,29h18v-4H13V29z M19,23h6v-2h-6V23z M13,23h4v-2h-4V23z M27,23h4v-2h-4V23z" >
     </path>
 
diff --git a/aztec/src/main/res/drawable/format_bar_button_more_disabled.xml b/aztec/src/main/res/drawable/format_bar_button_more_disabled.xml
@@ -7,9 +7,9 @@
     android:viewportHeight="44"
     android:viewportWidth="44" >
 
-    <!-- @color/grey_lighten_30 -->
+    <!-- @color/grey_lighten_20 -->
     <path
-        android:fillColor="#ffa8bece"
+        android:fillColor="#ffc8d7e1"
         android:pathData="M13,15h18v4H13V15z M13,29h18v-4H13V29z M19,23h6v-2h-6V23z M13,23h4v-2h-4V23z M27,23h4v-2h-4V23z" >
     </path>
 
diff --git a/aztec/src/main/res/drawable/format_bar_button_ol.xml b/aztec/src/main/res/drawable/format_bar_button_ol.xml
@@ -7,9 +7,9 @@
     android:viewportHeight="44"
     android:viewportWidth="44" >
 
-    <!-- @color/grey -->
+    <!-- @color/grey_darken_20 -->
     <path
-        android:fillColor="#ff87a6bc"
+        android:fillColor="#ff4f748e"
         android:pathData="M18,29h13v-2H18V29z M18,23h13v-2H18V23z M18,15v2h13v-2H18z M13.575,15.252 c0.107-0.096,0.197-0.188,0.269-0.275c-0.012,0.228-0.018,0.48-0.018,0.756V18h1.175v-4.283h-1.042l-1.471,1.198l0.601,0.738 L13.575,15.252z M13.909,23.016c0.475-0.426,0.785-0.715,0.93-0.867c0.146-0.152,0.262-0.297,0.35-0.435 c0.088-0.138,0.153-0.278,0.195-0.42c0.042-0.143,0.063-0.298,0.063-0.466c0-0.225-0.06-0.427-0.18-0.608s-0.289-0.32-0.507-0.417 c-0.218-0.099-0.465-0.148-0.742-0.148c-0.221,0-0.419,0.022-0.596,0.067s-0.34,0.11-0.491,0.195 c-0.15,0.085-0.336,0.226-0.557,0.423l0.636,0.744c0.174-0.15,0.33-0.264,0.467-0.341c0.138-0.077,0.274-0.116,0.409-0.116 c0.131,0,0.233,0.032,0.305,0.097c0.072,0.064,0.108,0.152,0.108,0.264c0,0.09-0.018,0.176-0.054,0.258 c-0.036,0.082-0.1,0.18-0.192,0.294c-0.092,0.114-0.287,0.328-0.586,0.64l-1.046,1.058V24h3.108v-0.955h-1.62V23.016L13.909,23.016z M14.439,27.762v-0.018c0.307-0.086,0.541-0.225,0.703-0.414c0.162-0.191,0.243-0.419,0.243-0.685 c0-0.309-0.126-0.551-0.378-0.727c-0.252-0.176-0.6-0.264-1.043-0.264c-0.307,0-0.579,0.033-0.816,0.1 c-0.237,0.067-0.469,0.178-0.696,0.334l0.48,0.773c0.293-0.184,0.576-0.275,0.85-0.275c0.147,0,0.263,0.027,0.35,0.082 s0.13,0.139,0.13,0.252c0,0.301-0.294,0.451-0.882,0.451h-0.27v0.87h0.264c0.217,0,0.393,0.016,0.527,0.049 c0.135,0.031,0.232,0.08,0.293,0.143c0.061,0.064,0.091,0.154,0.091,0.271c0,0.152-0.058,0.264-0.174,0.336 c-0.116,0.07-0.301,0.106-0.555,0.106c-0.164,0-0.343-0.022-0.538-0.069c-0.194-0.045-0.385-0.116-0.573-0.212v0.961 c0.228,0.088,0.441,0.148,0.637,0.182c0.196,0.033,0.41,0.05,0.64,0.05c0.561,0,0.998-0.114,1.314-0.343 c0.315-0.228,0.473-0.542,0.473-0.94C15.512,28.19,15.154,27.852,14.439,27.762z" >
     </path>
 
diff --git a/aztec/src/main/res/drawable/format_bar_button_ol_disabled.xml b/aztec/src/main/res/drawable/format_bar_button_ol_disabled.xml
@@ -7,9 +7,9 @@
     android:viewportHeight="44"
     android:viewportWidth="44" >
 
-    <!-- @color/grey_lighten_30 -->
+    <!-- @color/grey_lighten_20 -->
     <path
-        android:fillColor="#ffa8bece"
+        android:fillColor="#ffc8d7e1"
         android:pathData="M18,29h13v-2H18V29z M18,23h13v-2H18V23z M18,15v2h13v-2H18z M13.575,15.252 c0.107-0.096,0.197-0.188,0.269-0.275c-0.012,0.228-0.018,0.48-0.018,0.756V18h1.175v-4.283h-1.042l-1.471,1.198l0.601,0.738 L13.575,15.252z M13.909,23.016c0.475-0.426,0.785-0.715,0.93-0.867c0.146-0.152,0.262-0.297,0.35-0.435 c0.088-0.138,0.153-0.278,0.195-0.42c0.042-0.143,0.063-0.298,0.063-0.466c0-0.225-0.06-0.427-0.18-0.608s-0.289-0.32-0.507-0.417 c-0.218-0.099-0.465-0.148-0.742-0.148c-0.221,0-0.419,0.022-0.596,0.067s-0.34,0.11-0.491,0.195 c-0.15,0.085-0.336,0.226-0.557,0.423l0.636,0.744c0.174-0.15,0.33-0.264,0.467-0.341c0.138-0.077,0.274-0.116,0.409-0.116 c0.131,0,0.233,0.032,0.305,0.097c0.072,0.064,0.108,0.152,0.108,0.264c0,0.09-0.018,0.176-0.054,0.258 c-0.036,0.082-0.1,0.18-0.192,0.294c-0.092,0.114-0.287,0.328-0.586,0.64l-1.046,1.058V24h3.108v-0.955h-1.62V23.016L13.909,23.016z M14.439,27.762v-0.018c0.307-0.086,0.541-0.225,0.703-0.414c0.162-0.191,0.243-0.419,0.243-0.685 c0-0.309-0.126-0.551-0.378-0.727c-0.252-0.176-0.6-0.264-1.043-0.264c-0.307,0-0.579,0.033-0.816,0.1 c-0.237,0.067-0.469,0.178-0.696,0.334l0.48,0.773c0.293-0.184,0.576-0.275,0.85-0.275c0.147,0,0.263,0.027,0.35,0.082 s0.13,0.139,0.13,0.252c0,0.301-0.294,0.451-0.882,0.451h-0.27v0.87h0.264c0.217,0,0.393,0.016,0.527,0.049 c0.135,0.031,0.232,0.08,0.293,0.143c0.061,0.064,0.091,0.154,0.091,0.271c0,0.152-0.058,0.264-0.174,0.336 c-0.116,0.07-0.301,0.106-0.555,0.106c-0.164,0-0.343-0.022-0.538-0.069c-0.194-0.045-0.385-0.116-0.573-0.212v0.961 c0.228,0.088,0.441,0.148,0.637,0.182c0.196,0.033,0.41,0.05,0.64,0.05c0.561,0,0.998-0.114,1.314-0.343 c0.315-0.228,0.473-0.542,0.473-0.94C15.512,28.19,15.154,27.852,14.439,27.762z" >
     </path>
 
diff --git a/aztec/src/main/res/drawable/format_bar_button_page.xml b/aztec/src/main/res/drawable/format_bar_button_page.xml
@@ -7,9 +7,9 @@
     android:viewportHeight="44"
     android:viewportWidth="44" >
 
-    <!-- @color/grey -->
+    <!-- @color/grey_darken_20 -->
     <path
-        android:fillColor="#ff87a6bc"
+        android:fillColor="#ff4f748e"
         android:pathData="M13,15h18v4H13V15z M13,29h18v-4H13V29z M15,21h-2v2h2V21z M19,21h-2v2h2V21z M27,21h-2v2h2V21z M31,21h-2v2h2V21z M23,21h-2v2h2V21z" >
     </path>
 
diff --git a/aztec/src/main/res/drawable/format_bar_button_page_disabled.xml b/aztec/src/main/res/drawable/format_bar_button_page_disabled.xml
@@ -7,9 +7,9 @@
     android:viewportHeight="44"
     android:viewportWidth="44" >
 
-    <!-- @color/grey_lighten_30 -->
+    <!-- @color/grey_lighten_20 -->
     <path
-        android:fillColor="#ffa8bece"
+        android:fillColor="#ffc8d7e1"
         android:pathData="M13,15h18v4H13V15z M13,29h18v-4H13V29z M15,21h-2v2h2V21z M19,21h-2v2h2V21z M27,21h-2v2h2V21z M31,21h-2v2h2V21z M23,21h-2v2h2V21z" >
     </path>
 
diff --git a/aztec/src/main/res/drawable/format_bar_button_quote.xml b/aztec/src/main/res/drawable/format_bar_button_quote.xml
@@ -7,9 +7,9 @@
     android:viewportHeight="44"
     android:viewportWidth="44" >
 
-    <!-- @color/grey -->
+    <!-- @color/grey_darken_20 -->
     <path
-        android:fillColor="#ff87a6bc"
+        android:fillColor="#ff4f748e"
         android:pathData="M21.192,25.757c0-0.88-0.23-1.618-0.69-2.217c-0.326-0.412-0.768-0.683-1.327-0.812 c-0.55-0.128-1.07-0.137-1.54-0.028c-0.16-0.95,0.1-1.956,0.76-3.022c0.66-1.065,1.515-1.867,2.558-2.403L19.372,15 c-0.8,0.396-1.56,0.898-2.26,1.505c-0.71,0.607-1.34,1.305-1.9,2.094c-0.56,0.789-0.98,1.68-1.25,2.69 c-0.27,1.01-0.345,2.04-0.216,3.1c0.168,1.4,0.62,2.52,1.356,3.35C15.837,28.58,16.754,29,17.85,29c0.965,0,1.766-0.29,2.4-0.878 c0.628-0.576,0.94-1.365,0.94-2.368L21.192,25.757z M30.316,25.757c0-0.88-0.23-1.618-0.69-2.217 c-0.326-0.42-0.77-0.692-1.327-0.817c-0.56-0.124-1.073-0.13-1.54-0.022c-0.16-0.94,0.09-1.95,0.752-3.02 c0.66-1.06,1.513-1.86,2.556-2.4L28.49,15c-0.8,0.396-1.555,0.898-2.26,1.505c-0.708,0.607-1.34,1.305-1.894,2.094 c-0.556,0.79-0.97,1.68-1.24,2.69c-0.273,1.002-0.345,2.04-0.217,3.1c0.166,1.4,0.616,2.52,1.35,3.35 c0.733,0.834,1.647,1.252,2.743,1.252c0.967,0,1.768-0.29,2.402-0.877c0.627-0.576,0.942-1.365,0.942-2.368L30.316,25.757z" >
     </path>
 
diff --git a/aztec/src/main/res/drawable/format_bar_button_quote_disabled.xml b/aztec/src/main/res/drawable/format_bar_button_quote_disabled.xml
@@ -7,9 +7,9 @@
     android:viewportHeight="44"
     android:viewportWidth="44" >
 
-    <!-- @color/grey_lighten_30 -->
+    <!-- @color/grey_lighten_20 -->
     <path
-        android:fillColor="#ffa8bece"
+        android:fillColor="#ffc8d7e1"
         android:pathData="M21.192,25.757c0-0.88-0.23-1.618-0.69-2.217c-0.326-0.412-0.768-0.683-1.327-0.812 c-0.55-0.128-1.07-0.137-1.54-0.028c-0.16-0.95,0.1-1.956,0.76-3.022c0.66-1.065,1.515-1.867,2.558-2.403L19.372,15 c-0.8,0.396-1.56,0.898-2.26,1.505c-0.71,0.607-1.34,1.305-1.9,2.094c-0.56,0.789-0.98,1.68-1.25,2.69 c-0.27,1.01-0.345,2.04-0.216,3.1c0.168,1.4,0.62,2.52,1.356,3.35C15.837,28.58,16.754,29,17.85,29c0.965,0,1.766-0.29,2.4-0.878 c0.628-0.576,0.94-1.365,0.94-2.368L21.192,25.757z M30.316,25.757c0-0.88-0.23-1.618-0.69-2.217 c-0.326-0.42-0.77-0.692-1.327-0.817c-0.56-0.124-1.073-0.13-1.54-0.022c-0.16-0.94,0.09-1.95,0.752-3.02 c0.66-1.06,1.513-1.86,2.556-2.4L28.49,15c-0.8,0.396-1.555,0.898-2.26,1.505c-0.708,0.607-1.34,1.305-1.894,2.094 c-0.556,0.79-0.97,1.68-1.24,2.69c-0.273,1.002-0.345,2.04-0.217,3.1c0.166,1.4,0.616,2.52,1.35,3.35 c0.733,0.834,1.647,1.252,2.743,1.252c0.967,0,1.768-0.29,2.402-0.877c0.627-0.576,0.942-1.365,0.942-2.368L30.316,25.757z" >
     </path>
 
diff --git a/aztec/src/main/res/drawable/format_bar_button_strikethrough.xml b/aztec/src/main/res/drawable/format_bar_button_strikethrough.xml
@@ -7,9 +7,9 @@
     android:viewportHeight="44"
     android:viewportWidth="44" >
 
-    <!-- @color/grey -->
+    <!-- @color/grey_darken_20 -->
     <path
-        android:fillColor="#ff87a6bc"
+        android:fillColor="#ff4f748e"
         android:pathData="M24.348,22H31v2h-4.613c0.239,0.515,0.368,1.094,0.368,1.748c0,1.317-0.474,2.355-1.423,3.114 C24.385,29.621,23.066,30,21.376,30c-1.557,0-2.934-0.293-4.132-0.878v-2.874c0.985,0.439,1.818,0.749,2.5,0.928 c0.682,0.181,1.306,0.27,1.872,0.27c0.679,0,1.2-0.129,1.562-0.39c0.363-0.259,0.545-0.644,0.545-1.158 c0-0.285-0.08-0.54-0.24-0.763c-0.16-0.222-0.394-0.437-0.704-0.643c-0.18-0.12-0.482-0.287-0.88-0.491H13v-2h5.597H24.348z M20.82,20c-0.073-0.077-0.143-0.155-0.193-0.235c-0.126-0.202-0.189-0.441-0.189-0.713c0-0.439,0.156-0.795,0.469-1.068 c0.313-0.273,0.762-0.409,1.348-0.409c0.492,0,0.993,0.063,1.502,0.19c0.509,0.126,1.153,0.349,1.931,0.669l0.998-2.405 c-0.752-0.326-1.472-0.579-2.16-0.758C23.836,15.09,23.113,15,22.354,15c-1.544,0-2.753,0.369-3.628,1.108 c-0.874,0.739-1.312,1.753-1.312,3.044c0,0.302,0.036,0.58,0.088,0.848H20.82z" >
     </path>
 
diff --git a/aztec/src/main/res/drawable/format_bar_button_strikethrough_disabled.xml b/aztec/src/main/res/drawable/format_bar_button_strikethrough_disabled.xml
@@ -7,9 +7,9 @@
     android:viewportHeight="44"
     android:viewportWidth="44" >
 
-    <!-- @color/grey_lighten_30 -->
+    <!-- @color/grey_lighten_20 -->
     <path
-        android:fillColor="#ffa8bece"
+        android:fillColor="#ffc8d7e1"
         android:pathData="M24.348,22H31v2h-4.613c0.239,0.515,0.368,1.094,0.368,1.748c0,1.317-0.474,2.355-1.423,3.114 C24.385,29.621,23.066,30,21.376,30c-1.557,0-2.934-0.293-4.132-0.878v-2.874c0.985,0.439,1.818,0.749,2.5,0.928 c0.682,0.181,1.306,0.27,1.872,0.27c0.679,0,1.2-0.129,1.562-0.39c0.363-0.259,0.545-0.644,0.545-1.158 c0-0.285-0.08-0.54-0.24-0.763c-0.16-0.222-0.394-0.437-0.704-0.643c-0.18-0.12-0.482-0.287-0.88-0.491H13v-2h5.597H24.348z M20.82,20c-0.073-0.077-0.143-0.155-0.193-0.235c-0.126-0.202-0.189-0.441-0.189-0.713c0-0.439,0.156-0.795,0.469-1.068 c0.313-0.273,0.762-0.409,1.348-0.409c0.492,0,0.993,0.063,1.502,0.19c0.509,0.126,1.153,0.349,1.931,0.669l0.998-2.405 c-0.752-0.326-1.472-0.579-2.16-0.758C23.836,15.09,23.113,15,22.354,15c-1.544,0-2.753,0.369-3.628,1.108 c-0.874,0.739-1.312,1.753-1.312,3.044c0,0.302,0.036,0.58,0.088,0.848H20.82z" >
     </path>
 
diff --git a/aztec/src/main/res/drawable/format_bar_button_ul.xml b/aztec/src/main/res/drawable/format_bar_button_ul.xml
@@ -7,9 +7,9 @@
     android:viewportHeight="44"
     android:viewportWidth="44" >
 
-    <!-- @color/grey -->
+    <!-- @color/grey_darken_20 -->
     <path
-        android:fillColor="#ff87a6bc"
+        android:fillColor="#ff4f748e"
         android:pathData="M19,29h12v-2H19V29z M19,23h12v-2H19V23z M19,15v2h12v-2H19z M15,14.5c-0.828,0-1.5,0.672-1.5,1.5 c0,0.828,0.672,1.5,1.5,1.5s1.5-0.672,1.5-1.5C16.5,15.172,15.828,14.5,15,14.5z M15,20.5c-0.828,0-1.5,0.672-1.5,1.5 s0.672,1.5,1.5,1.5s1.5-0.672,1.5-1.5S15.828,20.5,15,20.5z M15,26.5c-0.828,0-1.5,0.672-1.5,1.5s0.672,1.5,1.5,1.5 s1.5-0.672,1.5-1.5S15.828,26.5,15,26.5z" >
     </path>
 
diff --git a/aztec/src/main/res/drawable/format_bar_button_ul_disabled.xml b/aztec/src/main/res/drawable/format_bar_button_ul_disabled.xml
@@ -7,9 +7,9 @@
     android:viewportHeight="44"
     android:viewportWidth="44" >
 
-    <!-- @color/grey_lighten_30 -->
+    <!-- @color/grey_lighten_20 -->
     <path
-        android:fillColor="#ffa8bece"
+        android:fillColor="#ffc8d7e1"
         android:pathData="M19,29h12v-2H19V29z M19,23h12v-2H19V23z M19,15v2h12v-2H19z M15,14.5c-0.828,0-1.5,0.672-1.5,1.5 c0,0.828,0.672,1.5,1.5,1.5s1.5-0.672,1.5-1.5C16.5,15.172,15.828,14.5,15,14.5z M15,20.5c-0.828,0-1.5,0.672-1.5,1.5 s0.672,1.5,1.5,1.5s1.5-0.672,1.5-1.5S15.828,20.5,15,20.5z M15,26.5c-0.828,0-1.5,0.672-1.5,1.5s0.672,1.5,1.5,1.5 s1.5-0.672,1.5-1.5S15.828,26.5,15,26.5z" >
     </path>
 
diff --git a/aztec/src/main/res/values/colors.xml b/aztec/src/main/res/values/colors.xml
