diff --git a/java/res/values/strings-emoji-descriptions.xml b/java/res/values/strings-emoji-descriptions.xml
index 3799a23d0..8cbde264c 100644
--- a/java/res/values/strings-emoji-descriptions.xml
+++ b/java/res/values/strings-emoji-descriptions.xml
@@ -54,10 +54,6 @@
Watch
Hourglass
-
- Keyboard
-
- Eject symbol
Black right-pointing double triangle
@@ -66,26 +62,10 @@
Black up-pointing double triangle
Black down-pointing double triangle
-
- Black right-pointing double triangle with vertical bar
-
- Black left-pointing double triangle with vertical bar
-
- Black right-pointing triangle with double vertical bar
Alarm clock
-
- Stopwatch
-
- Timer clock
Hourglass with flowing sand
-
- Double vertical bar
-
- Black square for stop
-
- Black circle for record
Circled latin capital letter m
@@ -108,12 +88,6 @@
Black sun with rays
Cloud
-
- Umbrella
-
- Snowman
-
- Comet
Black telephone
@@ -122,28 +96,8 @@
Umbrella with rain drops
Hot beverage
-
- Shamrock
White up pointing index
-
- Skull and crossbones
-
- Radioactive sign
-
- Biohazard sign
-
- Orthodox cross
-
- Star and crescent
-
- Peace symbol
-
- Yin yang
-
- Wheel of dharma
-
- White frowning face
White smiling face
@@ -184,22 +138,8 @@
Black universal recycling symbol
Wheelchair symbol
-
- Hammer and pick
Anchor
-
- Crossed swords
-
- Scales
-
- Alembic
-
- Gear
-
- Atom symbol
-
- Fleur-de-lis
Warning sign
@@ -208,10 +148,6 @@
Medium white circle
Medium black circle
-
- Coffin
-
- Funeral urn
Soccer ball
@@ -220,40 +156,18 @@
Snowman without snow
Sun behind cloud
-
- Thunder cloud and rain
Ophiuchus
-
- Pick
-
- Helmet with white cross
-
- Chains
No entry
-
- Shinto shrine
Church
-
- Mountain
-
- Umbrella on ground
Fountain
Flag in hole
-
- Ferry
Sailboat
-
- Skier
-
- Ice skate
-
- Person with ball
Tent
@@ -272,8 +186,6 @@
Raised hand
Victory hand
-
- Writing hand
Pencil
@@ -282,10 +194,6 @@
Heavy check mark
Heavy multiplication x
-
- Latin cross
-
- Star of David
Sparkles
@@ -308,8 +216,6 @@
White exclamation mark ornament
Heavy exclamation mark symbol
-
- Heavy heart exclamation mark ornament
Heavy black heart
@@ -480,32 +386,6 @@
Glowing star
Shooting star
-
- Thermometer
-
- White sun with small cloud
-
- White sun behind cloud
-
- White sun behind cloud with rain
-
- Cloud with rain
-
- Cloud with snow
-
- Cloud with lightning
-
- Cloud with tornado
-
- Fog
-
- Wind blowing face
-
- Hot dog
-
- Taco
-
- Burrito
Chestnut
@@ -518,8 +398,6 @@
Palm tree
Cactus
-
- Hot pepper
Tulip
@@ -660,12 +538,6 @@
Clinking beer mugs
Baby bottle
-
- Fork and knife with plate
-
- Bottle with popping cork
-
- Popcorn
Ribbon
@@ -706,20 +578,6 @@
School satchel
Graduation cap
-
- Military medal
-
- Reminder ribbon
-
- Studio microphone
-
- Level slider
-
- Control knobs
-
- Film frames
-
- Admission tickets
Carousel horse
@@ -794,8 +652,6 @@
Runner
Surfer
-
- Sports medal
Trophy
@@ -806,48 +662,6 @@
Rugby football
Swimmer
-
- Weight lifter
-
- Golfer
-
- Racing motorcycle
-
- Racing car
-
- Cricket bat and ball
-
- Volleyball
-
- Field hockey stick and ball
-
- Ice hockey stick and puck
-
- Table tennis paddle and ball
-
- Snow capped mountain
-
- Camping
-
- Beach with umbrella
-
- Building construction
-
- House buildings
-
- Cityscape
-
- Derelict house building
-
- Classical building
-
- Desert
-
- Desert island
-
- National park
-
- Stadium
House building
@@ -882,30 +696,6 @@
Japanese castle
European castle
-
- Waving white flag
-
- Waving black flag
-
- Rosette
-
- Label
-
- Badminton racquet and shuttlecock
-
- Bow and arrow
-
- Amphora
-
- Emoji modifier Fitzpatrick type-1-2
-
- Emoji modifier Fitzpatrick type-3
-
- Emoji modifier Fitzpatrick type-4
-
- Emoji modifier Fitzpatrick type-5
-
- Emoji modifier Fitzpatrick type-6
Rat
@@ -916,8 +706,6 @@
Water buffalo
Cow
-
- Tiger
Leopard
@@ -1032,12 +820,8 @@
Pig nose
Paw prints
-
- Chipmunk
Eyes
-
- Eye
Ear
@@ -1402,8 +1186,6 @@
Antenna with bars
Camera
-
- Camera with flash
Video camera
@@ -1412,10 +1194,6 @@
Radio
Videocassette
-
- Film projector
-
- Prayer beads
Twisted rightwards arrows
@@ -1540,18 +1318,6 @@
Up-pointing small red triangle
Down-pointing small red triangle
-
- Om symbol
-
- Dove of peace
-
- Kaaba
-
- Mosque
-
- Synagogue
-
- Menorah with nine branches
Clock face one oclock
@@ -1600,78 +1366,6 @@
Clock face eleven-thirty
Clock face twelve-thirty
-
- Candle
-
- Mantelpiece clock
-
- Hole
-
- Man in business suit levitating
-
- Sleuth or spy
-
- Dark sunglasses
-
- Spider
-
- Spider web
-
- Joystick
-
- Linked paperclips
-
- Lower left ballpoint pen
-
- Lower left fountain pen
-
- Lower left paintbrush
-
- Lower left crayon
-
- Raised hand with fingers splayed
-
- Reversed hand with middle finger extended
-
- Raised hand with part between middle and ring fingers
-
- Desktop computer
-
- Printer
-
- Three button mouse
-
- Trackball
-
- Frame with picture
-
- Card index dividers
-
- Card file box
-
- File cabinet
-
- Wastebasket
-
- Spiral note pad
-
- Spiral calendar pad
-
- Compression
-
- Old key
-
- Rolled-up newspaper
-
- Dagger knife
-
- Speaking head in silhouette
-
- Right anger bubble
-
- Ballot box with ballot
-
- World map
Mount fuji
@@ -1812,14 +1506,6 @@
Crying cat face
Weary cat face
-
- Slightly frowning face
-
- Slightly smiling face
-
- Upside-down face
-
- Face with rolling eyes
Face with no good gesture
@@ -1982,606 +1668,4 @@
Baggage claim
Left luggage
-
- Couch and lamp
-
- Sleeping accommodation
-
- Shopping bags
-
- Bellhop bell
-
- Bed
-
- Place of worship
-
- Hammer and wrench
-
- Shield
-
- Oil drum
-
- Motorway
-
- Railway track
-
- Motor boat
-
- Small airplane
-
- Airplane departure
-
- Airplane arriving
-
- Satellite
-
- Passenger ship
-
- Zipper-mouth face
-
- Money-mouth face
-
- Face with thermometer
-
- Nerd face
-
- Thinking face
-
- Face with head-bandage
-
- Robot face
-
- Hugging face
-
- Sign of the horns
-
- Crab
-
- Lion face
-
- Scorpion
-
- Turkey
-
- Unicorn face
-
- Cheese wedge
-
- Keycap number sign
-
- Keycap asterisk
-
- Keycap digit zero
-
- Keycap digit one
-
- Keycap digit two
-
- Keycap digit three
-
- Keycap digit four
-
- Keycap digit five
-
- Keycap digit six
-
- Keycap digit seven
-
- Keycap digit eight
-
- Keycap digit nine
-
- Flag for Ascension Island
-
- Flag for Andorra
-
- Flag for United Arab Emirates
-
- Flag for Afghanistan
-
- Flag for Antigua & Barbuda
-
- Flag for Anguilla
-
- Flag for Albania
-
- Flag for Armenia
-
- Flag for Angola
-
- Flag for Antarctica
-
- Flag for Argentina
-
- Flag for American Samoa
-
- Flag for Austria
-
- Flag for Australia
-
- Flag for Aruba
-
- Flag for Åland Islands
-
- Flag for Azerbaijan
-
- Flag for Bosnia & Herzegovina
-
- Flag for Barbados
-
- Flag for Bangladesh
-
- Flag for Belgium
-
- Flag for Burkina Faso
-
- Flag for Bulgaria
-
- Flag for Bahrain
-
- Flag for Burundi
-
- Flag for Benin
-
- Flag for St. Barthélemy
-
- Flag for Bermuda
-
- Flag for Brunei
-
- Flag for Bolivia
-
- Flag for Caribbean Netherlands
-
- Flag for Brazil
-
- Flag for Bahamas
-
- Flag for Bhutan
-
- Flag for Bouvet Island
-
- Flag for Botswana
-
- Flag for Belarus
-
- Flag for Belize
-
- Flag for Canada
-
- Flag for Cocos Islands
-
- Flag for Congo - Kinshasa
-
- Flag for Central African Republic
-
- Flag for Congo - Brazzaville
-
- Flag for Switzerland
-
- Flag for Côte d\'Ivoire
-
- Flag for Cook Islands
-
- Flag for Chile
-
- Flag for Cameroon
-
- Flag for China
-
- Flag for Colombia
-
- Flag for Clipperton Island
-
- Flag for Costa Rica
-
- Flag for Cuba
-
- Flag for Cape Verde
-
- Flag for Curaçao
-
- Flag for Christmas Island
-
- Flag for Cyprus
-
- Flag for Czech Republic
-
- Flag for Germany
-
- Flag for Diego Garcia
-
- Flag for Djibouti
-
- Flag for Denmark
-
- Flag for Dominica
-
- Flag for Dominican Republic
-
- Flag for Algeria
-
- Flag for Ceuta & Melilla
-
- Flag for Ecuador
-
- Flag for Estonia
-
- Flag for Egypt
-
- Flag for Western Sahara
-
- Flag for Eritrea
-
- Flag for Spain
-
- Flag for Ethiopia
-
- Flag for European Union
-
- Flag for Finland
-
- Flag for Fiji
-
- Flag for Falkland Islands
-
- Flag for Micronesia
-
- Flag for Faroe Islands
-
- Flag for France
-
- Flag for Gabon
-
- Flag for United Kingdom
-
- Flag for Grenada
-
- Flag for Georgia
-
- Flag for French Guiana
-
- Flag for Guernsey
-
- Flag for Ghana
-
- Flag for Gibraltar
-
- Flag for Greenland
-
- Flag for Gambia
-
- Flag for Guinea
-
- Flag for Guadeloupe
-
- Flag for Equatorial Guinea
-
- Flag for Greece
-
- Flag for South Georgia & South Sandwich Islands
-
- Flag for Guatemala
-
- Flag for Guam
-
- Flag for Guinea-Bissau
-
- Flag for Guyana
-
- Flag for Hong Kong
-
- Flag for Heard & McDonald Islands
-
- Flag for Honduras
-
- Flag for Croatia
-
- Flag for Haiti
-
- Flag for Hungary
-
- Flag for Canary Islands
-
- Flag for Indonesia
-
- Flag for Ireland
-
- Flag for Israel
-
- Flag for Isle of Man
-
- Flag for India
-
- Flag for British Indian Ocean Territory
-
- Flag for Iraq
-
- Flag for Iran
-
- Flag for Iceland
-
- Flag for Italy
-
- Flag for Jersey
-
- Flag for Jamaica
-
- Flag for Jordan
-
- Flag for Japan
-
- Flag for Kenya
-
- Flag for Kyrgyzstan
-
- Flag for Cambodia
-
- Flag for Kiribati
-
- Flag for Comoros
-
- Flag for St. Kitts & Nevis
-
- Flag for North Korea
-
- Flag for South Korea
-
- Flag for Kuwait
-
- Flag for Cayman Islands
-
- Flag for Kazakhstan
-
- Flag for Laos
-
- Flag for Lebanon
-
- Flag for St. Lucia
-
- Flag for Liechtenstein
-
- Flag for Sri Lanka
-
- Flag for Liberia
-
- Flag for Lesotho
-
- Flag for Lithuania
-
- Flag for Luxembourg
-
- Flag for Latvia
-
- Flag for Libya
-
- Flag for Morocco
-
- Flag for Monaco
-
- Flag for Moldova
-
- Flag for Montenegro
-
- Flag for St. Martin
-
- Flag for Madagascar
-
- Flag for Marshall Islands
-
- Flag for Macedonia
-
- Flag for Mali
-
- Flag for Myanmar
-
- Flag for Mongolia
-
- Flag for Macau
-
- Flag for Northern Mariana Islands
-
- Flag for Martinique
-
- Flag for Mauritania
-
- Flag for Montserrat
-
- Flag for Malta
-
- Flag for Mauritius
-
- Flag for Maldives
-
- Flag for Malawi
-
- Flag for Mexico
-
- Flag for Malaysia
-
- Flag for Mozambique
-
- Flag for Namibia
-
- Flag for New Caledonia
-
- Flag for Niger
-
- Flag for Norfolk Island
-
- Flag for Nigeria
-
- Flag for Nicaragua
-
- Flag for Netherlands
-
- Flag for Norway
-
- Flag for Nepal
-
- Flag for Nauru
-
- Flag for Niue
-
- Flag for New Zealand
-
- Flag for Oman
-
- Flag for Panama
-
- Flag for Peru
-
- Flag for French Polynesia
-
- Flag for Papua New Guinea
-
- Flag for Philippines
-
- Flag for Pakistan
-
- Flag for Poland
-
- Flag for St. Pierre & Miquelon
-
- Flag for Pitcairn Islands
-
- Flag for Puerto Rico
-
- Flag for Palestinian Territories
-
- Flag for Portugal
-
- Flag for Palau
-
- Flag for Paraguay
-
- Flag for Qatar
-
- Flag for Réunion
-
- Flag for Romania
-
- Flag for Serbia
-
- Flag for Russia
-
- Flag for Rwanda
-
- Flag for Saudi Arabia
-
- Flag for Solomon Islands
-
- Flag for Seychelles
-
- Flag for Sudan
-
- Flag for Sweden
-
- Flag for Singapore
-
- Flag for St. Helena
-
- Flag for Slovenia
-
- Flag for Svalbard & Jan Mayen
-
- Flag for Slovakia
-
- Flag for Sierra Leone
-
- Flag for San Marino
-
- Flag for Senegal
-
- Flag for Somalia
-
- Flag for Suriname
-
- Flag for South Sudan
-
- Flag for São Tomé & Príncipe
-
- Flag for El Salvador
-
- Flag for Sint Maarten
-
- Flag for Syria
-
- Flag for Swaziland
-
- Flag for Tristan da Cunha
-
- Flag for Turks & Caicos Islands
-
- Flag for Chad
-
- Flag for French Southern Territories
-
- Flag for Togo
-
- Flag for Thailand
-
- Flag for Tajikistan
-
- Flag for Tokelau
-
- Flag for Timor-Leste
-
- Flag for Turkmenistan
-
- Flag for Tunisia
-
- Flag for Tonga
-
- Flag for Turkey
-
- Flag for Trinidad & Tobago
-
- Flag for Tuvalu
-
- Flag for Taiwan
-
- Flag for Tanzania
-
- Flag for Ukraine
-
- Flag for Uganda
-
- Flag for U.S. Outlying Islands
-
- Flag for United States
-
- Flag for Uruguay
-
- Flag for Uzbekistan
-
- Flag for Vatican City
-
- Flag for St. Vincent & Grenadines
-
- Flag for Venezuela
-
- Flag for British Virgin Islands
-
- Flag for U.S. Virgin Islands
-
- Flag for Vietnam
-
- Flag for Vanuatu
-
- Flag for Wallis & Futuna
-
- Flag for Samoa
-
- Flag for Kosovo
-
- Flag for Yemen
-
- Flag for Mayotte
-
- Flag for South Africa
-
- Flag for Zambia
-
- Flag for Zimbabwe