diff --git a/app/src/main/res/drawable/btn_keyboard_key_holo_white.xml b/app/src/main/res/drawable/btn_keyboard_key_holo_white.xml
index e2f208585..e915a5ac9 100644
--- a/app/src/main/res/drawable/btn_keyboard_key_holo_white.xml
+++ b/app/src/main/res/drawable/btn_keyboard_key_holo_white.xml
@@ -1,17 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT 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) 2013 The Android Open Source Project
+    SPDX-License-Identifier: Apache-2.0
 -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
diff --git a/app/src/main/res/drawable/btn_keyboard_key_lxx_base.xml b/app/src/main/res/drawable/btn_keyboard_key_lxx_base.xml
index b0678be5d..8415061f3 100644
--- a/app/src/main/res/drawable/btn_keyboard_key_lxx_base.xml
+++ b/app/src/main/res/drawable/btn_keyboard_key_lxx_base.xml
@@ -1,17 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT 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) 2014 The Android Open Source Project
+    SPDX-License-Identifier: Apache-2.0
 -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
diff --git a/app/src/main/res/drawable/btn_keyboard_key_lxx_base_border.xml b/app/src/main/res/drawable/btn_keyboard_key_lxx_base_border.xml
index 941b01b3f..956c5c827 100644
--- a/app/src/main/res/drawable/btn_keyboard_key_lxx_base_border.xml
+++ b/app/src/main/res/drawable/btn_keyboard_key_lxx_base_border.xml
@@ -1,17 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT 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) 2013 The Android Open Source Project
+    SPDX-License-Identifier: Apache-2.0
 -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
diff --git a/app/src/main/res/drawable/btn_keyboard_key_popup_holo_white.xml b/app/src/main/res/drawable/btn_keyboard_key_popup_holo_white.xml
index 9dfc93ae8..826222871 100644
--- a/app/src/main/res/drawable/btn_keyboard_key_popup_holo_white.xml
+++ b/app/src/main/res/drawable/btn_keyboard_key_popup_holo_white.xml
@@ -1,17 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT 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) 2013 The Android Open Source Project
+    SPDX-License-Identifier: Apache-2.0
 -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
diff --git a/app/src/main/res/drawable/btn_keyboard_spacebar_holo_white.xml b/app/src/main/res/drawable/btn_keyboard_spacebar_holo_white.xml
index 9882f9a74..fd67570c4 100644
--- a/app/src/main/res/drawable/btn_keyboard_spacebar_holo_white.xml
+++ b/app/src/main/res/drawable/btn_keyboard_spacebar_holo_white.xml
@@ -1,17 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT 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) 2013 The Android Open Source Project
+    SPDX-License-Identifier: Apache-2.0
 -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
diff --git a/app/src/main/res/drawable/btn_suggestion_holo_white.xml b/app/src/main/res/drawable/btn_suggestion_holo_white.xml
index 471165bdf..b10591073 100644
--- a/app/src/main/res/drawable/btn_suggestion_holo_white.xml
+++ b/app/src/main/res/drawable/btn_suggestion_holo_white.xml
@@ -1,21 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT 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) 2013 The Android Open Source Project
+    SPDX-License-Identifier: Apache-2.0
 -->
 
 <selector
