diff --git a/navigationbar/res/drawable-ldrtl/setup_wizard_navbar_ic_back.xml b/navigationbar/res/drawable-ldrtl/setup_wizard_navbar_ic_back.xml
index b0d243a..d21c8b3 100644
--- a/navigationbar/res/drawable-ldrtl/setup_wizard_navbar_ic_back.xml
+++ b/navigationbar/res/drawable-ldrtl/setup_wizard_navbar_ic_back.xml
@@ -14,13 +14,13 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android">
-    <size android:width="24dp" android:height="24dp" />
-    <viewport android:viewportWidth="24" android:viewportHeight="24" />
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp" android:height="24dp"
+        android:viewportWidth="24" android:viewportHeight="24" >
     <path
-        android:fill="@android:color/transparent"
+        android:fillColor="@android:color/transparent"
         android:pathData="M9,6 L15,12 L9,18"
-        android:stroke="?attr/setup_wizard_navbar_text_color"
+        android:strokeColor="?attr/setup_wizard_navbar_text_color"
         android:strokeWidth="2.5"
         android:strokeLineCap="square"
         />
diff --git a/navigationbar/res/drawable-ldrtl/setup_wizard_navbar_ic_next.xml b/navigationbar/res/drawable-ldrtl/setup_wizard_navbar_ic_next.xml
index 335ef8c..373fadf 100644
--- a/navigationbar/res/drawable-ldrtl/setup_wizard_navbar_ic_next.xml
+++ b/navigationbar/res/drawable-ldrtl/setup_wizard_navbar_ic_next.xml
@@ -14,13 +14,13 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android">
-    <size android:width="24dp" android:height="24dp" />
-    <viewport android:viewportWidth="24" android:viewportHeight="24" />
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp" android:height="24dp"
+        android:viewportWidth="24" android:viewportHeight="24" >
     <path
-        android:fill="@android:color/transparent"
+        android:fillColor="@android:color/transparent"
         android:pathData="M15,6 L9,12 L15,18"
-        android:stroke="?attr/setup_wizard_navbar_text_color"
+        android:strokeColor="?attr/setup_wizard_navbar_text_color"
         android:strokeWidth="3"
         android:strokeLineCap="square"
         />
diff --git a/navigationbar/res/drawable/setup_wizard_navbar_ic_back.xml b/navigationbar/res/drawable/setup_wizard_navbar_ic_back.xml
index a759853..e3e0ef9 100644
--- a/navigationbar/res/drawable/setup_wizard_navbar_ic_back.xml
+++ b/navigationbar/res/drawable/setup_wizard_navbar_ic_back.xml
@@ -14,13 +14,13 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android">
-    <size android:width="24dp" android:height="24dp" />
-    <viewport android:viewportWidth="24" android:viewportHeight="24" />
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp" android:height="24dp"
+        android:viewportWidth="24" android:viewportHeight="24" >
     <path
-        android:fill="@android:color/transparent"
+        android:fillColor="@android:color/transparent"
         android:pathData="M15,6 L9,12 L15,18"
-        android:stroke="?attr/setup_wizard_navbar_text_color"
+        android:strokeColor="?attr/setup_wizard_navbar_text_color"
         android:strokeWidth="2.5"
         android:strokeLineCap="square"
         />
diff --git a/navigationbar/res/drawable/setup_wizard_navbar_ic_next.xml b/navigationbar/res/drawable/setup_wizard_navbar_ic_next.xml
index 4c0c6e4..0350279 100644
--- a/navigationbar/res/drawable/setup_wizard_navbar_ic_next.xml
+++ b/navigationbar/res/drawable/setup_wizard_navbar_ic_next.xml
@@ -14,13 +14,13 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android">
-    <size android:width="24dp" android:height="24dp" />
-    <viewport android:viewportWidth="24" android:viewportHeight="24" />
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp" android:height="24dp"
+        android:viewportWidth="24" android:viewportHeight="24" >
     <path
-        android:fill="@android:color/transparent"
+        android:fillColor="@android:color/transparent"
         android:pathData="M9,6 L15,12 L9,18"
-        android:stroke="?attr/setup_wizard_navbar_text_color"
+        android:strokeColor="?attr/setup_wizard_navbar_text_color"
         android:strokeWidth="3"
         android:strokeLineCap="square"
         />