diff --git a/app/src/main/res/drawable/btn_suggestion_lxx_base.xml b/app/src/main/res/drawable/btn_suggestion_lxx_base.xml
index a640b1b3b..23347157d 100644
--- a/app/src/main/res/drawable/btn_suggestion_lxx_base.xml
+++ b/app/src/main/res/drawable/btn_suggestion_lxx_base.xml
@@ -1,21 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-/*
-**
-** Copyright 2014, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT 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) 2014 The Android Open Source Project
+    SPDX-License-Identifier: Apache-2.0
 -->
 
 <selector
diff --git a/app/src/main/res/drawable/ic_arrow_left.xml b/app/src/main/res/drawable/ic_arrow_left.xml
index c22914e7e..5526c35d8 100644
--- a/app/src/main/res/drawable/ic_arrow_left.xml
+++ b/app/src/main/res/drawable/ic_arrow_left.xml
@@ -1,4 +1,7 @@
-<!-- clipart available in Android Studio, Apache License 2.0 -->
+<!--
+    icon available in Android Studio
+    SPDX-License-Identifier: Apache-2.0
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="24dp"
     android:width="24dp"
diff --git a/app/src/main/res/drawable/ic_arrow_right.xml b/app/src/main/res/drawable/ic_arrow_right.xml
index 091313b91..ad115c23c 100644
--- a/app/src/main/res/drawable/ic_arrow_right.xml
+++ b/app/src/main/res/drawable/ic_arrow_right.xml
@@ -1,4 +1,3 @@
-<!-- clipart available in Android Studio, Apache License 2.0 -->
 <rotate xmlns:android="http://schemas.android.com/apk/res/android"
     android:fromDegrees="180"
     android:drawable="@drawable/ic_arrow_left">
diff --git a/app/src/main/res/drawable/ic_arrow_up.xml b/app/src/main/res/drawable/ic_arrow_up.xml
index 7c2da770e..2b87db0be 100644
--- a/app/src/main/res/drawable/ic_arrow_up.xml
+++ b/app/src/main/res/drawable/ic_arrow_up.xml
@@ -1,4 +1,3 @@
-<!-- clipart available in Android Studio, Apache License 2.0 -->
 <rotate xmlns:android="http://schemas.android.com/apk/res/android"
     android:fromDegrees="90"
     android:drawable="@drawable/ic_arrow_left">
diff --git a/app/src/main/res/drawable/ic_clipboard_pin_holo_dark.xml b/app/src/main/res/drawable/ic_clipboard_pin_holo_dark.xml
index ebf775f2d..2ca92d595 100644
--- a/app/src/main/res/drawable/ic_clipboard_pin_holo_dark.xml
+++ b/app/src/main/res/drawable/ic_clipboard_pin_holo_dark.xml
@@ -1,3 +1,7 @@
+<!--
+    icon from pictogrammers.com
+    SPDX-License-Identifier: Apache-2.0
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="24dp"
     android:width="24dp"
diff --git a/app/src/main/res/drawable/ic_clipboard_pin_lxx.xml b/app/src/main/res/drawable/ic_clipboard_pin_lxx.xml
index b9051abd2..8b1c2009f 100644
--- a/app/src/main/res/drawable/ic_clipboard_pin_lxx.xml
+++ b/app/src/main/res/drawable/ic_clipboard_pin_lxx.xml
@@ -1,4 +1,7 @@
-<!-- clipart available in Android Studio, Apache License 2.0 -->
+<!--
+    icon available in Android Studio
+    SPDX-License-Identifier: Apache-2.0
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="24dp"
     android:width="24dp"
diff --git a/app/src/main/res/drawable/ic_delete.xml b/app/src/main/res/drawable/ic_delete.xml
index 1d4b1def9..6ecabab35 100644
--- a/app/src/main/res/drawable/ic_delete.xml
+++ b/app/src/main/res/drawable/ic_delete.xml
@@ -1,4 +1,7 @@
-<!-- clipart available in Android Studio, Apache License 2.0 -->
+<!--
+    icon available in Android Studio
+    SPDX-License-Identifier: Apache-2.0
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="32dp"
     android:height="32dp"
diff --git a/app/src/main/res/drawable/ic_divider.xml b/app/src/main/res/drawable/ic_divider.xml
index bc057ea79..50b81b5cd 100644
--- a/app/src/main/res/drawable/ic_divider.xml
+++ b/app/src/main/res/drawable/ic_divider.xml
@@ -1,4 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
+<!--
+    SPDX-License-Identifier: CC0-1.0
+-->
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item
         android:left="8dp"
diff --git a/app/src/main/res/drawable/ic_emoji_activities.xml b/app/src/main/res/drawable/ic_emoji_activities.xml
index b7df6a368..832186e54 100644
--- a/app/src/main/res/drawable/ic_emoji_activities.xml
+++ b/app/src/main/res/drawable/ic_emoji_activities.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--clipart available in Android Studio, Apache License 2.0-->
+<!--
+    icon available in Android Studio
+    SPDX-License-Identifier: Apache-2.0
+-->
+
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="32dp"
     android:width="32dp"
diff --git a/app/src/main/res/drawable/ic_emoji_animals_nature.xml b/app/src/main/res/drawable/ic_emoji_animals_nature.xml
index 50482451a..a7e883f7f 100644
--- a/app/src/main/res/drawable/ic_emoji_animals_nature.xml
+++ b/app/src/main/res/drawable/ic_emoji_animals_nature.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--clipart available in Android Studio, Apache License 2.0-->
+<!--
+    icon available in Android Studio
+    SPDX-License-Identifier: Apache-2.0
+-->
+
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="32dp"
     android:width="32dp"
diff --git a/app/src/main/res/drawable/ic_emoji_emoticons.xml b/app/src/main/res/drawable/ic_emoji_emoticons.xml
index 064b1e944..0f73b4fee 100644
--- a/app/src/main/res/drawable/ic_emoji_emoticons.xml
+++ b/app/src/main/res/drawable/ic_emoji_emoticons.xml
@@ -1,5 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Apache License 2.0-->
+<!--
+    icon from pictogrammers.com
+    SPDX-License-Identifier: Apache-2.0
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="32dp"
     android:width="32dp"
diff --git a/app/src/main/res/drawable/ic_emoji_flags.xml b/app/src/main/res/drawable/ic_emoji_flags.xml
index f81080aaf..54d960247 100644
--- a/app/src/main/res/drawable/ic_emoji_flags.xml
+++ b/app/src/main/res/drawable/ic_emoji_flags.xml
@@ -1,5 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Apache License 2.0-->
+<!--
+    icon from pictogrammers.com
+    SPDX-License-Identifier: Apache-2.0
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="32dp"
     android:width="32dp"
diff --git a/app/src/main/res/drawable/ic_emoji_food_drink.xml b/app/src/main/res/drawable/ic_emoji_food_drink.xml
index 48f5b7f54..e7e9b222f 100644
--- a/app/src/main/res/drawable/ic_emoji_food_drink.xml
+++ b/app/src/main/res/drawable/ic_emoji_food_drink.xml
@@ -1,5 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--clipart available in Android Studio, Apache License 2.0-->
+<!--
+    icon available in Android Studio
+    SPDX-License-Identifier: Apache-2.0
+-->
+
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="32dp"
     android:width="32dp"
diff --git a/app/src/main/res/drawable/ic_emoji_objects.xml b/app/src/main/res/drawable/ic_emoji_objects.xml
index 290ced04c..9dd369d5c 100644
--- a/app/src/main/res/drawable/ic_emoji_objects.xml
+++ b/app/src/main/res/drawable/ic_emoji_objects.xml
@@ -1,5 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--clipart available in Android Studio, Apache License 2.0-->
+<!--
+    icon available in Android Studio
+    SPDX-License-Identifier: Apache-2.0
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="32dp"
     android:width="32dp"
diff --git a/app/src/main/res/drawable/ic_emoji_people_body.xml b/app/src/main/res/drawable/ic_emoji_people_body.xml
index 126d1d4f8..f0534bacb 100644
--- a/app/src/main/res/drawable/ic_emoji_people_body.xml
+++ b/app/src/main/res/drawable/ic_emoji_people_body.xml
@@ -1,5 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Apache License 2.0-->
+<!--
+    icon from pictogrammers.com
+    SPDX-License-Identifier: Apache-2.0
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="32dp"
     android:width="32dp"
diff --git a/app/src/main/res/drawable/ic_emoji_recents.xml b/app/src/main/res/drawable/ic_emoji_recents.xml
index a849561b9..f3a31cc13 100644
--- a/app/src/main/res/drawable/ic_emoji_recents.xml
+++ b/app/src/main/res/drawable/ic_emoji_recents.xml
@@ -1,5 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Apache License 2.0-->
+<!--
+    icon from pictogrammers.com
+    SPDX-License-Identifier: Apache-2.0
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="28dp"
     android:width="28dp"
diff --git a/app/src/main/res/drawable/ic_emoji_smileys_emotion.xml b/app/src/main/res/drawable/ic_emoji_smileys_emotion.xml
index 6ab530ee0..4dfc52374 100644
--- a/app/src/main/res/drawable/ic_emoji_smileys_emotion.xml
+++ b/app/src/main/res/drawable/ic_emoji_smileys_emotion.xml
@@ -1,5 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Apache License 2.0-->
+<!--
+    icon from pictogrammers.com
+    SPDX-License-Identifier: Apache-2.0
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="32dp"
     android:width="32dp"
diff --git a/app/src/main/res/drawable/ic_emoji_symbols.xml b/app/src/main/res/drawable/ic_emoji_symbols.xml
index 80ae64e58..0c0aede18 100644
--- a/app/src/main/res/drawable/ic_emoji_symbols.xml
+++ b/app/src/main/res/drawable/ic_emoji_symbols.xml
@@ -1,5 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Apache License 2.0-->
+<!--
+    icon from pictogrammers.com
+    SPDX-License-Identifier: Apache-2.0
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="32dp"
     android:width="32dp"
diff --git a/app/src/main/res/drawable/ic_emoji_travel_places.xml b/app/src/main/res/drawable/ic_emoji_travel_places.xml
index 7a9e41933..22767d174 100644
--- a/app/src/main/res/drawable/ic_emoji_travel_places.xml
+++ b/app/src/main/res/drawable/ic_emoji_travel_places.xml
@@ -1,5 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Apache License 2.0-->
+<!--
+    icon from pictogrammers.com
+    SPDX-License-Identifier: Apache-2.0
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="32dp"
     android:width="32dp"
diff --git a/app/src/main/res/drawable/ic_plus.xml b/app/src/main/res/drawable/ic_plus.xml
index 7f861127f..51202aa0c 100644
--- a/app/src/main/res/drawable/ic_plus.xml
+++ b/app/src/main/res/drawable/ic_plus.xml
@@ -1,4 +1,7 @@
-<!-- clipart available in Android Studio, Apache License 2.0 -->
+<!--
+    icon available in Android Studio
+    SPDX-License-Identifier: Apache-2.0
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="40dp"
     android:height="40dp"
diff --git a/app/src/main/res/drawable/ic_select_all.xml b/app/src/main/res/drawable/ic_select_all.xml
index d83592542..6ef55fa61 100644
--- a/app/src/main/res/drawable/ic_select_all.xml
+++ b/app/src/main/res/drawable/ic_select_all.xml
@@ -1,4 +1,7 @@
-<!-- clipart available in Android Studio, Apache License 2.0 -->
+<!--
+    icon available in Android Studio
+    SPDX-License-Identifier: Apache-2.0
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="24dp"
     android:width="24dp"
diff --git a/app/src/main/res/drawable/ic_settings_about_foreground.xml b/app/src/main/res/drawable/ic_settings_about_foreground.xml
index a0ee1583f..fea588f5d 100644
--- a/app/src/main/res/drawable/ic_settings_about_foreground.xml
+++ b/app/src/main/res/drawable/ic_settings_about_foreground.xml
@@ -1,4 +1,7 @@
-<!-- clipart available in Android Studio, Apache License 2.0 -->
+<!--
+    icon available in Android Studio
+    SPDX-License-Identifier: Apache-2.0
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="32dp"
     android:width="32dp"
diff --git a/app/src/main/res/drawable/ic_settings_advanced_foreground.xml b/app/src/main/res/drawable/ic_settings_advanced_foreground.xml
index 1e711be59..7cee65cad 100644
--- a/app/src/main/res/drawable/ic_settings_advanced_foreground.xml
+++ b/app/src/main/res/drawable/ic_settings_advanced_foreground.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <!--
     SPDX-FileCopyrightText: Material Design Authors / Google LLC
     SPDX-License-Identifier: Apache-2.0
diff --git a/app/src/main/res/drawable/ic_settings_appearance_foreground.xml b/app/src/main/res/drawable/ic_settings_appearance_foreground.xml
index 9f17f2efe..6a1fa6f67 100644
--- a/app/src/main/res/drawable/ic_settings_appearance_foreground.xml
+++ b/app/src/main/res/drawable/ic_settings_appearance_foreground.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <!--
     SPDX-FileCopyrightText: Material Design Authors / Google LLC
     SPDX-License-Identifier: Apache-2.0
diff --git a/app/src/main/res/drawable/ic_settings_correction_foreground.xml b/app/src/main/res/drawable/ic_settings_correction_foreground.xml
index 3c8db8bd9..1aaf1d0ba 100644
--- a/app/src/main/res/drawable/ic_settings_correction_foreground.xml
+++ b/app/src/main/res/drawable/ic_settings_correction_foreground.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <!--
     SPDX-FileCopyrightText: Material Design Authors / Google LLC
     SPDX-License-Identifier: Apache-2.0
diff --git a/app/src/main/res/drawable/ic_settings_gesture_foreground.xml b/app/src/main/res/drawable/ic_settings_gesture_foreground.xml
index c8b4d2d1f..3d1a0ed7f 100644
--- a/app/src/main/res/drawable/ic_settings_gesture_foreground.xml
+++ b/app/src/main/res/drawable/ic_settings_gesture_foreground.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <!--
     SPDX-FileCopyrightText: Material Design Authors / Google LLC
     SPDX-License-Identifier: Apache-2.0
diff --git a/app/src/main/res/drawable/ic_settings_languages_foreground.xml b/app/src/main/res/drawable/ic_settings_languages_foreground.xml
index 1bc3c2117..71efd7647 100644
--- a/app/src/main/res/drawable/ic_settings_languages_foreground.xml
+++ b/app/src/main/res/drawable/ic_settings_languages_foreground.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <!--
     SPDX-FileCopyrightText: Material Design Authors / Google LLC
     SPDX-License-Identifier: Apache-2.0
diff --git a/app/src/main/res/drawable/ic_settings_preferences_foreground.xml b/app/src/main/res/drawable/ic_settings_preferences_foreground.xml
index 30e68bd0d..57647528b 100644
--- a/app/src/main/res/drawable/ic_settings_preferences_foreground.xml
+++ b/app/src/main/res/drawable/ic_settings_preferences_foreground.xml
@@ -1,4 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
+<!--
+    icon from pictogrammers.com
+    SPDX-License-Identifier: Apache-2.0
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="32dp"
     android:width="32dp"
diff --git a/app/src/main/res/drawable/ic_setup_finish.xml b/app/src/main/res/drawable/ic_setup_finish.xml
index 48c86b912..1999946a8 100644
--- a/app/src/main/res/drawable/ic_setup_finish.xml
+++ b/app/src/main/res/drawable/ic_setup_finish.xml
@@ -1,21 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT 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) 2013 The Android Open Source Project
+    SPDX-License-Identifier: Apache-2.0
 -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
diff --git a/app/src/main/res/drawable/ic_setup_step1.xml b/app/src/main/res/drawable/ic_setup_step1.xml
index 7d83b26ba..3d68d7a2c 100644
--- a/app/src/main/res/drawable/ic_setup_step1.xml
+++ b/app/src/main/res/drawable/ic_setup_step1.xml
@@ -1,21 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT 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) 2013 The Android Open Source Project
+    SPDX-License-Identifier: Apache-2.0
 -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
diff --git a/app/src/main/res/drawable/ic_setup_step2.xml b/app/src/main/res/drawable/ic_setup_step2.xml
index 4ce1141f2..bd97c84f9 100644
--- a/app/src/main/res/drawable/ic_setup_step2.xml
+++ b/app/src/main/res/drawable/ic_setup_step2.xml
@@ -1,21 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT 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) 2013 The Android Open Source Project
+    SPDX-License-Identifier: Apache-2.0
 -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
diff --git a/app/src/main/res/drawable/ic_setup_step3.xml b/app/src/main/res/drawable/ic_setup_step3.xml
index a2e21b140..d1bb6c5a6 100644
--- a/app/src/main/res/drawable/ic_setup_step3.xml
+++ b/app/src/main/res/drawable/ic_setup_step3.xml
@@ -1,21 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT 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) 2013 The Android Open Source Project
+    SPDX-License-Identifier: Apache-2.0
 -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
diff --git a/app/src/main/res/drawable/keyboard_key_feedback_holo_white.xml b/app/src/main/res/drawable/keyboard_key_feedback_holo_white.xml
index eaea1769f..c729d78d2 100644
--- a/app/src/main/res/drawable/keyboard_key_feedback_holo_white.xml
+++ b/app/src/main/res/drawable/keyboard_key_feedback_holo_white.xml
@@ -1,17 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT 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) 2013 The Android Open Source Project
+    SPDX-License-Identifier: Apache-2.0
 -->
 
 <selector
diff --git a/app/src/main/res/drawable/keyboard_key_feedback_lxx_light.xml b/app/src/main/res/drawable/keyboard_key_feedback_lxx_light.xml
index 19a219c5b..9ae64e7f3 100644
--- a/app/src/main/res/drawable/keyboard_key_feedback_lxx_light.xml
+++ b/app/src/main/res/drawable/keyboard_key_feedback_lxx_light.xml
@@ -1,17 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT 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) 2014 The Android Open Source Project
+    SPDX-License-Identifier: Apache-2.0
 -->
 
 <selector
diff --git a/app/src/main/res/drawable/setup_step_action_background.xml b/app/src/main/res/drawable/setup_step_action_background.xml
index 25738e3a4..21cf1a418 100644
--- a/app/src/main/res/drawable/setup_step_action_background.xml
+++ b/app/src/main/res/drawable/setup_step_action_background.xml
@@ -1,21 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT 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) 2013 The Android Open Source Project
+    SPDX-License-Identifier: Apache-2.0
 -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
diff --git a/app/src/main/res/drawable/sym_keyboard_delete_lxx.xml b/app/src/main/res/drawable/sym_keyboard_delete_lxx.xml
index ae2eb718b..1663411b8 100644
--- a/app/src/main/res/drawable/sym_keyboard_delete_lxx.xml
+++ b/app/src/main/res/drawable/sym_keyboard_delete_lxx.xml
@@ -1,4 +1,7 @@
-<!-- clipart available in Android Studio, Apache License 2.0 -->
+<!--
+    icon available in Android Studio
+    SPDX-License-Identifier: Apache-2.0
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="24dp"
     android:width="24dp"
diff --git a/app/src/main/res/drawable/sym_keyboard_done_lxx.xml b/app/src/main/res/drawable/sym_keyboard_done_lxx.xml
index da5084fa9..380614ad3 100644
--- a/app/src/main/res/drawable/sym_keyboard_done_lxx.xml
+++ b/app/src/main/res/drawable/sym_keyboard_done_lxx.xml
@@ -1,4 +1,7 @@
-<!-- clipart available in Android Studio, Apache License 2.0 -->
+<!--
+    icon available in Android Studio
+    SPDX-License-Identifier: Apache-2.0
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="24dp"
     android:width="24dp"
diff --git a/app/src/main/res/drawable/sym_keyboard_go_lxx.xml b/app/src/main/res/drawable/sym_keyboard_go_lxx.xml
index 07a38ce9a..083830d86 100644
--- a/app/src/main/res/drawable/sym_keyboard_go_lxx.xml
+++ b/app/src/main/res/drawable/sym_keyboard_go_lxx.xml
@@ -1,4 +1,7 @@
-<!-- clipart available in Android Studio, Apache License 2.0 -->
+<!--
+    icon available in Android Studio
+    SPDX-License-Identifier: Apache-2.0
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="24dp"
     android:width="24dp"
diff --git a/app/src/main/res/drawable/sym_keyboard_language_switch_lxx.xml b/app/src/main/res/drawable/sym_keyboard_language_switch_lxx.xml
index 10c56cb5e..bb7fd2e14 100644
--- a/app/src/main/res/drawable/sym_keyboard_language_switch_lxx.xml
+++ b/app/src/main/res/drawable/sym_keyboard_language_switch_lxx.xml
@@ -1,4 +1,8 @@
-<!-- clipart available in Android Studio, Apache License 2.0 -->
+<!--
+    icon available in Android Studio
+    SPDX-License-Identifier: Apache-2.0
+-->
+<!-- todo: remove / merge with ic_settings_languages -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="24dp"
     android:width="24dp"
diff --git a/app/src/main/res/drawable/sym_keyboard_return_lxx.xml b/app/src/main/res/drawable/sym_keyboard_return_lxx.xml
index 0b9301b1e..6e56c58ed 100644
--- a/app/src/main/res/drawable/sym_keyboard_return_lxx.xml
+++ b/app/src/main/res/drawable/sym_keyboard_return_lxx.xml
@@ -1,4 +1,7 @@
-<!-- clipart available in Android Studio, Apache License 2.0 -->
+<!--
+    icon available in Android Studio
+    SPDX-License-Identifier: Apache-2.0
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="24dp"
     android:width="24dp"
diff --git a/app/src/main/res/drawable/sym_keyboard_search_lxx.xml b/app/src/main/res/drawable/sym_keyboard_search_lxx.xml
index 068db545a..44331b524 100644
--- a/app/src/main/res/drawable/sym_keyboard_search_lxx.xml
+++ b/app/src/main/res/drawable/sym_keyboard_search_lxx.xml
@@ -1,4 +1,7 @@
-<!-- clipart available in Android Studio, Apache License 2.0 -->
+<!--
+    icon available in Android Studio
+    SPDX-License-Identifier: Apache-2.0
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="24dp"
     android:width="24dp"
diff --git a/app/src/main/res/drawable/sym_keyboard_send_lxx.xml b/app/src/main/res/drawable/sym_keyboard_send_lxx.xml
index eb04a4106..e3ff96457 100644
--- a/app/src/main/res/drawable/sym_keyboard_send_lxx.xml
+++ b/app/src/main/res/drawable/sym_keyboard_send_lxx.xml
@@ -1,4 +1,7 @@
-<!-- clipart available in Android Studio, Apache License 2.0 -->
+<!--
+    icon available in Android Studio
+    SPDX-License-Identifier: Apache-2.0
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="24dp"
     android:width="24dp"
diff --git a/app/src/main/res/drawable/sym_keyboard_settings_lxx.xml b/app/src/main/res/drawable/sym_keyboard_settings_lxx.xml
index 0b909d6ba..4382e2ae6 100644
--- a/app/src/main/res/drawable/sym_keyboard_settings_lxx.xml
+++ b/app/src/main/res/drawable/sym_keyboard_settings_lxx.xml
@@ -1,4 +1,7 @@
-<!-- clipart available in Android Studio, Apache License 2.0 -->
+<!--
+    icon available in Android Studio
+    SPDX-License-Identifier: Apache-2.0
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="24dp"
     android:width="24dp"
diff --git a/app/src/main/res/drawable/sym_keyboard_shift_lxx.xml b/app/src/main/res/drawable/sym_keyboard_shift_lxx.xml
index 05088f34e..9d900fc4e 100644
--- a/app/src/main/res/drawable/sym_keyboard_shift_lxx.xml
+++ b/app/src/main/res/drawable/sym_keyboard_shift_lxx.xml
@@ -1,4 +1,7 @@
-<!-- clipart available in Android Studio, Apache License 2.0 -->
+<!--
+    icon available in Android Studio
+    SPDX-License-Identifier: Apache-2.0
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="24dp"
     android:width="24dp"
diff --git a/app/src/main/res/drawable/sym_keyboard_smiley_lxx.xml b/app/src/main/res/drawable/sym_keyboard_smiley_lxx.xml
index 2d5723d67..28bdf7621 100644
--- a/app/src/main/res/drawable/sym_keyboard_smiley_lxx.xml
+++ b/app/src/main/res/drawable/sym_keyboard_smiley_lxx.xml
@@ -1,4 +1,7 @@
-<!-- clipart available in Android Studio, Apache License 2.0 -->
+<!--
+    icon available in Android Studio
+    SPDX-License-Identifier: Apache-2.0
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="24dp"
     android:width="24dp"
diff --git a/app/src/main/res/drawable/sym_keyboard_start_onehanded_holo.xml b/app/src/main/res/drawable/sym_keyboard_start_onehanded_holo.xml
index 8e2d3d9eb..1518e49d7 100644
--- a/app/src/main/res/drawable/sym_keyboard_start_onehanded_holo.xml
+++ b/app/src/main/res/drawable/sym_keyboard_start_onehanded_holo.xml
@@ -1,4 +1,7 @@
-<!-- clipart available in Android Studio, Apache License 2.0 -->
+<!--
+    icon available in Android Studio
+    SPDX-License-Identifier: Apache-2.0
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="28dp"
     android:width="28dp"
diff --git a/app/src/main/res/drawable/sym_keyboard_start_onehanded_lxx.xml b/app/src/main/res/drawable/sym_keyboard_start_onehanded_lxx.xml
index 57d05302d..232150029 100644
--- a/app/src/main/res/drawable/sym_keyboard_start_onehanded_lxx.xml
+++ b/app/src/main/res/drawable/sym_keyboard_start_onehanded_lxx.xml
@@ -1,4 +1,8 @@
-<!-- clipart available in Android Studio, Apache License 2.0 -->
+<!--
+    icon available in Android Studio
+    SPDX-License-Identifier: Apache-2.0
+-->
+<!-- todo: remove / merge with sym_keyboard_start_onehanded_holo -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="20dp"
     android:width="20dp"
diff --git a/app/src/main/res/drawable/sym_keyboard_stop_onehanded_holo.xml b/app/src/main/res/drawable/sym_keyboard_stop_onehanded_holo.xml
index 73990c317..ca38813a4 100644
--- a/app/src/main/res/drawable/sym_keyboard_stop_onehanded_holo.xml
+++ b/app/src/main/res/drawable/sym_keyboard_stop_onehanded_holo.xml
@@ -1,4 +1,7 @@
-<!-- clipart available in Android Studio, Apache License 2.0 -->
+<!--
+    icon available in Android Studio
+    SPDX-License-Identifier: Apache-2.0
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="32dp"
     android:width="32dp"
diff --git a/app/src/main/res/drawable/sym_keyboard_stop_onehanded_lxx.xml b/app/src/main/res/drawable/sym_keyboard_stop_onehanded_lxx.xml
index 7867b4b2a..e6ad03a9b 100644
--- a/app/src/main/res/drawable/sym_keyboard_stop_onehanded_lxx.xml
+++ b/app/src/main/res/drawable/sym_keyboard_stop_onehanded_lxx.xml
@@ -1,4 +1,8 @@
-<!-- clipart available in Android Studio, Apache License 2.0 -->
+<!--
+    icon available in Android Studio
+    SPDX-License-Identifier: Apache-2.0
+-->
+<!-- todo: remove / merge with sym_keyboard_stop_onehanded_holo -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="24dp"
     android:width="24dp"
diff --git a/app/src/main/res/drawable/sym_keyboard_switch_onehanded_holo.xml b/app/src/main/res/drawable/sym_keyboard_switch_onehanded_holo.xml
index 55909de62..cbf7391e8 100644
--- a/app/src/main/res/drawable/sym_keyboard_switch_onehanded_holo.xml
+++ b/app/src/main/res/drawable/sym_keyboard_switch_onehanded_holo.xml
@@ -1,4 +1,8 @@
-<!-- clipart available in Android Studio, Apache License 2.0 -->
+<!--
+    icon available in Android Studio
+    SPDX-License-Identifier: Apache-2.0
+-->
+<!-- todo: remove / merge with ic_arrow_left -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="32dp"
     android:width="32dp"
diff --git a/app/src/main/res/drawable/sym_keyboard_tab_lxx.xml b/app/src/main/res/drawable/sym_keyboard_tab_lxx.xml
index 829071f16..ce9839744 100644
--- a/app/src/main/res/drawable/sym_keyboard_tab_lxx.xml
+++ b/app/src/main/res/drawable/sym_keyboard_tab_lxx.xml
@@ -1,4 +1,7 @@
-<!-- clipart available in Android Studio, Apache License 2.0 -->
+<!--
+    icon available in Android Studio
+    SPDX-License-Identifier: Apache-2.0
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="24dp"
     android:width="24dp"
diff --git a/app/src/main/res/drawable/sym_keyboard_voice_lxx.xml b/app/src/main/res/drawable/sym_keyboard_voice_lxx.xml
index daf086bee..5f8caf4de 100644
--- a/app/src/main/res/drawable/sym_keyboard_voice_lxx.xml
+++ b/app/src/main/res/drawable/sym_keyboard_voice_lxx.xml
@@ -1,4 +1,7 @@
-<!-- clipart available in Android Studio, Apache License 2.0 -->
+<!--
+    icon available in Android Studio
+    SPDX-License-Identifier: Apache-2.0
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="24dp"
     android:width="24dp"
diff --git a/app/src/main/res/drawable/sym_keyboard_voice_off_lxx.xml b/app/src/main/res/drawable/sym_keyboard_voice_off_lxx.xml
index 3cf23af56..9aeeee63d 100644
--- a/app/src/main/res/drawable/sym_keyboard_voice_off_lxx.xml
+++ b/app/src/main/res/drawable/sym_keyboard_voice_off_lxx.xml
@@ -1,4 +1,7 @@
-<!-- clipart available in Android Studio, Apache License 2.0 -->
+<!--
+    icon available in Android Studio
+    SPDX-License-Identifier: Apache-2.0
+-->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="24dp"
     android:width="24dp"