Merge branch 'moveData' into 'master'

Move data files to module

See merge request !132

2826 files changed, 40 insertions, 30 deletions

diff --git a/autogen.sh b/autogen.sh
index 72fbe878a..776f47d7b 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -3,7 +3,7 @@
   CONF_ARGS=""
 
   echo "[encoding: UTF-8]" > po/POTFILES.in \
-  && for p in `ls data/gui/*.ui`; do echo "[type: gettext/glade]$p" >> \
+  && for p in `ls gajim/data/gui/*.ui`; do echo "[type: gettext/glade]$p" >> \
   po/POTFILES.in; done \
   && ls -1 data/org.gajim.Gajim.appdata.xml.in data/org.gajim.Gajim.desktop.in.in data/gajim-remote.desktop.in.in \
   gajim/*.py gajim/common/*.py gajim/command_system/*.py gajim/command_system/implementation/*.py gajim/common/zeroconf/*.py gajim/plugins/*.py | grep -v ipython_view.py >> \
diff --git a/configure.ac b/configure.ac
index 528da7752..03ec71a9d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -54,12 +54,13 @@ AC_SUBST(PACKAGE)
 AC_CONFIG_FILES([ 
 	Makefile
 	data/Makefile
-	data/gui/Makefile
-	data/emoticons/Makefile
+	gajim/data/Makefile
+	gajim/data/gui/Makefile
+	gajim/data/emoticons/Makefile
 	data/pixmaps/Makefile
-	data/iconsets/Makefile
-	data/moods/Makefile
-	data/activities/Makefile
+	gajim/data/iconsets/Makefile
+	gajim/data/moods/Makefile
+	gajim/data/activities/Makefile
 	icons/Makefile
 	data/org.gajim.Gajim.appdata.xml
 	data/org.gajim.Gajim.desktop.in
diff --git a/data/Makefile.am b/data/Makefile.am
index 2e22a4932..3b02d6d18 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = gui emoticons pixmaps iconsets moods activities
+SUBDIRS = pixmaps
 @INTLTOOL_DESKTOP_RULE@
 
 appstreamdir = $(datadir)/metainfo/
@@ -13,25 +13,12 @@ desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop)
 installdefsdir = $(gajim_srcdir)/common
 installdefs_DATA = defs.py
 
-soundsdir = $(pkgdatadir)/data/sounds
-sounds_DATA = $(srcdir)/sounds/*.wav
-
-styledir = $(pkgdatadir)/data/style
-style_DATA = $(srcdir)/style/*.css
-
-otherdir = $(pkgdatadir)/data/other
-other_DATA = other/servers.xml other/dh4096.pem
-# other/cacert.pem is used only on Windows. On Unix platforms
-# use CA certificates installed in /etc/ssl/certs
 
 man_MANS = gajim.1 gajim-remote.1 gajim-history-manager.1
 
 
 EXTRA_DIST = $(appstream_in_files) \
 			 $(desktop_in_files) \
-			 $(sounds_DATA) \
-			 $(style_DATA) \
-			 $(other_DATA) \
 			 $(man_MANS) \
 			 defs.py.in
 
diff --git a/gajim/Makefile.am b/gajim/Makefile.am
index 6bf92b1bd..c9bfb66bb 100644
--- a/gajim/Makefile.am
+++ b/gajim/Makefile.am
@@ -1,3 +1,5 @@
+SUBDIRS = data
+
 INCLUDES = \
 	$(PYTHON_INCLUDES)
 export MACOSX_DEPLOYMENT_TARGET=10.4
diff --git a/gajim/common/configpaths.py b/gajim/common/configpaths.py
index dc40d0969..20871109d 100644
--- a/gajim/common/configpaths.py
+++ b/gajim/common/configpaths.py
@@ -98,9 +98,11 @@ class ConfigPaths:
                 base = expand('~/.local/share')
             self.data_root = os.path.join(base, 'gajim')
 
-        basedir = os.environ.get('GAJIM_BASEDIR', defs.basedir)
+        import pkg_resources
+        basedir = pkg_resources.resource_filename("gajim", ".")
         self.add('DATA', None, os.path.join(basedir, 'data'))
         self.add('GUI', None, os.path.join(basedir, 'data', 'gui'))
+        basedir = os.environ.get('GAJIM_BASEDIR', defs.basedir)
         self.add('ICONS', None, os.path.join(basedir, 'icons'))
         self.add('HOME', None, os.path.expanduser('~'))
         self.add('PLUGINS_BASE', None, os.path.join(basedir, 'plugins'))
diff --git a/gajim/data/Makefile.am b/gajim/data/Makefile.am
new file mode 100644
index 000000000..bee085790
--- /dev/null
+++ b/gajim/data/Makefile.am
@@ -0,0 +1,19 @@
+SUBDIRS = gui emoticons iconsets moods activities
+@INTLTOOL_DESKTOP_RULE@
+
+soundsdir = $(gajim_srcdir)/data/sounds
+sounds_DATA = $(srcdir)/sounds/*.wav
+
+styledir = $(gajim_srcdir)/data/style
+style_DATA = $(srcdir)/style/*.css
+
+otherdir = $(gajim_srcdir)/data/other
+other_DATA = other/servers.xml other/dh4096.pem
+# other/cacert.pem is used only on Windows. On Unix platforms
+# use CA certificates installed in /etc/ssl/certs
+
+EXTRA_DIST = $(sounds_DATA) \
+			 $(style_DATA) \
+			 $(other_DATA)
+
+MAINTAINERCLEANFILES = Makefile.in
diff --git a/data/activities/Makefile.am b/gajim/data/activities/Makefile.am
index a0f242a53..12f725a6b 100644
--- a/data/activities/Makefile.am
+++ b/gajim/data/activities/Makefile.am
@@ -1,4 +1,4 @@
-activitiesdir = $(pkgdatadir)/data/activities
+activitiesdir = $(gajim_srcdir)/data/activities
 nobase_dist_activities_DATA = $(srcdir)/*/*/*
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/data/activities/default/doing_chores/buying_groceries.png b/gajim/data/activities/default/doing_chores/buying_groceries.png
index d8acaee14..d8acaee14 100644
--- a/data/activities/default/doing_chores/buying_groceries.png
+++ b/gajim/data/activities/default/doing_chores/buying_groceries.png
diff --git a/data/activities/default/doing_chores/category.png b/gajim/data/activities/default/doing_chores/category.png
index dbda52db9..dbda52db9 100644
--- a/data/activities/default/doing_chores/category.png
+++ b/gajim/data/activities/default/doing_chores/category.png
diff --git a/data/activities/default/doing_chores/cleaning.png b/gajim/data/activities/default/doing_chores/cleaning.png
index 18549f38a..18549f38a 100644
--- a/data/activities/default/doing_chores/cleaning.png
+++ b/gajim/data/activities/default/doing_chores/cleaning.png
diff --git a/data/activities/default/doing_chores/cooking.png b/gajim/data/activities/default/doing_chores/cooking.png
index bcd238539..bcd238539 100644
--- a/data/activities/default/doing_chores/cooking.png
+++ b/gajim/data/activities/default/doing_chores/cooking.png
diff --git a/data/activities/default/doing_chores/doing_maintenance.png b/gajim/data/activities/default/doing_chores/doing_maintenance.png
index 514103474..514103474 100644
--- a/data/activities/default/doing_chores/doing_maintenance.png
+++ b/gajim/data/activities/default/doing_chores/doing_maintenance.png
diff --git a/data/activities/default/doing_chores/doing_the_dishes.png b/gajim/data/activities/default/doing_chores/doing_the_dishes.png
index 77b6d87c8..77b6d87c8 100644
--- a/data/activities/default/doing_chores/doing_the_dishes.png
+++ b/gajim/data/activities/default/doing_chores/doing_the_dishes.png
diff --git a/data/activities/default/doing_chores/doing_the_laundry.png b/gajim/data/activities/default/doing_chores/doing_the_laundry.png
index e11c86cee..e11c86cee 100644
--- a/data/activities/default/doing_chores/doing_the_laundry.png
+++ b/gajim/data/activities/default/doing_chores/doing_the_laundry.png
diff --git a/data/activities/default/doing_chores/gardening.png b/gajim/data/activities/default/doing_chores/gardening.png
index 3e0415b55..3e0415b55 100644
--- a/data/activities/default/doing_chores/gardening.png
+++ b/gajim/data/activities/default/doing_chores/gardening.png
diff --git a/data/activities/default/doing_chores/running_an_errand.png b/gajim/data/activities/default/doing_chores/running_an_errand.png
index c1817390f..c1817390f 100644
--- a/data/activities/default/doing_chores/running_an_errand.png
+++ b/gajim/data/activities/default/doing_chores/running_an_errand.png
diff --git a/data/activities/default/doing_chores/walking_the_dog.png b/gajim/data/activities/default/doing_chores/walking_the_dog.png
index de96a9e20..de96a9e20 100644
--- a/data/activities/default/doing_chores/walking_the_dog.png
+++ b/gajim/data/activities/default/doing_chores/walking_the_dog.png
diff --git a/data/activities/default/drinking/category.png b/gajim/data/activities/default/drinking/category.png
index 1c231d0d3..1c231d0d3 100644
--- a/data/activities/default/drinking/category.png
+++ b/gajim/data/activities/default/drinking/category.png
diff --git a/data/activities/default/drinking/having_a_beer.png b/gajim/data/activities/default/drinking/having_a_beer.png
index 433368930..433368930 100644
--- a/data/activities/default/drinking/having_a_beer.png
+++ b/gajim/data/activities/default/drinking/having_a_beer.png
diff --git a/data/activities/default/drinking/having_coffee.png b/gajim/data/activities/default/drinking/having_coffee.png
index c27608b53..c27608b53 100644
--- a/data/activities/default/drinking/having_coffee.png
+++ b/gajim/data/activities/default/drinking/having_coffee.png
diff --git a/data/activities/default/drinking/having_tea.png b/gajim/data/activities/default/drinking/having_tea.png
index 8ca497048..8ca497048 100644
--- a/data/activities/default/drinking/having_tea.png
+++ b/gajim/data/activities/default/drinking/having_tea.png
diff --git a/data/activities/default/eating/category.png b/gajim/data/activities/default/eating/category.png
index f3a808f20..f3a808f20 100644
--- a/data/activities/default/eating/category.png
+++ b/gajim/data/activities/default/eating/category.png
diff --git a/data/activities/default/eating/having_a_snack.png b/gajim/data/activities/default/eating/having_a_snack.png
index f6d699c84..f6d699c84 100644
--- a/data/activities/default/eating/having_a_snack.png
+++ b/gajim/data/activities/default/eating/having_a_snack.png
diff --git a/data/activities/default/eating/having_breakfast.png b/gajim/data/activities/default/eating/having_breakfast.png
index eced76e94..eced76e94 100644
--- a/data/activities/default/eating/having_breakfast.png
+++ b/gajim/data/activities/default/eating/having_breakfast.png
diff --git a/data/activities/default/eating/having_dinner.png b/gajim/data/activities/default/eating/having_dinner.png
index 93b283b32..93b283b32 100644
--- a/data/activities/default/eating/having_dinner.png
+++ b/gajim/data/activities/default/eating/having_dinner.png
diff --git a/data/activities/default/eating/having_lunch.png b/gajim/data/activities/default/eating/having_lunch.png
index a25a5c6a8..a25a5c6a8 100644
--- a/data/activities/default/eating/having_lunch.png
+++ b/gajim/data/activities/default/eating/having_lunch.png
diff --git a/data/activities/default/exercising/category.png b/gajim/data/activities/default/exercising/category.png
index de3e6b12b..de3e6b12b 100644
--- a/data/activities/default/exercising/category.png
+++ b/gajim/data/activities/default/exercising/category.png
diff --git a/data/activities/default/exercising/cycling.png b/gajim/data/activities/default/exercising/cycling.png
index 9d97f656b..9d97f656b 100644
--- a/data/activities/default/exercising/cycling.png
+++ b/gajim/data/activities/default/exercising/cycling.png
diff --git a/data/activities/default/exercising/dancing.png b/gajim/data/activities/default/exercising/dancing.png
index 38ac123ae..38ac123ae 100644
--- a/data/activities/default/exercising/dancing.png
+++ b/gajim/data/activities/default/exercising/dancing.png
diff --git a/data/activities/default/exercising/hiking.png b/gajim/data/activities/default/exercising/hiking.png
index 541d308aa..541d308aa 100644
--- a/data/activities/default/exercising/hiking.png
+++ b/gajim/data/activities/default/exercising/hiking.png
diff --git a/data/activities/default/exercising/jogging.png b/gajim/data/activities/default/exercising/jogging.png
index d7c98bbee..d7c98bbee 100644
--- a/data/activities/default/exercising/jogging.png
+++ b/gajim/data/activities/default/exercising/jogging.png
diff --git a/data/activities/default/exercising/playing_sports.png b/gajim/data/activities/default/exercising/playing_sports.png
index 33e32e6a6..33e32e6a6 100644
--- a/data/activities/default/exercising/playing_sports.png
+++ b/gajim/data/activities/default/exercising/playing_sports.png
diff --git a/data/activities/default/exercising/running.png b/gajim/data/activities/default/exercising/running.png
index 85237cfd3..85237cfd3 100644
--- a/data/activities/default/exercising/running.png
+++ b/gajim/data/activities/default/exercising/running.png
diff --git a/data/activities/default/exercising/skiing.png b/gajim/data/activities/default/exercising/skiing.png
index b33bb97bb..b33bb97bb 100644
--- a/data/activities/default/exercising/skiing.png
+++ b/gajim/data/activities/default/exercising/skiing.png
diff --git a/data/activities/default/exercising/swimming.png b/gajim/data/activities/default/exercising/swimming.png
index fad7c6ced..fad7c6ced 100644
--- a/data/activities/default/exercising/swimming.png
+++ b/gajim/data/activities/default/exercising/swimming.png
diff --git a/data/activities/default/exercising/working_out.png b/gajim/data/activities/default/exercising/working_out.png
index a706e6046..a706e6046 100644
--- a/data/activities/default/exercising/working_out.png
+++ b/gajim/data/activities/default/exercising/working_out.png
diff --git a/data/activities/default/grooming/at_the_spa.png b/gajim/data/activities/default/grooming/at_the_spa.png
index a4db43a86..a4db43a86 100644
--- a/data/activities/default/grooming/at_the_spa.png
+++ b/gajim/data/activities/default/grooming/at_the_spa.png
diff --git a/data/activities/default/grooming/brushing_teeth.png b/gajim/data/activities/default/grooming/brushing_teeth.png
index f24d0773d..f24d0773d 100644
--- a/data/activities/default/grooming/brushing_teeth.png
+++ b/gajim/data/activities/default/grooming/brushing_teeth.png
diff --git a/data/activities/default/grooming/category.png b/gajim/data/activities/default/grooming/category.png
index 3c9a0e5e8..3c9a0e5e8 100644
--- a/data/activities/default/grooming/category.png
+++ b/gajim/data/activities/default/grooming/category.png
diff --git a/data/activities/default/grooming/getting_a_haircut.png b/gajim/data/activities/default/grooming/getting_a_haircut.png
index 13396d71e..13396d71e 100644
--- a/data/activities/default/grooming/getting_a_haircut.png
+++ b/gajim/data/activities/default/grooming/getting_a_haircut.png
diff --git a/data/activities/default/grooming/shaving.png b/gajim/data/activities/default/grooming/shaving.png
index d1da19f22..d1da19f22 100644
--- a/data/activities/default/grooming/shaving.png
+++ b/gajim/data/activities/default/grooming/shaving.png
diff --git a/data/activities/default/grooming/taking_a_bath.png b/gajim/data/activities/default/grooming/taking_a_bath.png
index f487cc25d..f487cc25d 100644
--- a/data/activities/default/grooming/taking_a_bath.png
+++ b/gajim/data/activities/default/grooming/taking_a_bath.png
diff --git a/data/activities/default/grooming/taking_a_shower.png b/gajim/data/activities/default/grooming/taking_a_shower.png
index e68f209b9..e68f209b9 100644
--- a/data/activities/default/grooming/taking_a_shower.png
+++ b/gajim/data/activities/default/grooming/taking_a_shower.png
diff --git a/data/activities/default/having_appointment/category.png b/gajim/data/activities/default/having_appointment/category.png
index 172778edd..172778edd 100644
--- a/data/activities/default/having_appointment/category.png
+++ b/gajim/data/activities/default/having_appointment/category.png
diff --git a/data/activities/default/inactive/category.png b/gajim/data/activities/default/inactive/category.png
index 99e1edf7f..99e1edf7f 100644
--- a/data/activities/default/inactive/category.png
+++ b/gajim/data/activities/default/inactive/category.png
diff --git a/data/activities/default/inactive/day_off.png b/gajim/data/activities/default/inactive/day_off.png
index 474a3ec6c..474a3ec6c 100644
--- a/data/activities/default/inactive/day_off.png
+++ b/gajim/data/activities/default/inactive/day_off.png
diff --git a/data/activities/default/inactive/hanging_out.png b/gajim/data/activities/default/inactive/hanging_out.png
index c06931f44..c06931f44 100644
--- a/data/activities/default/inactive/hanging_out.png
+++ b/gajim/data/activities/default/inactive/hanging_out.png
diff --git a/data/activities/default/inactive/hiding.png b/gajim/data/activities/default/inactive/hiding.png
index 80b204880..80b204880 100644
--- a/data/activities/default/inactive/hiding.png
+++ b/gajim/data/activities/default/inactive/hiding.png
diff --git a/data/activities/default/inactive/on_vacation.png b/gajim/data/activities/default/inactive/on_vacation.png
index 487848d7b..487848d7b 100644
--- a/data/activities/default/inactive/on_vacation.png
+++ b/gajim/data/activities/default/inactive/on_vacation.png
diff --git a/data/activities/default/inactive/praying.png b/gajim/data/activities/default/inactive/praying.png
index 7b27307a6..7b27307a6 100644
--- a/data/activities/default/inactive/praying.png
+++ b/gajim/data/activities/default/inactive/praying.png
diff --git a/data/activities/default/inactive/scheduled_holiday.png b/gajim/data/activities/default/inactive/scheduled_holiday.png
index 27ad10a7e..27ad10a7e 100644
--- a/data/activities/default/inactive/scheduled_holiday.png
+++ b/gajim/data/activities/default/inactive/scheduled_holiday.png
diff --git a/data/activities/default/inactive/sleeping.png b/gajim/data/activities/default/inactive/sleeping.png
index 521fc5520..521fc5520 100644
--- a/data/activities/default/inactive/sleeping.png
+++ b/gajim/data/activities/default/inactive/sleeping.png
diff --git a/data/activities/default/inactive/thinking.png b/gajim/data/activities/default/inactive/thinking.png
index f57ba9fdb..f57ba9fdb 100644
--- a/data/activities/default/inactive/thinking.png
+++ b/gajim/data/activities/default/inactive/thinking.png
diff --git a/data/activities/default/relaxing/category.png b/gajim/data/activities/default/relaxing/category.png
index f9abba0e0..f9abba0e0 100644
--- a/data/activities/default/relaxing/category.png
+++ b/gajim/data/activities/default/relaxing/category.png
diff --git a/data/activities/default/relaxing/fishing.png b/gajim/data/activities/default/relaxing/fishing.png
index 81ae46c4b..81ae46c4b 100644
--- a/data/activities/default/relaxing/fishing.png
+++ b/gajim/data/activities/default/relaxing/fishing.png
diff --git a/data/activities/default/relaxing/gaming.png b/gajim/data/activities/default/relaxing/gaming.png
index 1a817fbc3..1a817fbc3 100644
--- a/data/activities/default/relaxing/gaming.png
+++ b/gajim/data/activities/default/relaxing/gaming.png
diff --git a/data/activities/default/relaxing/going_out.png b/gajim/data/activities/default/relaxing/going_out.png
index 05bf1c1f8..05bf1c1f8 100644
--- a/data/activities/default/relaxing/going_out.png
+++ b/gajim/data/activities/default/relaxing/going_out.png
diff --git a/data/activities/default/relaxing/partying.png b/gajim/data/activities/default/relaxing/partying.png
index 31835b5ed..31835b5ed 100644
--- a/data/activities/default/relaxing/partying.png
+++ b/gajim/data/activities/default/relaxing/partying.png
diff --git a/data/activities/default/relaxing/reading.png b/gajim/data/activities/default/relaxing/reading.png
index 4e7eb8c54..4e7eb8c54 100644
--- a/data/activities/default/relaxing/reading.png
+++ b/gajim/data/activities/default/relaxing/reading.png
diff --git a/data/activities/default/relaxing/rehearsing.png b/gajim/data/activities/default/relaxing/rehearsing.png
index 5be9a8b2d..5be9a8b2d 100644
--- a/data/activities/default/relaxing/rehearsing.png
+++ b/gajim/data/activities/default/relaxing/rehearsing.png
diff --git a/data/activities/default/relaxing/shopping.png b/gajim/data/activities/default/relaxing/shopping.png
index 8f969fb7b..8f969fb7b 100644
--- a/data/activities/default/relaxing/shopping.png
+++ b/gajim/data/activities/default/relaxing/shopping.png
diff --git a/data/activities/default/relaxing/smoking.png b/gajim/data/activities/default/relaxing/smoking.png
index ba620a9dc..ba620a9dc 100644
--- a/data/activities/default/relaxing/smoking.png
+++ b/gajim/data/activities/default/relaxing/smoking.png
diff --git a/data/activities/default/relaxing/socializing.png b/gajim/data/activities/default/relaxing/socializing.png
index 45fe7fc5b..45fe7fc5b 100644
--- a/data/activities/default/relaxing/socializing.png
+++ b/gajim/data/activities/default/relaxing/socializing.png
diff --git a/data/activities/default/relaxing/sunbathing.png b/gajim/data/activities/default/relaxing/sunbathing.png
index 8d6e2c94e..8d6e2c94e 100644
--- a/data/activities/default/relaxing/sunbathing.png
+++ b/gajim/data/activities/default/relaxing/sunbathing.png
diff --git a/data/activities/default/relaxing/watching_a_movie.png b/gajim/data/activities/default/relaxing/watching_a_movie.png
index bd66835d7..bd66835d7 100644
--- a/data/activities/default/relaxing/watching_a_movie.png
+++ b/gajim/data/activities/default/relaxing/watching_a_movie.png
diff --git a/data/activities/default/relaxing/watching_tv.png b/gajim/data/activities/default/relaxing/watching_tv.png
index 82255b80c..82255b80c 100644
--- a/data/activities/default/relaxing/watching_tv.png
+++ b/gajim/data/activities/default/relaxing/watching_tv.png
diff --git a/data/activities/default/talking/category.png b/gajim/data/activities/default/talking/category.png
index 7c2617274..7c2617274 100644
--- a/data/activities/default/talking/category.png
+++ b/gajim/data/activities/default/talking/category.png
diff --git a/data/activities/default/talking/in_real_life.png b/gajim/data/activities/default/talking/in_real_life.png
index 76c96eaaa..76c96eaaa 100644
--- a/data/activities/default/talking/in_real_life.png
+++ b/gajim/data/activities/default/talking/in_real_life.png
diff --git a/data/activities/default/talking/on_the_phone.png b/gajim/data/activities/default/talking/on_the_phone.png
index bdfb88001..bdfb88001 100644
--- a/data/activities/default/talking/on_the_phone.png
+++ b/gajim/data/activities/default/talking/on_the_phone.png
diff --git a/data/activities/default/talking/on_video_phone.png b/gajim/data/activities/default/talking/on_video_phone.png
index 672c43805..672c43805 100644
--- a/data/activities/default/talking/on_video_phone.png
+++ b/gajim/data/activities/default/talking/on_video_phone.png
diff --git a/data/activities/default/traveling/category.png b/gajim/data/activities/default/traveling/category.png
index b029a5aa5..b029a5aa5 100644
--- a/data/activities/default/traveling/category.png
+++ b/gajim/data/activities/default/traveling/category.png
diff --git a/data/activities/default/traveling/commuting.png b/gajim/data/activities/default/traveling/commuting.png
index 525edb6fc..525edb6fc 100644
--- a/data/activities/default/traveling/commuting.png
+++ b/gajim/data/activities/default/traveling/commuting.png
diff --git a/data/activities/default/traveling/cycling.png b/gajim/data/activities/default/traveling/cycling.png
index cae6ffbe7..cae6ffbe7 100644
--- a/data/activities/default/traveling/cycling.png
+++ b/gajim/data/activities/default/traveling/cycling.png
diff --git a/data/activities/default/traveling/driving.png b/gajim/data/activities/default/traveling/driving.png
index 081300d86..081300d86 100644
--- a/data/activities/default/traveling/driving.png
+++ b/gajim/data/activities/default/traveling/driving.png
diff --git a/data/activities/default/traveling/in_a_car.png b/gajim/data/activities/default/traveling/in_a_car.png
index 8a4d18d05..8a4d18d05 100644
--- a/data/activities/default/traveling/in_a_car.png
+++ b/gajim/data/activities/default/traveling/in_a_car.png
diff --git a/data/activities/default/traveling/on_a_bus.png b/gajim/data/activities/default/traveling/on_a_bus.png
index 7bacc1e67..7bacc1e67 100644
--- a/data/activities/default/traveling/on_a_bus.png
+++ b/gajim/data/activities/default/traveling/on_a_bus.png
diff --git a/data/activities/default/traveling/on_a_plane.png b/gajim/data/activities/default/traveling/on_a_plane.png
index 7c38c58d0..7c38c58d0 100644
--- a/data/activities/default/traveling/on_a_plane.png
+++ b/gajim/data/activities/default/traveling/on_a_plane.png
diff --git a/data/activities/default/traveling/on_a_train.png b/gajim/data/activities/default/traveling/on_a_train.png
index b17ce472f..b17ce472f 100644
--- a/data/activities/default/traveling/on_a_train.png
+++ b/gajim/data/activities/default/traveling/on_a_train.png
diff --git a/data/activities/default/traveling/on_a_trip.png b/gajim/data/activities/default/traveling/on_a_trip.png
index fbcc243ee..fbcc243ee 100644
--- a/data/activities/default/traveling/on_a_trip.png
+++ b/gajim/data/activities/default/traveling/on_a_trip.png
diff --git a/data/activities/default/traveling/walking.png b/gajim/data/activities/default/traveling/walking.png
index 2bea3d1c5..2bea3d1c5 100644
--- a/data/activities/default/traveling/walking.png
+++ b/gajim/data/activities/default/traveling/walking.png
diff --git a/data/activities/default/unknown/category.png b/gajim/data/activities/default/unknown/category.png
index 63d9034cb..63d9034cb 100644
--- a/data/activities/default/unknown/category.png
+++ b/gajim/data/activities/default/unknown/category.png
diff --git a/data/activities/default/working/category.png b/gajim/data/activities/default/working/category.png
index c0e478fb7..c0e478fb7 100644
--- a/data/activities/default/working/category.png
+++ b/gajim/data/activities/default/working/category.png
diff --git a/data/activities/default/working/coding.png b/gajim/data/activities/default/working/coding.png
index 0105225fe..0105225fe 100644
--- a/data/activities/default/working/coding.png
+++ b/gajim/data/activities/default/working/coding.png
diff --git a/data/activities/default/working/in_a_meeting.png b/gajim/data/activities/default/working/in_a_meeting.png
index 4870e6843..4870e6843 100644
--- a/data/activities/default/working/in_a_meeting.png
+++ b/gajim/data/activities/default/working/in_a_meeting.png
diff --git a/data/activities/default/working/studying.png b/gajim/data/activities/default/working/studying.png
index b05fa8477..b05fa8477 100644
--- a/data/activities/default/working/studying.png
+++ b/gajim/data/activities/default/working/studying.png
diff --git a/data/activities/default/working/writing.png b/gajim/data/activities/default/working/writing.png
index c63554e39..c63554e39 100644
--- a/data/activities/default/working/writing.png
+++ b/gajim/data/activities/default/working/writing.png
diff --git a/data/emoticons/Makefile.am b/gajim/data/emoticons/Makefile.am
index 96bd7b843..417267dd6 100644
--- a/data/emoticons/Makefile.am
+++ b/gajim/data/emoticons/Makefile.am
@@ -1,4 +1,4 @@
-emoticonsdir = $(pkgdatadir)/data/emoticons
+emoticonsdir = $(gajim_srcdir)/data/emoticons
 nobase_dist_emoticons_DATA = \
 	$(srcdir)/*/*.png \
 	$(srcdir)/*/LICENSE \
diff --git a/data/emoticons/font-emoticons/emoticons_theme.py b/gajim/data/emoticons/font-emoticons/emoticons_theme.py
index 32940f434..32940f434 100644
--- a/data/emoticons/font-emoticons/emoticons_theme.py
+++ b/gajim/data/emoticons/font-emoticons/emoticons_theme.py
diff --git a/data/emoticons/noto-emoticons/LICENSE b/gajim/data/emoticons/noto-emoticons/LICENSE
index ece823a0f..ece823a0f 100644
--- a/data/emoticons/noto-emoticons/LICENSE
+++ b/gajim/data/emoticons/noto-emoticons/LICENSE
diff --git a/data/emoticons/noto-emoticons/README.md b/gajim/data/emoticons/noto-emoticons/README.md
index 9cdc58221..9cdc58221 100644
--- a/data/emoticons/noto-emoticons/README.md
+++ b/gajim/data/emoticons/noto-emoticons/README.md
diff --git a/data/emoticons/noto-emoticons/emoticons.png b/gajim/data/emoticons/noto-emoticons/emoticons.png
index 47bd33f36..47bd33f36 100644
--- a/data/emoticons/noto-emoticons/emoticons.png
+++ b/gajim/data/emoticons/noto-emoticons/emoticons.png
diff --git a/data/emoticons/noto-emoticons/emoticons_theme.py b/gajim/data/emoticons/noto-emoticons/emoticons_theme.py
index 00d2d438b..00d2d438b 100644
--- a/data/emoticons/noto-emoticons/emoticons_theme.py
+++ b/gajim/data/emoticons/noto-emoticons/emoticons_theme.py
diff --git a/data/emoticons/noto-emoticons/png/u0023.png b/gajim/data/emoticons/noto-emoticons/png/u0023.png
index e268dfb87..e268dfb87 100644
--- a/data/emoticons/noto-emoticons/png/u0023.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u0023.png
diff --git a/data/emoticons/noto-emoticons/png/u0023_20e3.png b/gajim/data/emoticons/noto-emoticons/png/u0023_20e3.png
index 94db62de6..94db62de6 100644
--- a/data/emoticons/noto-emoticons/png/u0023_20e3.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u0023_20e3.png
diff --git a/data/emoticons/noto-emoticons/png/u002a.png b/gajim/data/emoticons/noto-emoticons/png/u002a.png
index 3fd8413a0..3fd8413a0 100644
--- a/data/emoticons/noto-emoticons/png/u002a.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u002a.png
diff --git a/data/emoticons/noto-emoticons/png/u002a_20e3.png b/gajim/data/emoticons/noto-emoticons/png/u002a_20e3.png
index cfdbe98d3..cfdbe98d3 100644
--- a/data/emoticons/noto-emoticons/png/u002a_20e3.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u002a_20e3.png
diff --git a/data/emoticons/noto-emoticons/png/u0030.png b/gajim/data/emoticons/noto-emoticons/png/u0030.png
index 720a1b1f3..720a1b1f3 100644
--- a/data/emoticons/noto-emoticons/png/u0030.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u0030.png
diff --git a/data/emoticons/noto-emoticons/png/u0030_20e3.png b/gajim/data/emoticons/noto-emoticons/png/u0030_20e3.png
index c14047c83..c14047c83 100644
--- a/data/emoticons/noto-emoticons/png/u0030_20e3.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u0030_20e3.png
diff --git a/data/emoticons/noto-emoticons/png/u0031.png b/gajim/data/emoticons/noto-emoticons/png/u0031.png
index dc7881ae8..dc7881ae8 100644
--- a/data/emoticons/noto-emoticons/png/u0031.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u0031.png
diff --git a/data/emoticons/noto-emoticons/png/u0031_20e3.png b/gajim/data/emoticons/noto-emoticons/png/u0031_20e3.png
index f402cc04c..f402cc04c 100644
--- a/data/emoticons/noto-emoticons/png/u0031_20e3.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u0031_20e3.png
diff --git a/data/emoticons/noto-emoticons/png/u0032.png b/gajim/data/emoticons/noto-emoticons/png/u0032.png
index 98b760697..98b760697 100644
--- a/data/emoticons/noto-emoticons/png/u0032.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u0032.png
diff --git a/data/emoticons/noto-emoticons/png/u0032_20e3.png b/gajim/data/emoticons/noto-emoticons/png/u0032_20e3.png
index 2a49c7243..2a49c7243 100644
--- a/data/emoticons/noto-emoticons/png/u0032_20e3.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u0032_20e3.png
diff --git a/data/emoticons/noto-emoticons/png/u0033.png b/gajim/data/emoticons/noto-emoticons/png/u0033.png
index 5fbed4ee0..5fbed4ee0 100644
--- a/data/emoticons/noto-emoticons/png/u0033.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u0033.png
diff --git a/data/emoticons/noto-emoticons/png/u0033_20e3.png b/gajim/data/emoticons/noto-emoticons/png/u0033_20e3.png
index 1892ef813..1892ef813 100644
--- a/data/emoticons/noto-emoticons/png/u0033_20e3.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u0033_20e3.png
diff --git a/data/emoticons/noto-emoticons/png/u0034.png b/gajim/data/emoticons/noto-emoticons/png/u0034.png
index b60ef6303..b60ef6303 100644
--- a/data/emoticons/noto-emoticons/png/u0034.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u0034.png
diff --git a/data/emoticons/noto-emoticons/png/u0034_20e3.png b/gajim/data/emoticons/noto-emoticons/png/u0034_20e3.png
index 01413134b..01413134b 100644
--- a/data/emoticons/noto-emoticons/png/u0034_20e3.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u0034_20e3.png
diff --git a/data/emoticons/noto-emoticons/png/u0035.png b/gajim/data/emoticons/noto-emoticons/png/u0035.png
index 6e7208057..6e7208057 100644
--- a/data/emoticons/noto-emoticons/png/u0035.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u0035.png
diff --git a/data/emoticons/noto-emoticons/png/u0035_20e3.png b/gajim/data/emoticons/noto-emoticons/png/u0035_20e3.png
index f9afb07b5..f9afb07b5 100644
--- a/data/emoticons/noto-emoticons/png/u0035_20e3.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u0035_20e3.png
diff --git a/data/emoticons/noto-emoticons/png/u0036.png b/gajim/data/emoticons/noto-emoticons/png/u0036.png
index a23f0e837..a23f0e837 100644
--- a/data/emoticons/noto-emoticons/png/u0036.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u0036.png
diff --git a/data/emoticons/noto-emoticons/png/u0036_20e3.png b/gajim/data/emoticons/noto-emoticons/png/u0036_20e3.png
index 5b9056622..5b9056622 100644
--- a/data/emoticons/noto-emoticons/png/u0036_20e3.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u0036_20e3.png
diff --git a/data/emoticons/noto-emoticons/png/u0037.png b/gajim/data/emoticons/noto-emoticons/png/u0037.png
index 4b3565124..4b3565124 100644
--- a/data/emoticons/noto-emoticons/png/u0037.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u0037.png
diff --git a/data/emoticons/noto-emoticons/png/u0037_20e3.png b/gajim/data/emoticons/noto-emoticons/png/u0037_20e3.png
index 55a1341e4..55a1341e4 100644
--- a/data/emoticons/noto-emoticons/png/u0037_20e3.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u0037_20e3.png
diff --git a/data/emoticons/noto-emoticons/png/u0038.png b/gajim/data/emoticons/noto-emoticons/png/u0038.png
index dce2b85fe..dce2b85fe 100644
--- a/data/emoticons/noto-emoticons/png/u0038.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u0038.png
diff --git a/data/emoticons/noto-emoticons/png/u0038_20e3.png b/gajim/data/emoticons/noto-emoticons/png/u0038_20e3.png
index caa040c5b..caa040c5b 100644
--- a/data/emoticons/noto-emoticons/png/u0038_20e3.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u0038_20e3.png
diff --git a/data/emoticons/noto-emoticons/png/u0039.png b/gajim/data/emoticons/noto-emoticons/png/u0039.png
index 010a2aba8..010a2aba8 100644
--- a/data/emoticons/noto-emoticons/png/u0039.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u0039.png
diff --git a/data/emoticons/noto-emoticons/png/u0039_20e3.png b/gajim/data/emoticons/noto-emoticons/png/u0039_20e3.png
index 3f759efb5..3f759efb5 100644
--- a/data/emoticons/noto-emoticons/png/u0039_20e3.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u0039_20e3.png
diff --git a/data/emoticons/noto-emoticons/png/u00a9.png b/gajim/data/emoticons/noto-emoticons/png/u00a9.png
index 60e2c0c38..60e2c0c38 100644
--- a/data/emoticons/noto-emoticons/png/u00a9.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u00a9.png
diff --git a/data/emoticons/noto-emoticons/png/u00ae.png b/gajim/data/emoticons/noto-emoticons/png/u00ae.png
index 0a20d632d..0a20d632d 100644
--- a/data/emoticons/noto-emoticons/png/u00ae.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u00ae.png
diff --git a/data/emoticons/noto-emoticons/png/u1f004.png b/gajim/data/emoticons/noto-emoticons/png/u1f004.png
index 3dcd43bf0..3dcd43bf0 100644
--- a/data/emoticons/noto-emoticons/png/u1f004.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f004.png
diff --git a/data/emoticons/noto-emoticons/png/u1f0cf.png b/gajim/data/emoticons/noto-emoticons/png/u1f0cf.png
index 5d945c58b..5d945c58b 100644
--- a/data/emoticons/noto-emoticons/png/u1f0cf.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f0cf.png
diff --git a/data/emoticons/noto-emoticons/png/u1f170.png b/gajim/data/emoticons/noto-emoticons/png/u1f170.png
index a9b9374db..a9b9374db 100644
--- a/data/emoticons/noto-emoticons/png/u1f170.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f170.png
diff --git a/data/emoticons/noto-emoticons/png/u1f171.png b/gajim/data/emoticons/noto-emoticons/png/u1f171.png
index 8460a58b9..8460a58b9 100644
--- a/data/emoticons/noto-emoticons/png/u1f171.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f171.png
diff --git a/data/emoticons/noto-emoticons/png/u1f17e.png b/gajim/data/emoticons/noto-emoticons/png/u1f17e.png
index 1adb475e0..1adb475e0 100644
--- a/data/emoticons/noto-emoticons/png/u1f17e.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f17e.png
diff --git a/data/emoticons/noto-emoticons/png/u1f17f.png b/gajim/data/emoticons/noto-emoticons/png/u1f17f.png
index fa1af914c..fa1af914c 100644
--- a/data/emoticons/noto-emoticons/png/u1f17f.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f17f.png
diff --git a/data/emoticons/noto-emoticons/png/u1f18e.png b/gajim/data/emoticons/noto-emoticons/png/u1f18e.png
index 90801da94..90801da94 100644
--- a/data/emoticons/noto-emoticons/png/u1f18e.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f18e.png
diff --git a/data/emoticons/noto-emoticons/png/u1f191.png b/gajim/data/emoticons/noto-emoticons/png/u1f191.png
index 9fe224f1c..9fe224f1c 100644
--- a/data/emoticons/noto-emoticons/png/u1f191.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f191.png
diff --git a/data/emoticons/noto-emoticons/png/u1f192.png b/gajim/data/emoticons/noto-emoticons/png/u1f192.png
index f2874cea6..f2874cea6 100644
--- a/data/emoticons/noto-emoticons/png/u1f192.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f192.png
diff --git a/data/emoticons/noto-emoticons/png/u1f193.png b/gajim/data/emoticons/noto-emoticons/png/u1f193.png
index 2eb328250..2eb328250 100644
--- a/data/emoticons/noto-emoticons/png/u1f193.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f193.png
diff --git a/data/emoticons/noto-emoticons/png/u1f194.png b/gajim/data/emoticons/noto-emoticons/png/u1f194.png
index 67b58180f..67b58180f 100644
--- a/data/emoticons/noto-emoticons/png/u1f194.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f194.png
diff --git a/data/emoticons/noto-emoticons/png/u1f195.png b/gajim/data/emoticons/noto-emoticons/png/u1f195.png
index f6e41896d..f6e41896d 100644
--- a/data/emoticons/noto-emoticons/png/u1f195.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f195.png
diff --git a/data/emoticons/noto-emoticons/png/u1f196.png b/gajim/data/emoticons/noto-emoticons/png/u1f196.png
index 4b8511227..4b8511227 100644
--- a/data/emoticons/noto-emoticons/png/u1f196.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f196.png
diff --git a/data/emoticons/noto-emoticons/png/u1f197.png b/gajim/data/emoticons/noto-emoticons/png/u1f197.png
index c9fbf1522..c9fbf1522 100644
--- a/data/emoticons/noto-emoticons/png/u1f197.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f197.png
diff --git a/data/emoticons/noto-emoticons/png/u1f198.png b/gajim/data/emoticons/noto-emoticons/png/u1f198.png
index 6d749ca14..6d749ca14 100644
--- a/data/emoticons/noto-emoticons/png/u1f198.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f198.png
diff --git a/data/emoticons/noto-emoticons/png/u1f199.png b/gajim/data/emoticons/noto-emoticons/png/u1f199.png
index c4c552004..c4c552004 100644
--- a/data/emoticons/noto-emoticons/png/u1f199.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f199.png
diff --git a/data/emoticons/noto-emoticons/png/u1f19a.png b/gajim/data/emoticons/noto-emoticons/png/u1f19a.png
index 20b25caad..20b25caad 100644
--- a/data/emoticons/noto-emoticons/png/u1f19a.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f19a.png
diff --git a/data/emoticons/noto-emoticons/png/u1f1e6.png b/gajim/data/emoticons/noto-emoticons/png/u1f1e6.png
index c6ae35bc9..c6ae35bc9 100644
--- a/data/emoticons/noto-emoticons/png/u1f1e6.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f1e6.png
diff --git a/data/emoticons/noto-emoticons/png/u1f1e7.png b/gajim/data/emoticons/noto-emoticons/png/u1f1e7.png
index 577504389..577504389 100644
--- a/data/emoticons/noto-emoticons/png/u1f1e7.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f1e7.png
diff --git a/data/emoticons/noto-emoticons/png/u1f1e8.png b/gajim/data/emoticons/noto-emoticons/png/u1f1e8.png
index 729061770..729061770 100644
--- a/data/emoticons/noto-emoticons/png/u1f1e8.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f1e8.png
diff --git a/data/emoticons/noto-emoticons/png/u1f1e8_1f1f3.png b/gajim/data/emoticons/noto-emoticons/png/u1f1e8_1f1f3.png
index 3bafbc217..3bafbc217 100644
--- a/data/emoticons/noto-emoticons/png/u1f1e8_1f1f3.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f1e8_1f1f3.png
diff --git a/data/emoticons/noto-emoticons/png/u1f1e9.png b/gajim/data/emoticons/noto-emoticons/png/u1f1e9.png
index 940b8f3e8..940b8f3e8 100644
--- a/data/emoticons/noto-emoticons/png/u1f1e9.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f1e9.png
diff --git a/data/emoticons/noto-emoticons/png/u1f1e9_1f1ea.png b/gajim/data/emoticons/noto-emoticons/png/u1f1e9_1f1ea.png
index 04eb39710..04eb39710 100644
--- a/data/emoticons/noto-emoticons/png/u1f1e9_1f1ea.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f1e9_1f1ea.png
diff --git a/data/emoticons/noto-emoticons/png/u1f1ea.png b/gajim/data/emoticons/noto-emoticons/png/u1f1ea.png
index 91dfbd5fe..91dfbd5fe 100644
--- a/data/emoticons/noto-emoticons/png/u1f1ea.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f1ea.png
diff --git a/data/emoticons/noto-emoticons/png/u1f1ea_1f1f8.png b/gajim/data/emoticons/noto-emoticons/png/u1f1ea_1f1f8.png
index 95d7c6002..95d7c6002 100644
--- a/data/emoticons/noto-emoticons/png/u1f1ea_1f1f8.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f1ea_1f1f8.png
diff --git a/data/emoticons/noto-emoticons/png/u1f1eb.png b/gajim/data/emoticons/noto-emoticons/png/u1f1eb.png
index 4ff3e295c..4ff3e295c 100644
--- a/data/emoticons/noto-emoticons/png/u1f1eb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f1eb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f1eb_1f1f7.png b/gajim/data/emoticons/noto-emoticons/png/u1f1eb_1f1f7.png
index 8fc2b156b..8fc2b156b 100644
--- a/data/emoticons/noto-emoticons/png/u1f1eb_1f1f7.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f1eb_1f1f7.png
diff --git a/data/emoticons/noto-emoticons/png/u1f1ec.png b/gajim/data/emoticons/noto-emoticons/png/u1f1ec.png
index a005deac6..a005deac6 100644
--- a/data/emoticons/noto-emoticons/png/u1f1ec.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f1ec.png
diff --git a/data/emoticons/noto-emoticons/png/u1f1ec_1f1e7.png b/gajim/data/emoticons/noto-emoticons/png/u1f1ec_1f1e7.png
index e34048f96..e34048f96 100644
--- a/data/emoticons/noto-emoticons/png/u1f1ec_1f1e7.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f1ec_1f1e7.png
diff --git a/data/emoticons/noto-emoticons/png/u1f1ed.png b/gajim/data/emoticons/noto-emoticons/png/u1f1ed.png
index 600e86b16..600e86b16 100644
--- a/data/emoticons/noto-emoticons/png/u1f1ed.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f1ed.png
diff --git a/data/emoticons/noto-emoticons/png/u1f1ee.png b/gajim/data/emoticons/noto-emoticons/png/u1f1ee.png
index 9251dcc4d..9251dcc4d 100644
--- a/data/emoticons/noto-emoticons/png/u1f1ee.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f1ee.png
diff --git a/data/emoticons/noto-emoticons/png/u1f1ee_1f1f9.png b/gajim/data/emoticons/noto-emoticons/png/u1f1ee_1f1f9.png
index dd76a4ce7..dd76a4ce7 100644
--- a/data/emoticons/noto-emoticons/png/u1f1ee_1f1f9.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f1ee_1f1f9.png
diff --git a/data/emoticons/noto-emoticons/png/u1f1ef.png b/gajim/data/emoticons/noto-emoticons/png/u1f1ef.png
index d1873cc15..d1873cc15 100644
--- a/data/emoticons/noto-emoticons/png/u1f1ef.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f1ef.png
diff --git a/data/emoticons/noto-emoticons/png/u1f1ef_1f1f5.png b/gajim/data/emoticons/noto-emoticons/png/u1f1ef_1f1f5.png
index 4f0c3aa94..4f0c3aa94 100644
--- a/data/emoticons/noto-emoticons/png/u1f1ef_1f1f5.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f1ef_1f1f5.png
diff --git a/data/emoticons/noto-emoticons/png/u1f1f0.png b/gajim/data/emoticons/noto-emoticons/png/u1f1f0.png
index 2cf9c5ea5..2cf9c5ea5 100644
--- a/data/emoticons/noto-emoticons/png/u1f1f0.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f1f0.png
diff --git a/data/emoticons/noto-emoticons/png/u1f1f0_1f1f7.png b/gajim/data/emoticons/noto-emoticons/png/u1f1f0_1f1f7.png
index ea2eac83b..ea2eac83b 100644
--- a/data/emoticons/noto-emoticons/png/u1f1f0_1f1f7.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f1f0_1f1f7.png
diff --git a/data/emoticons/noto-emoticons/png/u1f1f1.png b/gajim/data/emoticons/noto-emoticons/png/u1f1f1.png
index 40b94af5a..40b94af5a 100644
--- a/data/emoticons/noto-emoticons/png/u1f1f1.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f1f1.png
diff --git a/data/emoticons/noto-emoticons/png/u1f1f2.png b/gajim/data/emoticons/noto-emoticons/png/u1f1f2.png
index c50d52d87..c50d52d87 100644
--- a/data/emoticons/noto-emoticons/png/u1f1f2.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f1f2.png
diff --git a/data/emoticons/noto-emoticons/png/u1f1f3.png b/gajim/data/emoticons/noto-emoticons/png/u1f1f3.png
index f531672f6..f531672f6 100644
--- a/data/emoticons/noto-emoticons/png/u1f1f3.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f1f3.png
diff --git a/data/emoticons/noto-emoticons/png/u1f1f4.png b/gajim/data/emoticons/noto-emoticons/png/u1f1f4.png
index d22c84e66..d22c84e66 100644
--- a/data/emoticons/noto-emoticons/png/u1f1f4.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f1f4.png
diff --git a/data/emoticons/noto-emoticons/png/u1f1f5.png b/gajim/data/emoticons/noto-emoticons/png/u1f1f5.png
index 8991d11ec..8991d11ec 100644
--- a/data/emoticons/noto-emoticons/png/u1f1f5.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f1f5.png
diff --git a/data/emoticons/noto-emoticons/png/u1f1f6.png b/gajim/data/emoticons/noto-emoticons/png/u1f1f6.png
index d866d7f6f..d866d7f6f 100644
--- a/data/emoticons/noto-emoticons/png/u1f1f6.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f1f6.png
diff --git a/data/emoticons/noto-emoticons/png/u1f1f7.png b/gajim/data/emoticons/noto-emoticons/png/u1f1f7.png
index 3f9f3e116..3f9f3e116 100644
--- a/data/emoticons/noto-emoticons/png/u1f1f7.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f1f7.png
diff --git a/data/emoticons/noto-emoticons/png/u1f1f7_1f1fa.png b/gajim/data/emoticons/noto-emoticons/png/u1f1f7_1f1fa.png
index 59f8659c0..59f8659c0 100644
--- a/data/emoticons/noto-emoticons/png/u1f1f7_1f1fa.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f1f7_1f1fa.png
diff --git a/data/emoticons/noto-emoticons/png/u1f1f8.png b/gajim/data/emoticons/noto-emoticons/png/u1f1f8.png
index 29c8804d9..29c8804d9 100644
--- a/data/emoticons/noto-emoticons/png/u1f1f8.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f1f8.png
diff --git a/data/emoticons/noto-emoticons/png/u1f1f9.png b/gajim/data/emoticons/noto-emoticons/png/u1f1f9.png
index 21eab2b01..21eab2b01 100644
--- a/data/emoticons/noto-emoticons/png/u1f1f9.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f1f9.png
diff --git a/data/emoticons/noto-emoticons/png/u1f1fa.png b/gajim/data/emoticons/noto-emoticons/png/u1f1fa.png
index 555531835..555531835 100644
--- a/data/emoticons/noto-emoticons/png/u1f1fa.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f1fa.png
diff --git a/data/emoticons/noto-emoticons/png/u1f1fa_1f1f8.png b/gajim/data/emoticons/noto-emoticons/png/u1f1fa_1f1f8.png
index 091ca1ca4..091ca1ca4 100644
--- a/data/emoticons/noto-emoticons/png/u1f1fa_1f1f8.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f1fa_1f1f8.png
diff --git a/data/emoticons/noto-emoticons/png/u1f1fb.png b/gajim/data/emoticons/noto-emoticons/png/u1f1fb.png
index e86bfe866..e86bfe866 100644
--- a/data/emoticons/noto-emoticons/png/u1f1fb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f1fb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f1fc.png b/gajim/data/emoticons/noto-emoticons/png/u1f1fc.png
index 047fcd3ca..047fcd3ca 100644
--- a/data/emoticons/noto-emoticons/png/u1f1fc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f1fc.png
diff --git a/data/emoticons/noto-emoticons/png/u1f1fd.png b/gajim/data/emoticons/noto-emoticons/png/u1f1fd.png
index 97314ab0a..97314ab0a 100644
--- a/data/emoticons/noto-emoticons/png/u1f1fd.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f1fd.png
diff --git a/data/emoticons/noto-emoticons/png/u1f1fe.png b/gajim/data/emoticons/noto-emoticons/png/u1f1fe.png
index 551f48228..551f48228 100644
--- a/data/emoticons/noto-emoticons/png/u1f1fe.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f1fe.png
diff --git a/data/emoticons/noto-emoticons/png/u1f1ff.png b/gajim/data/emoticons/noto-emoticons/png/u1f1ff.png
index a9e264ee5..a9e264ee5 100644
--- a/data/emoticons/noto-emoticons/png/u1f1ff.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f1ff.png
diff --git a/data/emoticons/noto-emoticons/png/u1f201.png b/gajim/data/emoticons/noto-emoticons/png/u1f201.png
index 05f217b25..05f217b25 100644
--- a/data/emoticons/noto-emoticons/png/u1f201.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f201.png
diff --git a/data/emoticons/noto-emoticons/png/u1f202.png b/gajim/data/emoticons/noto-emoticons/png/u1f202.png
index 2f55cdcbd..2f55cdcbd 100644
--- a/data/emoticons/noto-emoticons/png/u1f202.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f202.png
diff --git a/data/emoticons/noto-emoticons/png/u1f21a.png b/gajim/data/emoticons/noto-emoticons/png/u1f21a.png
index 54491e572..54491e572 100644
--- a/data/emoticons/noto-emoticons/png/u1f21a.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f21a.png
diff --git a/data/emoticons/noto-emoticons/png/u1f22f.png b/gajim/data/emoticons/noto-emoticons/png/u1f22f.png
index d999855af..d999855af 100644
--- a/data/emoticons/noto-emoticons/png/u1f22f.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f22f.png
diff --git a/data/emoticons/noto-emoticons/png/u1f232.png b/gajim/data/emoticons/noto-emoticons/png/u1f232.png
index b66b2a1c5..b66b2a1c5 100644
--- a/data/emoticons/noto-emoticons/png/u1f232.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f232.png
diff --git a/data/emoticons/noto-emoticons/png/u1f233.png b/gajim/data/emoticons/noto-emoticons/png/u1f233.png
index 226afb45d..226afb45d 100644
--- a/data/emoticons/noto-emoticons/png/u1f233.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f233.png
diff --git a/data/emoticons/noto-emoticons/png/u1f234.png b/gajim/data/emoticons/noto-emoticons/png/u1f234.png
index e1305fcf4..e1305fcf4 100644
--- a/data/emoticons/noto-emoticons/png/u1f234.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f234.png
diff --git a/data/emoticons/noto-emoticons/png/u1f235.png b/gajim/data/emoticons/noto-emoticons/png/u1f235.png
index c58e7abde..c58e7abde 100644
--- a/data/emoticons/noto-emoticons/png/u1f235.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f235.png
diff --git a/data/emoticons/noto-emoticons/png/u1f236.png b/gajim/data/emoticons/noto-emoticons/png/u1f236.png
index cab4e5e8d..cab4e5e8d 100644
--- a/data/emoticons/noto-emoticons/png/u1f236.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f236.png
diff --git a/data/emoticons/noto-emoticons/png/u1f237.png b/gajim/data/emoticons/noto-emoticons/png/u1f237.png
index f58b2f60a..f58b2f60a 100644
--- a/data/emoticons/noto-emoticons/png/u1f237.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f237.png
diff --git a/data/emoticons/noto-emoticons/png/u1f238.png b/gajim/data/emoticons/noto-emoticons/png/u1f238.png
index ec2c220bd..ec2c220bd 100644
--- a/data/emoticons/noto-emoticons/png/u1f238.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f238.png
diff --git a/data/emoticons/noto-emoticons/png/u1f239.png b/gajim/data/emoticons/noto-emoticons/png/u1f239.png
index 5bd9d96a3..5bd9d96a3 100644
--- a/data/emoticons/noto-emoticons/png/u1f239.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f239.png
diff --git a/data/emoticons/noto-emoticons/png/u1f23a.png b/gajim/data/emoticons/noto-emoticons/png/u1f23a.png
index a0b901976..a0b901976 100644
--- a/data/emoticons/noto-emoticons/png/u1f23a.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f23a.png
diff --git a/data/emoticons/noto-emoticons/png/u1f250.png b/gajim/data/emoticons/noto-emoticons/png/u1f250.png
index 839fcd269..839fcd269 100644
--- a/data/emoticons/noto-emoticons/png/u1f250.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f250.png
diff --git a/data/emoticons/noto-emoticons/png/u1f251.png b/gajim/data/emoticons/noto-emoticons/png/u1f251.png
index b1289ef41..b1289ef41 100644
--- a/data/emoticons/noto-emoticons/png/u1f251.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f251.png
diff --git a/data/emoticons/noto-emoticons/png/u1f300.png b/gajim/data/emoticons/noto-emoticons/png/u1f300.png
index bae3c5155..bae3c5155 100644
--- a/data/emoticons/noto-emoticons/png/u1f300.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f300.png
diff --git a/data/emoticons/noto-emoticons/png/u1f301.png b/gajim/data/emoticons/noto-emoticons/png/u1f301.png
index 42fd434cd..42fd434cd 100644
--- a/data/emoticons/noto-emoticons/png/u1f301.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f301.png
diff --git a/data/emoticons/noto-emoticons/png/u1f302.png b/gajim/data/emoticons/noto-emoticons/png/u1f302.png
index e4539e969..e4539e969 100644
--- a/data/emoticons/noto-emoticons/png/u1f302.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f302.png
diff --git a/data/emoticons/noto-emoticons/png/u1f303.png b/gajim/data/emoticons/noto-emoticons/png/u1f303.png
index 9c94b7ca7..9c94b7ca7 100644
--- a/data/emoticons/noto-emoticons/png/u1f303.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f303.png
diff --git a/data/emoticons/noto-emoticons/png/u1f304.png b/gajim/data/emoticons/noto-emoticons/png/u1f304.png
index cb86b72ff..cb86b72ff 100644
--- a/data/emoticons/noto-emoticons/png/u1f304.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f304.png
diff --git a/data/emoticons/noto-emoticons/png/u1f305.png b/gajim/data/emoticons/noto-emoticons/png/u1f305.png
index dac75fa63..dac75fa63 100644
--- a/data/emoticons/noto-emoticons/png/u1f305.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f305.png
diff --git a/data/emoticons/noto-emoticons/png/u1f306.png b/gajim/data/emoticons/noto-emoticons/png/u1f306.png
index 020986389..020986389 100644
--- a/data/emoticons/noto-emoticons/png/u1f306.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f306.png
diff --git a/data/emoticons/noto-emoticons/png/u1f307.png b/gajim/data/emoticons/noto-emoticons/png/u1f307.png
index 534991351..534991351 100644
--- a/data/emoticons/noto-emoticons/png/u1f307.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f307.png
diff --git a/data/emoticons/noto-emoticons/png/u1f308.png b/gajim/data/emoticons/noto-emoticons/png/u1f308.png
index 053f8c3d3..053f8c3d3 100644
--- a/data/emoticons/noto-emoticons/png/u1f308.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f308.png
diff --git a/data/emoticons/noto-emoticons/png/u1f309.png b/gajim/data/emoticons/noto-emoticons/png/u1f309.png
index 7bfc5528b..7bfc5528b 100644
--- a/data/emoticons/noto-emoticons/png/u1f309.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f309.png
diff --git a/data/emoticons/noto-emoticons/png/u1f30a.png b/gajim/data/emoticons/noto-emoticons/png/u1f30a.png
index eb41d0641..eb41d0641 100644
--- a/data/emoticons/noto-emoticons/png/u1f30a.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f30a.png
diff --git a/data/emoticons/noto-emoticons/png/u1f30b.png b/gajim/data/emoticons/noto-emoticons/png/u1f30b.png
index abe48c42d..abe48c42d 100644
--- a/data/emoticons/noto-emoticons/png/u1f30b.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f30b.png
diff --git a/data/emoticons/noto-emoticons/png/u1f30c.png b/gajim/data/emoticons/noto-emoticons/png/u1f30c.png
index 45325790f..45325790f 100644
--- a/data/emoticons/noto-emoticons/png/u1f30c.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f30c.png
diff --git a/data/emoticons/noto-emoticons/png/u1f30d.png b/gajim/data/emoticons/noto-emoticons/png/u1f30d.png
index 1eb29f378..1eb29f378 100644
--- a/data/emoticons/noto-emoticons/png/u1f30d.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f30d.png
diff --git a/data/emoticons/noto-emoticons/png/u1f30e.png b/gajim/data/emoticons/noto-emoticons/png/u1f30e.png
index 1ae3178d4..1ae3178d4 100644
--- a/data/emoticons/noto-emoticons/png/u1f30e.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f30e.png
diff --git a/data/emoticons/noto-emoticons/png/u1f30f.png b/gajim/data/emoticons/noto-emoticons/png/u1f30f.png
index f87ac45a0..f87ac45a0 100644
--- a/data/emoticons/noto-emoticons/png/u1f30f.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f30f.png
diff --git a/data/emoticons/noto-emoticons/png/u1f310.png b/gajim/data/emoticons/noto-emoticons/png/u1f310.png
index 77426ba24..77426ba24 100644
--- a/data/emoticons/noto-emoticons/png/u1f310.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f310.png
diff --git a/data/emoticons/noto-emoticons/png/u1f311.png b/gajim/data/emoticons/noto-emoticons/png/u1f311.png
index a4f7a0306..a4f7a0306 100644
--- a/data/emoticons/noto-emoticons/png/u1f311.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f311.png
diff --git a/data/emoticons/noto-emoticons/png/u1f312.png b/gajim/data/emoticons/noto-emoticons/png/u1f312.png
index 0d3cb823d..0d3cb823d 100644
--- a/data/emoticons/noto-emoticons/png/u1f312.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f312.png
diff --git a/data/emoticons/noto-emoticons/png/u1f313.png b/gajim/data/emoticons/noto-emoticons/png/u1f313.png
index c50970439..c50970439 100644
--- a/data/emoticons/noto-emoticons/png/u1f313.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f313.png
diff --git a/data/emoticons/noto-emoticons/png/u1f314.png b/gajim/data/emoticons/noto-emoticons/png/u1f314.png
index 6a4db00eb..6a4db00eb 100644
--- a/data/emoticons/noto-emoticons/png/u1f314.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f314.png
diff --git a/data/emoticons/noto-emoticons/png/u1f315.png b/gajim/data/emoticons/noto-emoticons/png/u1f315.png
index 7884143c5..7884143c5 100644
--- a/data/emoticons/noto-emoticons/png/u1f315.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f315.png
diff --git a/data/emoticons/noto-emoticons/png/u1f316.png b/gajim/data/emoticons/noto-emoticons/png/u1f316.png
index 8cb5b10c2..8cb5b10c2 100644
--- a/data/emoticons/noto-emoticons/png/u1f316.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f316.png
diff --git a/data/emoticons/noto-emoticons/png/u1f317.png b/gajim/data/emoticons/noto-emoticons/png/u1f317.png
index 889129d82..889129d82 100644
--- a/data/emoticons/noto-emoticons/png/u1f317.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f317.png
diff --git a/data/emoticons/noto-emoticons/png/u1f318.png b/gajim/data/emoticons/noto-emoticons/png/u1f318.png
index c1e15fa63..c1e15fa63 100644
--- a/data/emoticons/noto-emoticons/png/u1f318.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f318.png
diff --git a/data/emoticons/noto-emoticons/png/u1f319.png b/gajim/data/emoticons/noto-emoticons/png/u1f319.png
index 11662285e..11662285e 100644
--- a/data/emoticons/noto-emoticons/png/u1f319.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f319.png
diff --git a/data/emoticons/noto-emoticons/png/u1f31a.png b/gajim/data/emoticons/noto-emoticons/png/u1f31a.png
index 8af8f1504..8af8f1504 100644
--- a/data/emoticons/noto-emoticons/png/u1f31a.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f31a.png
diff --git a/data/emoticons/noto-emoticons/png/u1f31b.png b/gajim/data/emoticons/noto-emoticons/png/u1f31b.png
index a0c8af469..a0c8af469 100644
--- a/data/emoticons/noto-emoticons/png/u1f31b.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f31b.png
diff --git a/data/emoticons/noto-emoticons/png/u1f31c.png b/gajim/data/emoticons/noto-emoticons/png/u1f31c.png
index aa0fd5a78..aa0fd5a78 100644
--- a/data/emoticons/noto-emoticons/png/u1f31c.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f31c.png
diff --git a/data/emoticons/noto-emoticons/png/u1f31d.png b/gajim/data/emoticons/noto-emoticons/png/u1f31d.png
index 6eefdca5c..6eefdca5c 100644
--- a/data/emoticons/noto-emoticons/png/u1f31d.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f31d.png
diff --git a/data/emoticons/noto-emoticons/png/u1f31e.png b/gajim/data/emoticons/noto-emoticons/png/u1f31e.png
index 648d4d23c..648d4d23c 100644
--- a/data/emoticons/noto-emoticons/png/u1f31e.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f31e.png
diff --git a/data/emoticons/noto-emoticons/png/u1f31f.png b/gajim/data/emoticons/noto-emoticons/png/u1f31f.png
index 897f5381b..897f5381b 100644
--- a/data/emoticons/noto-emoticons/png/u1f31f.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f31f.png
diff --git a/data/emoticons/noto-emoticons/png/u1f320.png b/gajim/data/emoticons/noto-emoticons/png/u1f320.png
index f1790e03c..f1790e03c 100644
--- a/data/emoticons/noto-emoticons/png/u1f320.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f320.png
diff --git a/data/emoticons/noto-emoticons/png/u1f321.png b/gajim/data/emoticons/noto-emoticons/png/u1f321.png
index 18286c4dc..18286c4dc 100644
--- a/data/emoticons/noto-emoticons/png/u1f321.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f321.png
diff --git a/data/emoticons/noto-emoticons/png/u1f324.png b/gajim/data/emoticons/noto-emoticons/png/u1f324.png
index 71cf80db4..71cf80db4 100644
--- a/data/emoticons/noto-emoticons/png/u1f324.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f324.png
diff --git a/data/emoticons/noto-emoticons/png/u1f325.png b/gajim/data/emoticons/noto-emoticons/png/u1f325.png
index 16105a8ac..16105a8ac 100644
--- a/data/emoticons/noto-emoticons/png/u1f325.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f325.png
diff --git a/data/emoticons/noto-emoticons/png/u1f326.png b/gajim/data/emoticons/noto-emoticons/png/u1f326.png
index cef04b386..cef04b386 100644
--- a/data/emoticons/noto-emoticons/png/u1f326.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f326.png
diff --git a/data/emoticons/noto-emoticons/png/u1f327.png b/gajim/data/emoticons/noto-emoticons/png/u1f327.png
index ab495d70b..ab495d70b 100644
--- a/data/emoticons/noto-emoticons/png/u1f327.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f327.png
diff --git a/data/emoticons/noto-emoticons/png/u1f328.png b/gajim/data/emoticons/noto-emoticons/png/u1f328.png
index 48661c62a..48661c62a 100644
--- a/data/emoticons/noto-emoticons/png/u1f328.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f328.png
diff --git a/data/emoticons/noto-emoticons/png/u1f329.png b/gajim/data/emoticons/noto-emoticons/png/u1f329.png
index a0926f29e..a0926f29e 100644
--- a/data/emoticons/noto-emoticons/png/u1f329.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f329.png
diff --git a/data/emoticons/noto-emoticons/png/u1f32a.png b/gajim/data/emoticons/noto-emoticons/png/u1f32a.png
index 52d763a07..52d763a07 100644
--- a/data/emoticons/noto-emoticons/png/u1f32a.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f32a.png
diff --git a/data/emoticons/noto-emoticons/png/u1f32b.png b/gajim/data/emoticons/noto-emoticons/png/u1f32b.png
index 14fdc7ed8..14fdc7ed8 100644
--- a/data/emoticons/noto-emoticons/png/u1f32b.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f32b.png
diff --git a/data/emoticons/noto-emoticons/png/u1f32c.png b/gajim/data/emoticons/noto-emoticons/png/u1f32c.png
index 46763575b..46763575b 100644
--- a/data/emoticons/noto-emoticons/png/u1f32c.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f32c.png
diff --git a/data/emoticons/noto-emoticons/png/u1f32d.png b/gajim/data/emoticons/noto-emoticons/png/u1f32d.png
index e3878983d..e3878983d 100644
--- a/data/emoticons/noto-emoticons/png/u1f32d.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f32d.png
diff --git a/data/emoticons/noto-emoticons/png/u1f32e.png b/gajim/data/emoticons/noto-emoticons/png/u1f32e.png
index 29bc98aa3..29bc98aa3 100644
--- a/data/emoticons/noto-emoticons/png/u1f32e.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f32e.png
diff --git a/data/emoticons/noto-emoticons/png/u1f32f.png b/gajim/data/emoticons/noto-emoticons/png/u1f32f.png
index 4547e220f..4547e220f 100644
--- a/data/emoticons/noto-emoticons/png/u1f32f.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f32f.png
diff --git a/data/emoticons/noto-emoticons/png/u1f330.png b/gajim/data/emoticons/noto-emoticons/png/u1f330.png
index 6b244e12f..6b244e12f 100644
--- a/data/emoticons/noto-emoticons/png/u1f330.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f330.png
diff --git a/data/emoticons/noto-emoticons/png/u1f331.png b/gajim/data/emoticons/noto-emoticons/png/u1f331.png
index aadb20e4c..aadb20e4c 100644
--- a/data/emoticons/noto-emoticons/png/u1f331.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f331.png
diff --git a/data/emoticons/noto-emoticons/png/u1f332.png b/gajim/data/emoticons/noto-emoticons/png/u1f332.png
index 6a62a44f2..6a62a44f2 100644
--- a/data/emoticons/noto-emoticons/png/u1f332.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f332.png
diff --git a/data/emoticons/noto-emoticons/png/u1f333.png b/gajim/data/emoticons/noto-emoticons/png/u1f333.png
index c40e7b680..c40e7b680 100644
--- a/data/emoticons/noto-emoticons/png/u1f333.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f333.png
diff --git a/data/emoticons/noto-emoticons/png/u1f334.png b/gajim/data/emoticons/noto-emoticons/png/u1f334.png
index 4c03529c5..4c03529c5 100644
--- a/data/emoticons/noto-emoticons/png/u1f334.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f334.png
diff --git a/data/emoticons/noto-emoticons/png/u1f335.png b/gajim/data/emoticons/noto-emoticons/png/u1f335.png
index 673e1ad79..673e1ad79 100644
--- a/data/emoticons/noto-emoticons/png/u1f335.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f335.png
diff --git a/data/emoticons/noto-emoticons/png/u1f336.png b/gajim/data/emoticons/noto-emoticons/png/u1f336.png
index 721941e5f..721941e5f 100644
--- a/data/emoticons/noto-emoticons/png/u1f336.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f336.png
diff --git a/data/emoticons/noto-emoticons/png/u1f337.png b/gajim/data/emoticons/noto-emoticons/png/u1f337.png
index e1bebb280..e1bebb280 100644
--- a/data/emoticons/noto-emoticons/png/u1f337.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f337.png
diff --git a/data/emoticons/noto-emoticons/png/u1f338.png b/gajim/data/emoticons/noto-emoticons/png/u1f338.png
index 497b66ebf..497b66ebf 100644
--- a/data/emoticons/noto-emoticons/png/u1f338.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f338.png
diff --git a/data/emoticons/noto-emoticons/png/u1f339.png b/gajim/data/emoticons/noto-emoticons/png/u1f339.png
index 2d51a0966..2d51a0966 100644
--- a/data/emoticons/noto-emoticons/png/u1f339.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f339.png
diff --git a/data/emoticons/noto-emoticons/png/u1f33a.png b/gajim/data/emoticons/noto-emoticons/png/u1f33a.png
index 6a87f6b9c..6a87f6b9c 100644
--- a/data/emoticons/noto-emoticons/png/u1f33a.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f33a.png
diff --git a/data/emoticons/noto-emoticons/png/u1f33b.png b/gajim/data/emoticons/noto-emoticons/png/u1f33b.png
index cf10d8360..cf10d8360 100644
--- a/data/emoticons/noto-emoticons/png/u1f33b.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f33b.png
diff --git a/data/emoticons/noto-emoticons/png/u1f33c.png b/gajim/data/emoticons/noto-emoticons/png/u1f33c.png
index ff7760b3b..ff7760b3b 100644
--- a/data/emoticons/noto-emoticons/png/u1f33c.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f33c.png
diff --git a/data/emoticons/noto-emoticons/png/u1f33d.png b/gajim/data/emoticons/noto-emoticons/png/u1f33d.png
index dfa429988..dfa429988 100644
--- a/data/emoticons/noto-emoticons/png/u1f33d.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f33d.png
diff --git a/data/emoticons/noto-emoticons/png/u1f33e.png b/gajim/data/emoticons/noto-emoticons/png/u1f33e.png
index f15ad3105..f15ad3105 100644
--- a/data/emoticons/noto-emoticons/png/u1f33e.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f33e.png
diff --git a/data/emoticons/noto-emoticons/png/u1f33f.png b/gajim/data/emoticons/noto-emoticons/png/u1f33f.png
index 085b2a1ce..085b2a1ce 100644
--- a/data/emoticons/noto-emoticons/png/u1f33f.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f33f.png
diff --git a/data/emoticons/noto-emoticons/png/u1f340.png b/gajim/data/emoticons/noto-emoticons/png/u1f340.png
index 903cae8e8..903cae8e8 100644
--- a/data/emoticons/noto-emoticons/png/u1f340.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f340.png
diff --git a/data/emoticons/noto-emoticons/png/u1f341.png b/gajim/data/emoticons/noto-emoticons/png/u1f341.png
index eb19d98e3..eb19d98e3 100644
--- a/data/emoticons/noto-emoticons/png/u1f341.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f341.png
diff --git a/data/emoticons/noto-emoticons/png/u1f342.png b/gajim/data/emoticons/noto-emoticons/png/u1f342.png
index 3720ba1d2..3720ba1d2 100644
--- a/data/emoticons/noto-emoticons/png/u1f342.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f342.png
diff --git a/data/emoticons/noto-emoticons/png/u1f343.png b/gajim/data/emoticons/noto-emoticons/png/u1f343.png
index 3a647b515..3a647b515 100644
--- a/data/emoticons/noto-emoticons/png/u1f343.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f343.png
diff --git a/data/emoticons/noto-emoticons/png/u1f344.png b/gajim/data/emoticons/noto-emoticons/png/u1f344.png
index e6b47129e..e6b47129e 100644
--- a/data/emoticons/noto-emoticons/png/u1f344.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f344.png
diff --git a/data/emoticons/noto-emoticons/png/u1f345.png b/gajim/data/emoticons/noto-emoticons/png/u1f345.png
index 74b5a3c6b..74b5a3c6b 100644
--- a/data/emoticons/noto-emoticons/png/u1f345.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f345.png
diff --git a/data/emoticons/noto-emoticons/png/u1f346.png b/gajim/data/emoticons/noto-emoticons/png/u1f346.png
index 7bd77ba74..7bd77ba74 100644
--- a/data/emoticons/noto-emoticons/png/u1f346.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f346.png
diff --git a/data/emoticons/noto-emoticons/png/u1f347.png b/gajim/data/emoticons/noto-emoticons/png/u1f347.png
index 5d95e2b81..5d95e2b81 100644
--- a/data/emoticons/noto-emoticons/png/u1f347.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f347.png
diff --git a/data/emoticons/noto-emoticons/png/u1f348.png b/gajim/data/emoticons/noto-emoticons/png/u1f348.png
index acbc15eaa..acbc15eaa 100644
--- a/data/emoticons/noto-emoticons/png/u1f348.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f348.png
diff --git a/data/emoticons/noto-emoticons/png/u1f349.png b/gajim/data/emoticons/noto-emoticons/png/u1f349.png
index c53045ad9..c53045ad9 100644
--- a/data/emoticons/noto-emoticons/png/u1f349.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f349.png
diff --git a/data/emoticons/noto-emoticons/png/u1f34a.png b/gajim/data/emoticons/noto-emoticons/png/u1f34a.png
index 0f16afbe5..0f16afbe5 100644
--- a/data/emoticons/noto-emoticons/png/u1f34a.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f34a.png
diff --git a/data/emoticons/noto-emoticons/png/u1f34b.png b/gajim/data/emoticons/noto-emoticons/png/u1f34b.png
index 85a71fd1f..85a71fd1f 100644
--- a/data/emoticons/noto-emoticons/png/u1f34b.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f34b.png
diff --git a/data/emoticons/noto-emoticons/png/u1f34c.png b/gajim/data/emoticons/noto-emoticons/png/u1f34c.png
index 6131e04d9..6131e04d9 100644
--- a/data/emoticons/noto-emoticons/png/u1f34c.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f34c.png
diff --git a/data/emoticons/noto-emoticons/png/u1f34d.png b/gajim/data/emoticons/noto-emoticons/png/u1f34d.png
index 87f58a428..87f58a428 100644
--- a/data/emoticons/noto-emoticons/png/u1f34d.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f34d.png
diff --git a/data/emoticons/noto-emoticons/png/u1f34e.png b/gajim/data/emoticons/noto-emoticons/png/u1f34e.png
index edfde3c6b..edfde3c6b 100644
--- a/data/emoticons/noto-emoticons/png/u1f34e.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f34e.png
diff --git a/data/emoticons/noto-emoticons/png/u1f34f.png b/gajim/data/emoticons/noto-emoticons/png/u1f34f.png
index f1fd82353..f1fd82353 100644
--- a/data/emoticons/noto-emoticons/png/u1f34f.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f34f.png
diff --git a/data/emoticons/noto-emoticons/png/u1f350.png b/gajim/data/emoticons/noto-emoticons/png/u1f350.png
index a5a14f1cc..a5a14f1cc 100644
--- a/data/emoticons/noto-emoticons/png/u1f350.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f350.png
diff --git a/data/emoticons/noto-emoticons/png/u1f351.png b/gajim/data/emoticons/noto-emoticons/png/u1f351.png
index acdac2ba5..acdac2ba5 100644
--- a/data/emoticons/noto-emoticons/png/u1f351.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f351.png
diff --git a/data/emoticons/noto-emoticons/png/u1f352.png b/gajim/data/emoticons/noto-emoticons/png/u1f352.png
index 6aaea4fec..6aaea4fec 100644
--- a/data/emoticons/noto-emoticons/png/u1f352.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f352.png
diff --git a/data/emoticons/noto-emoticons/png/u1f353.png b/gajim/data/emoticons/noto-emoticons/png/u1f353.png
index 4e68a5056..4e68a5056 100644
--- a/data/emoticons/noto-emoticons/png/u1f353.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f353.png
diff --git a/data/emoticons/noto-emoticons/png/u1f354.png b/gajim/data/emoticons/noto-emoticons/png/u1f354.png
index d2bd3e68e..d2bd3e68e 100644
--- a/data/emoticons/noto-emoticons/png/u1f354.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f354.png
diff --git a/data/emoticons/noto-emoticons/png/u1f355.png b/gajim/data/emoticons/noto-emoticons/png/u1f355.png
index a8be0d70b..a8be0d70b 100644
--- a/data/emoticons/noto-emoticons/png/u1f355.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f355.png
diff --git a/data/emoticons/noto-emoticons/png/u1f356.png b/gajim/data/emoticons/noto-emoticons/png/u1f356.png
index edc8b9709..edc8b9709 100644
--- a/data/emoticons/noto-emoticons/png/u1f356.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f356.png
diff --git a/data/emoticons/noto-emoticons/png/u1f357.png b/gajim/data/emoticons/noto-emoticons/png/u1f357.png
index e8cd53c98..e8cd53c98 100644
--- a/data/emoticons/noto-emoticons/png/u1f357.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f357.png
diff --git a/data/emoticons/noto-emoticons/png/u1f358.png b/gajim/data/emoticons/noto-emoticons/png/u1f358.png
index 2c0e5f17b..2c0e5f17b 100644
--- a/data/emoticons/noto-emoticons/png/u1f358.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f358.png
diff --git a/data/emoticons/noto-emoticons/png/u1f359.png b/gajim/data/emoticons/noto-emoticons/png/u1f359.png
index 475a71811..475a71811 100644
--- a/data/emoticons/noto-emoticons/png/u1f359.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f359.png
diff --git a/data/emoticons/noto-emoticons/png/u1f35a.png b/gajim/data/emoticons/noto-emoticons/png/u1f35a.png
index a281c7172..a281c7172 100644
--- a/data/emoticons/noto-emoticons/png/u1f35a.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f35a.png
diff --git a/data/emoticons/noto-emoticons/png/u1f35b.png b/gajim/data/emoticons/noto-emoticons/png/u1f35b.png
index 34cded03c..34cded03c 100644
--- a/data/emoticons/noto-emoticons/png/u1f35b.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f35b.png
diff --git a/data/emoticons/noto-emoticons/png/u1f35c.png b/gajim/data/emoticons/noto-emoticons/png/u1f35c.png
index 1988bb0b8..1988bb0b8 100644
--- a/data/emoticons/noto-emoticons/png/u1f35c.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f35c.png
diff --git a/data/emoticons/noto-emoticons/png/u1f35d.png b/gajim/data/emoticons/noto-emoticons/png/u1f35d.png
index e21832c3a..e21832c3a 100644
--- a/data/emoticons/noto-emoticons/png/u1f35d.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f35d.png
diff --git a/data/emoticons/noto-emoticons/png/u1f35e.png b/gajim/data/emoticons/noto-emoticons/png/u1f35e.png
index 6969c312b..6969c312b 100644
--- a/data/emoticons/noto-emoticons/png/u1f35e.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f35e.png
diff --git a/data/emoticons/noto-emoticons/png/u1f35f.png b/gajim/data/emoticons/noto-emoticons/png/u1f35f.png
index 63418f0ab..63418f0ab 100644
--- a/data/emoticons/noto-emoticons/png/u1f35f.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f35f.png
diff --git a/data/emoticons/noto-emoticons/png/u1f360.png b/gajim/data/emoticons/noto-emoticons/png/u1f360.png
index 50cdd2a23..50cdd2a23 100644
--- a/data/emoticons/noto-emoticons/png/u1f360.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f360.png
diff --git a/data/emoticons/noto-emoticons/png/u1f361.png b/gajim/data/emoticons/noto-emoticons/png/u1f361.png
index 8777e7e93..8777e7e93 100644
--- a/data/emoticons/noto-emoticons/png/u1f361.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f361.png
diff --git a/data/emoticons/noto-emoticons/png/u1f362.png b/gajim/data/emoticons/noto-emoticons/png/u1f362.png
index c9601ef83..c9601ef83 100644
--- a/data/emoticons/noto-emoticons/png/u1f362.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f362.png
diff --git a/data/emoticons/noto-emoticons/png/u1f363.png b/gajim/data/emoticons/noto-emoticons/png/u1f363.png
index 8351b1885..8351b1885 100644
--- a/data/emoticons/noto-emoticons/png/u1f363.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f363.png
diff --git a/data/emoticons/noto-emoticons/png/u1f364.png b/gajim/data/emoticons/noto-emoticons/png/u1f364.png
index d8fc5b5e9..d8fc5b5e9 100644
--- a/data/emoticons/noto-emoticons/png/u1f364.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f364.png
diff --git a/data/emoticons/noto-emoticons/png/u1f365.png b/gajim/data/emoticons/noto-emoticons/png/u1f365.png
index 248f883de..248f883de 100644
--- a/data/emoticons/noto-emoticons/png/u1f365.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f365.png
diff --git a/data/emoticons/noto-emoticons/png/u1f366.png b/gajim/data/emoticons/noto-emoticons/png/u1f366.png
index 280941d70..280941d70 100644
--- a/data/emoticons/noto-emoticons/png/u1f366.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f366.png
diff --git a/data/emoticons/noto-emoticons/png/u1f367.png b/gajim/data/emoticons/noto-emoticons/png/u1f367.png
index 5687cecc3..5687cecc3 100644
--- a/data/emoticons/noto-emoticons/png/u1f367.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f367.png
diff --git a/data/emoticons/noto-emoticons/png/u1f368.png b/gajim/data/emoticons/noto-emoticons/png/u1f368.png
index e5a92b31f..e5a92b31f 100644
--- a/data/emoticons/noto-emoticons/png/u1f368.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f368.png
diff --git a/data/emoticons/noto-emoticons/png/u1f369.png b/gajim/data/emoticons/noto-emoticons/png/u1f369.png
index 888ab8a68..888ab8a68 100644
--- a/data/emoticons/noto-emoticons/png/u1f369.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f369.png
diff --git a/data/emoticons/noto-emoticons/png/u1f36a.png b/gajim/data/emoticons/noto-emoticons/png/u1f36a.png
index 8be1673ca..8be1673ca 100644
--- a/data/emoticons/noto-emoticons/png/u1f36a.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f36a.png
diff --git a/data/emoticons/noto-emoticons/png/u1f36b.png b/gajim/data/emoticons/noto-emoticons/png/u1f36b.png
index 6c3d2bf3d..6c3d2bf3d 100644
--- a/data/emoticons/noto-emoticons/png/u1f36b.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f36b.png
diff --git a/data/emoticons/noto-emoticons/png/u1f36c.png b/gajim/data/emoticons/noto-emoticons/png/u1f36c.png
index 5e9231bb8..5e9231bb8 100644
--- a/data/emoticons/noto-emoticons/png/u1f36c.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f36c.png
diff --git a/data/emoticons/noto-emoticons/png/u1f36d.png b/gajim/data/emoticons/noto-emoticons/png/u1f36d.png
index 88b2d1729..88b2d1729 100644
--- a/data/emoticons/noto-emoticons/png/u1f36d.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f36d.png
diff --git a/data/emoticons/noto-emoticons/png/u1f36e.png b/gajim/data/emoticons/noto-emoticons/png/u1f36e.png
index 03b296542..03b296542 100644
--- a/data/emoticons/noto-emoticons/png/u1f36e.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f36e.png
diff --git a/data/emoticons/noto-emoticons/png/u1f36f.png b/gajim/data/emoticons/noto-emoticons/png/u1f36f.png
index 5da2b35f9..5da2b35f9 100644
--- a/data/emoticons/noto-emoticons/png/u1f36f.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f36f.png
diff --git a/data/emoticons/noto-emoticons/png/u1f370.png b/gajim/data/emoticons/noto-emoticons/png/u1f370.png
index 5a6a1def6..5a6a1def6 100644
--- a/data/emoticons/noto-emoticons/png/u1f370.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f370.png
diff --git a/data/emoticons/noto-emoticons/png/u1f371.png b/gajim/data/emoticons/noto-emoticons/png/u1f371.png
index f99704145..f99704145 100644
--- a/data/emoticons/noto-emoticons/png/u1f371.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f371.png
diff --git a/data/emoticons/noto-emoticons/png/u1f372.png b/gajim/data/emoticons/noto-emoticons/png/u1f372.png
index 69417006a..69417006a 100644
--- a/data/emoticons/noto-emoticons/png/u1f372.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f372.png
diff --git a/data/emoticons/noto-emoticons/png/u1f373.png b/gajim/data/emoticons/noto-emoticons/png/u1f373.png
index 9d4a8eb85..9d4a8eb85 100644
--- a/data/emoticons/noto-emoticons/png/u1f373.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f373.png
diff --git a/data/emoticons/noto-emoticons/png/u1f374.png b/gajim/data/emoticons/noto-emoticons/png/u1f374.png
index 7e9894c7e..7e9894c7e 100644
--- a/data/emoticons/noto-emoticons/png/u1f374.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f374.png
diff --git a/data/emoticons/noto-emoticons/png/u1f375.png b/gajim/data/emoticons/noto-emoticons/png/u1f375.png
index f51a586df..f51a586df 100644
--- a/data/emoticons/noto-emoticons/png/u1f375.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f375.png
diff --git a/data/emoticons/noto-emoticons/png/u1f376.png b/gajim/data/emoticons/noto-emoticons/png/u1f376.png
index 25583e410..25583e410 100644
--- a/data/emoticons/noto-emoticons/png/u1f376.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f376.png
diff --git a/data/emoticons/noto-emoticons/png/u1f377.png b/gajim/data/emoticons/noto-emoticons/png/u1f377.png
index b53bb5aa4..b53bb5aa4 100644
--- a/data/emoticons/noto-emoticons/png/u1f377.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f377.png
diff --git a/data/emoticons/noto-emoticons/png/u1f378.png b/gajim/data/emoticons/noto-emoticons/png/u1f378.png
index 35caca524..35caca524 100644
--- a/data/emoticons/noto-emoticons/png/u1f378.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f378.png
diff --git a/data/emoticons/noto-emoticons/png/u1f379.png b/gajim/data/emoticons/noto-emoticons/png/u1f379.png
index 40b6310f1..40b6310f1 100644
--- a/data/emoticons/noto-emoticons/png/u1f379.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f379.png
diff --git a/data/emoticons/noto-emoticons/png/u1f37a.png b/gajim/data/emoticons/noto-emoticons/png/u1f37a.png
index 83a9f3c43..83a9f3c43 100644
--- a/data/emoticons/noto-emoticons/png/u1f37a.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f37a.png
diff --git a/data/emoticons/noto-emoticons/png/u1f37b.png b/gajim/data/emoticons/noto-emoticons/png/u1f37b.png
index ebb610e44..ebb610e44 100644
--- a/data/emoticons/noto-emoticons/png/u1f37b.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f37b.png
diff --git a/data/emoticons/noto-emoticons/png/u1f37c.png b/gajim/data/emoticons/noto-emoticons/png/u1f37c.png
index 97acb7edf..97acb7edf 100644
--- a/data/emoticons/noto-emoticons/png/u1f37c.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f37c.png
diff --git a/data/emoticons/noto-emoticons/png/u1f37d.png b/gajim/data/emoticons/noto-emoticons/png/u1f37d.png
index 0cfcff7da..0cfcff7da 100644
--- a/data/emoticons/noto-emoticons/png/u1f37d.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f37d.png
diff --git a/data/emoticons/noto-emoticons/png/u1f37e.png b/gajim/data/emoticons/noto-emoticons/png/u1f37e.png
index 459d01df9..459d01df9 100644
--- a/data/emoticons/noto-emoticons/png/u1f37e.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f37e.png
diff --git a/data/emoticons/noto-emoticons/png/u1f37f.png b/gajim/data/emoticons/noto-emoticons/png/u1f37f.png
index 955c80785..955c80785 100644
--- a/data/emoticons/noto-emoticons/png/u1f37f.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f37f.png
diff --git a/data/emoticons/noto-emoticons/png/u1f380.png b/gajim/data/emoticons/noto-emoticons/png/u1f380.png
index ded0e55b5..ded0e55b5 100644
--- a/data/emoticons/noto-emoticons/png/u1f380.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f380.png
diff --git a/data/emoticons/noto-emoticons/png/u1f381.png b/gajim/data/emoticons/noto-emoticons/png/u1f381.png
index 5e3b40024..5e3b40024 100644
--- a/data/emoticons/noto-emoticons/png/u1f381.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f381.png
diff --git a/data/emoticons/noto-emoticons/png/u1f382.png b/gajim/data/emoticons/noto-emoticons/png/u1f382.png
index 10c70c301..10c70c301 100644
--- a/data/emoticons/noto-emoticons/png/u1f382.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f382.png
diff --git a/data/emoticons/noto-emoticons/png/u1f383.png b/gajim/data/emoticons/noto-emoticons/png/u1f383.png
index ec438829e..ec438829e 100644
--- a/data/emoticons/noto-emoticons/png/u1f383.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f383.png
diff --git a/data/emoticons/noto-emoticons/png/u1f384.png b/gajim/data/emoticons/noto-emoticons/png/u1f384.png
index 7a0a5b349..7a0a5b349 100644
--- a/data/emoticons/noto-emoticons/png/u1f384.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f384.png
diff --git a/data/emoticons/noto-emoticons/png/u1f385.png b/gajim/data/emoticons/noto-emoticons/png/u1f385.png
index 6cc1fe71a..6cc1fe71a 100644
--- a/data/emoticons/noto-emoticons/png/u1f385.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f385.png
diff --git a/data/emoticons/noto-emoticons/png/u1f385_1f3fb.png b/gajim/data/emoticons/noto-emoticons/png/u1f385_1f3fb.png
index 386f58561..386f58561 100644
--- a/data/emoticons/noto-emoticons/png/u1f385_1f3fb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f385_1f3fb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f385_1f3fc.png b/gajim/data/emoticons/noto-emoticons/png/u1f385_1f3fc.png
index e1a8ad7f2..e1a8ad7f2 100644
--- a/data/emoticons/noto-emoticons/png/u1f385_1f3fc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f385_1f3fc.png
diff --git a/data/emoticons/noto-emoticons/png/u1f385_1f3fd.png b/gajim/data/emoticons/noto-emoticons/png/u1f385_1f3fd.png
index 56a12ed2c..56a12ed2c 100644
--- a/data/emoticons/noto-emoticons/png/u1f385_1f3fd.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f385_1f3fd.png
diff --git a/data/emoticons/noto-emoticons/png/u1f385_1f3fe.png b/gajim/data/emoticons/noto-emoticons/png/u1f385_1f3fe.png
index b619b4e4a..b619b4e4a 100644
--- a/data/emoticons/noto-emoticons/png/u1f385_1f3fe.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f385_1f3fe.png
diff --git a/data/emoticons/noto-emoticons/png/u1f385_1f3ff.png b/gajim/data/emoticons/noto-emoticons/png/u1f385_1f3ff.png
index 1713b404d..1713b404d 100644
--- a/data/emoticons/noto-emoticons/png/u1f385_1f3ff.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f385_1f3ff.png
diff --git a/data/emoticons/noto-emoticons/png/u1f386.png b/gajim/data/emoticons/noto-emoticons/png/u1f386.png
index cf083b739..cf083b739 100644
--- a/data/emoticons/noto-emoticons/png/u1f386.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f386.png
diff --git a/data/emoticons/noto-emoticons/png/u1f387.png b/gajim/data/emoticons/noto-emoticons/png/u1f387.png
index 7c32cb93a..7c32cb93a 100644
--- a/data/emoticons/noto-emoticons/png/u1f387.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f387.png
diff --git a/data/emoticons/noto-emoticons/png/u1f388.png b/gajim/data/emoticons/noto-emoticons/png/u1f388.png
index 8634cf01d..8634cf01d 100644
--- a/data/emoticons/noto-emoticons/png/u1f388.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f388.png
diff --git a/data/emoticons/noto-emoticons/png/u1f389.png b/gajim/data/emoticons/noto-emoticons/png/u1f389.png
index 8b2ed9cb8..8b2ed9cb8 100644
--- a/data/emoticons/noto-emoticons/png/u1f389.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f389.png
diff --git a/data/emoticons/noto-emoticons/png/u1f38a.png b/gajim/data/emoticons/noto-emoticons/png/u1f38a.png
index 8291c0250..8291c0250 100644
--- a/data/emoticons/noto-emoticons/png/u1f38a.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f38a.png
diff --git a/data/emoticons/noto-emoticons/png/u1f38b.png b/gajim/data/emoticons/noto-emoticons/png/u1f38b.png
index 6f9ee96e4..6f9ee96e4 100644
--- a/data/emoticons/noto-emoticons/png/u1f38b.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f38b.png
diff --git a/data/emoticons/noto-emoticons/png/u1f38c.png b/gajim/data/emoticons/noto-emoticons/png/u1f38c.png
index 2c3976089..2c3976089 100644
--- a/data/emoticons/noto-emoticons/png/u1f38c.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f38c.png
diff --git a/data/emoticons/noto-emoticons/png/u1f38d.png b/gajim/data/emoticons/noto-emoticons/png/u1f38d.png
index 156339c0d..156339c0d 100644
--- a/data/emoticons/noto-emoticons/png/u1f38d.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f38d.png
diff --git a/data/emoticons/noto-emoticons/png/u1f38e.png b/gajim/data/emoticons/noto-emoticons/png/u1f38e.png
index 1f598c457..1f598c457 100644
--- a/data/emoticons/noto-emoticons/png/u1f38e.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f38e.png
diff --git a/data/emoticons/noto-emoticons/png/u1f38f.png b/gajim/data/emoticons/noto-emoticons/png/u1f38f.png
index 84d6bb512..84d6bb512 100644
--- a/data/emoticons/noto-emoticons/png/u1f38f.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f38f.png
diff --git a/data/emoticons/noto-emoticons/png/u1f390.png b/gajim/data/emoticons/noto-emoticons/png/u1f390.png
index f2723df51..f2723df51 100644
--- a/data/emoticons/noto-emoticons/png/u1f390.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f390.png
diff --git a/data/emoticons/noto-emoticons/png/u1f391.png b/gajim/data/emoticons/noto-emoticons/png/u1f391.png
index ca9b6421f..ca9b6421f 100644
--- a/data/emoticons/noto-emoticons/png/u1f391.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f391.png
diff --git a/data/emoticons/noto-emoticons/png/u1f392.png b/gajim/data/emoticons/noto-emoticons/png/u1f392.png
index d9718c988..d9718c988 100644
--- a/data/emoticons/noto-emoticons/png/u1f392.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f392.png
diff --git a/data/emoticons/noto-emoticons/png/u1f393.png b/gajim/data/emoticons/noto-emoticons/png/u1f393.png
index 3788da885..3788da885 100644
--- a/data/emoticons/noto-emoticons/png/u1f393.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f393.png
diff --git a/data/emoticons/noto-emoticons/png/u1f396.png b/gajim/data/emoticons/noto-emoticons/png/u1f396.png
index 28ee80563..28ee80563 100644
--- a/data/emoticons/noto-emoticons/png/u1f396.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f396.png
diff --git a/data/emoticons/noto-emoticons/png/u1f397.png b/gajim/data/emoticons/noto-emoticons/png/u1f397.png
index bca1d6dae..bca1d6dae 100644
--- a/data/emoticons/noto-emoticons/png/u1f397.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f397.png
diff --git a/data/emoticons/noto-emoticons/png/u1f399.png b/gajim/data/emoticons/noto-emoticons/png/u1f399.png
index fd6bbf03a..fd6bbf03a 100644
--- a/data/emoticons/noto-emoticons/png/u1f399.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f399.png
diff --git a/data/emoticons/noto-emoticons/png/u1f39a.png b/gajim/data/emoticons/noto-emoticons/png/u1f39a.png
index cbe5e4eb2..cbe5e4eb2 100644
--- a/data/emoticons/noto-emoticons/png/u1f39a.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f39a.png
diff --git a/data/emoticons/noto-emoticons/png/u1f39b.png b/gajim/data/emoticons/noto-emoticons/png/u1f39b.png
index d99bb964f..d99bb964f 100644
--- a/data/emoticons/noto-emoticons/png/u1f39b.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f39b.png
diff --git a/data/emoticons/noto-emoticons/png/u1f39e.png b/gajim/data/emoticons/noto-emoticons/png/u1f39e.png
index deb2b2aa2..deb2b2aa2 100644
--- a/data/emoticons/noto-emoticons/png/u1f39e.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f39e.png
diff --git a/data/emoticons/noto-emoticons/png/u1f39f.png b/gajim/data/emoticons/noto-emoticons/png/u1f39f.png
index a35c9642a..a35c9642a 100644
--- a/data/emoticons/noto-emoticons/png/u1f39f.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f39f.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3a0.png b/gajim/data/emoticons/noto-emoticons/png/u1f3a0.png
index eebedf467..eebedf467 100644
--- a/data/emoticons/noto-emoticons/png/u1f3a0.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3a0.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3a1.png b/gajim/data/emoticons/noto-emoticons/png/u1f3a1.png
index ec9a71a2d..ec9a71a2d 100644
--- a/data/emoticons/noto-emoticons/png/u1f3a1.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3a1.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3a2.png b/gajim/data/emoticons/noto-emoticons/png/u1f3a2.png
index 09fb9d6b6..09fb9d6b6 100644
--- a/data/emoticons/noto-emoticons/png/u1f3a2.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3a2.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3a3.png b/gajim/data/emoticons/noto-emoticons/png/u1f3a3.png
index 9563344a4..9563344a4 100644
--- a/data/emoticons/noto-emoticons/png/u1f3a3.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3a3.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3a4.png b/gajim/data/emoticons/noto-emoticons/png/u1f3a4.png
index 05191f88c..05191f88c 100644
--- a/data/emoticons/noto-emoticons/png/u1f3a4.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3a4.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3a5.png b/gajim/data/emoticons/noto-emoticons/png/u1f3a5.png
index 0c0c3f74c..0c0c3f74c 100644
--- a/data/emoticons/noto-emoticons/png/u1f3a5.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3a5.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3a6.png b/gajim/data/emoticons/noto-emoticons/png/u1f3a6.png
index e73714b10..e73714b10 100644
--- a/data/emoticons/noto-emoticons/png/u1f3a6.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3a6.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3a7.png b/gajim/data/emoticons/noto-emoticons/png/u1f3a7.png
index 10d0a058f..10d0a058f 100644
--- a/data/emoticons/noto-emoticons/png/u1f3a7.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3a7.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3a8.png b/gajim/data/emoticons/noto-emoticons/png/u1f3a8.png
index 496e9ca68..496e9ca68 100644
--- a/data/emoticons/noto-emoticons/png/u1f3a8.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3a8.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3a9.png b/gajim/data/emoticons/noto-emoticons/png/u1f3a9.png
index ca2ec3e66..ca2ec3e66 100644
--- a/data/emoticons/noto-emoticons/png/u1f3a9.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3a9.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3aa.png b/gajim/data/emoticons/noto-emoticons/png/u1f3aa.png
index 0471571dc..0471571dc 100644
--- a/data/emoticons/noto-emoticons/png/u1f3aa.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3aa.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3ab.png b/gajim/data/emoticons/noto-emoticons/png/u1f3ab.png
index b075b9a5c..b075b9a5c 100644
--- a/data/emoticons/noto-emoticons/png/u1f3ab.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3ab.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3ac.png b/gajim/data/emoticons/noto-emoticons/png/u1f3ac.png
index a5a154ced..a5a154ced 100644
--- a/data/emoticons/noto-emoticons/png/u1f3ac.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3ac.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3ad.png b/gajim/data/emoticons/noto-emoticons/png/u1f3ad.png
index 0e85401c5..0e85401c5 100644
--- a/data/emoticons/noto-emoticons/png/u1f3ad.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3ad.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3ae.png b/gajim/data/emoticons/noto-emoticons/png/u1f3ae.png
index 87e804266..87e804266 100644
--- a/data/emoticons/noto-emoticons/png/u1f3ae.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3ae.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3af.png b/gajim/data/emoticons/noto-emoticons/png/u1f3af.png
index 49eb28b16..49eb28b16 100644
--- a/data/emoticons/noto-emoticons/png/u1f3af.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3af.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3b0.png b/gajim/data/emoticons/noto-emoticons/png/u1f3b0.png
index 4f742e503..4f742e503 100644
--- a/data/emoticons/noto-emoticons/png/u1f3b0.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3b0.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3b1.png b/gajim/data/emoticons/noto-emoticons/png/u1f3b1.png
index d919c7960..d919c7960 100644
--- a/data/emoticons/noto-emoticons/png/u1f3b1.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3b1.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3b2.png b/gajim/data/emoticons/noto-emoticons/png/u1f3b2.png
index cf483ba7e..cf483ba7e 100644
--- a/data/emoticons/noto-emoticons/png/u1f3b2.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3b2.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3b3.png b/gajim/data/emoticons/noto-emoticons/png/u1f3b3.png
index 96876eb7b..96876eb7b 100644
--- a/data/emoticons/noto-emoticons/png/u1f3b3.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3b3.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3b4.png b/gajim/data/emoticons/noto-emoticons/png/u1f3b4.png
index 0996a026d..0996a026d 100644
--- a/data/emoticons/noto-emoticons/png/u1f3b4.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3b4.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3b5.png b/gajim/data/emoticons/noto-emoticons/png/u1f3b5.png
index db32f2617..db32f2617 100644
--- a/data/emoticons/noto-emoticons/png/u1f3b5.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3b5.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3b6.png b/gajim/data/emoticons/noto-emoticons/png/u1f3b6.png
index 33a67d1a0..33a67d1a0 100644
--- a/data/emoticons/noto-emoticons/png/u1f3b6.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3b6.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3b7.png b/gajim/data/emoticons/noto-emoticons/png/u1f3b7.png
index 39c6c4a7b..39c6c4a7b 100644
--- a/data/emoticons/noto-emoticons/png/u1f3b7.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3b7.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3b8.png b/gajim/data/emoticons/noto-emoticons/png/u1f3b8.png
index 255e29b7d..255e29b7d 100644
--- a/data/emoticons/noto-emoticons/png/u1f3b8.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3b8.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3b9.png b/gajim/data/emoticons/noto-emoticons/png/u1f3b9.png
index b7b99f0b7..b7b99f0b7 100644
--- a/data/emoticons/noto-emoticons/png/u1f3b9.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3b9.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3ba.png b/gajim/data/emoticons/noto-emoticons/png/u1f3ba.png
index ccb844bf2..ccb844bf2 100644
--- a/data/emoticons/noto-emoticons/png/u1f3ba.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3ba.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3bb.png b/gajim/data/emoticons/noto-emoticons/png/u1f3bb.png
index 94cc7324d..94cc7324d 100644
--- a/data/emoticons/noto-emoticons/png/u1f3bb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3bb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3bc.png b/gajim/data/emoticons/noto-emoticons/png/u1f3bc.png
index 250fc18c7..250fc18c7 100644
--- a/data/emoticons/noto-emoticons/png/u1f3bc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3bc.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3bd.png b/gajim/data/emoticons/noto-emoticons/png/u1f3bd.png
index a63112a97..a63112a97 100644
--- a/data/emoticons/noto-emoticons/png/u1f3bd.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3bd.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3be.png b/gajim/data/emoticons/noto-emoticons/png/u1f3be.png
index 8ee1f6e56..8ee1f6e56 100644
--- a/data/emoticons/noto-emoticons/png/u1f3be.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3be.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3bf.png b/gajim/data/emoticons/noto-emoticons/png/u1f3bf.png
index 5a133f45e..5a133f45e 100644
--- a/data/emoticons/noto-emoticons/png/u1f3bf.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3bf.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3c0.png b/gajim/data/emoticons/noto-emoticons/png/u1f3c0.png
index 16a0fd999..16a0fd999 100644
--- a/data/emoticons/noto-emoticons/png/u1f3c0.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3c0.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3c1.png b/gajim/data/emoticons/noto-emoticons/png/u1f3c1.png
index ce9e9c338..ce9e9c338 100644
--- a/data/emoticons/noto-emoticons/png/u1f3c1.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3c1.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3c2.png b/gajim/data/emoticons/noto-emoticons/png/u1f3c2.png
index 80afd5b82..80afd5b82 100644
--- a/data/emoticons/noto-emoticons/png/u1f3c2.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3c2.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3c3.png b/gajim/data/emoticons/noto-emoticons/png/u1f3c3.png
index 4c9b4cc71..4c9b4cc71 100644
--- a/data/emoticons/noto-emoticons/png/u1f3c3.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3c3.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3c3_1f3fb.png b/gajim/data/emoticons/noto-emoticons/png/u1f3c3_1f3fb.png
index d304e6a04..d304e6a04 100644
--- a/data/emoticons/noto-emoticons/png/u1f3c3_1f3fb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3c3_1f3fb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3c3_1f3fb_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f3c3_1f3fb_200d_2640.png
index 9eac300fd..9eac300fd 100644
--- a/data/emoticons/noto-emoticons/png/u1f3c3_1f3fb_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3c3_1f3fb_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3c3_1f3fb_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f3c3_1f3fb_200d_2642.png
index d304e6a04..d304e6a04 100644
--- a/data/emoticons/noto-emoticons/png/u1f3c3_1f3fb_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3c3_1f3fb_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3c3_1f3fc.png b/gajim/data/emoticons/noto-emoticons/png/u1f3c3_1f3fc.png
index 78686b810..78686b810 100644
--- a/data/emoticons/noto-emoticons/png/u1f3c3_1f3fc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3c3_1f3fc.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3c3_1f3fc_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f3c3_1f3fc_200d_2640.png
index e8187f6a3..e8187f6a3 100644
--- a/data/emoticons/noto-emoticons/png/u1f3c3_1f3fc_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3c3_1f3fc_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3c3_1f3fc_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f3c3_1f3fc_200d_2642.png
index 78686b810..78686b810 100644
--- a/data/emoticons/noto-emoticons/png/u1f3c3_1f3fc_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3c3_1f3fc_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3c3_1f3fd.png b/gajim/data/emoticons/noto-emoticons/png/u1f3c3_1f3fd.png
index d33eb8932..d33eb8932 100644
--- a/data/emoticons/noto-emoticons/png/u1f3c3_1f3fd.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3c3_1f3fd.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3c3_1f3fd_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f3c3_1f3fd_200d_2640.png
index 8cb46c34e..8cb46c34e 100644
--- a/data/emoticons/noto-emoticons/png/u1f3c3_1f3fd_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3c3_1f3fd_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3c3_1f3fd_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f3c3_1f3fd_200d_2642.png
index d33eb8932..d33eb8932 100644
--- a/data/emoticons/noto-emoticons/png/u1f3c3_1f3fd_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3c3_1f3fd_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3c3_1f3fe.png b/gajim/data/emoticons/noto-emoticons/png/u1f3c3_1f3fe.png
index b5d32326f..b5d32326f 100644
--- a/data/emoticons/noto-emoticons/png/u1f3c3_1f3fe.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3c3_1f3fe.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3c3_1f3fe_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f3c3_1f3fe_200d_2640.png
index fba0da132..fba0da132 100644
--- a/data/emoticons/noto-emoticons/png/u1f3c3_1f3fe_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3c3_1f3fe_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3c3_1f3fe_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f3c3_1f3fe_200d_2642.png
index b5d32326f..b5d32326f 100644
--- a/data/emoticons/noto-emoticons/png/u1f3c3_1f3fe_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3c3_1f3fe_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3c3_1f3ff.png b/gajim/data/emoticons/noto-emoticons/png/u1f3c3_1f3ff.png
index 93c3f76d7..93c3f76d7 100644
--- a/data/emoticons/noto-emoticons/png/u1f3c3_1f3ff.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3c3_1f3ff.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3c3_1f3ff_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f3c3_1f3ff_200d_2640.png
index 3f5a2065a..3f5a2065a 100644
--- a/data/emoticons/noto-emoticons/png/u1f3c3_1f3ff_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3c3_1f3ff_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3c3_1f3ff_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f3c3_1f3ff_200d_2642.png
index 93c3f76d7..93c3f76d7 100644
--- a/data/emoticons/noto-emoticons/png/u1f3c3_1f3ff_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3c3_1f3ff_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3c3_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f3c3_200d_2640.png
index 32fc9e19e..32fc9e19e 100644
--- a/data/emoticons/noto-emoticons/png/u1f3c3_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3c3_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3c3_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f3c3_200d_2642.png
index 4c9b4cc71..4c9b4cc71 100644
--- a/data/emoticons/noto-emoticons/png/u1f3c3_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3c3_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3c4.png b/gajim/data/emoticons/noto-emoticons/png/u1f3c4.png
index 04ce0fcc4..04ce0fcc4 100644
--- a/data/emoticons/noto-emoticons/png/u1f3c4.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3c4.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3c4_1f3fb.png b/gajim/data/emoticons/noto-emoticons/png/u1f3c4_1f3fb.png
index 3f6743f0a..3f6743f0a 100644
--- a/data/emoticons/noto-emoticons/png/u1f3c4_1f3fb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3c4_1f3fb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3c4_1f3fb_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f3c4_1f3fb_200d_2640.png
index 1744432c9..1744432c9 100644
--- a/data/emoticons/noto-emoticons/png/u1f3c4_1f3fb_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3c4_1f3fb_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3c4_1f3fb_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f3c4_1f3fb_200d_2642.png
index 3f6743f0a..3f6743f0a 100644
--- a/data/emoticons/noto-emoticons/png/u1f3c4_1f3fb_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3c4_1f3fb_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3c4_1f3fc.png b/gajim/data/emoticons/noto-emoticons/png/u1f3c4_1f3fc.png
index 5ebf4b89c..5ebf4b89c 100644
--- a/data/emoticons/noto-emoticons/png/u1f3c4_1f3fc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3c4_1f3fc.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3c4_1f3fc_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f3c4_1f3fc_200d_2640.png
index cee71632e..cee71632e 100644
--- a/data/emoticons/noto-emoticons/png/u1f3c4_1f3fc_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3c4_1f3fc_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3c4_1f3fc_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f3c4_1f3fc_200d_2642.png
index 5ebf4b89c..5ebf4b89c 100644
--- a/data/emoticons/noto-emoticons/png/u1f3c4_1f3fc_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3c4_1f3fc_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3c4_1f3fd.png b/gajim/data/emoticons/noto-emoticons/png/u1f3c4_1f3fd.png
index 096066199..096066199 100644
--- a/data/emoticons/noto-emoticons/png/u1f3c4_1f3fd.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3c4_1f3fd.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3c4_1f3fd_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f3c4_1f3fd_200d_2640.png
index 0e6cfc847..0e6cfc847 100644
--- a/data/emoticons/noto-emoticons/png/u1f3c4_1f3fd_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3c4_1f3fd_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3c4_1f3fd_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f3c4_1f3fd_200d_2642.png
index 096066199..096066199 100644
--- a/data/emoticons/noto-emoticons/png/u1f3c4_1f3fd_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3c4_1f3fd_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3c4_1f3fe.png b/gajim/data/emoticons/noto-emoticons/png/u1f3c4_1f3fe.png
index 456ac2395..456ac2395 100644
--- a/data/emoticons/noto-emoticons/png/u1f3c4_1f3fe.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3c4_1f3fe.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3c4_1f3fe_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f3c4_1f3fe_200d_2640.png
index 73725c4ed..73725c4ed 100644
--- a/data/emoticons/noto-emoticons/png/u1f3c4_1f3fe_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3c4_1f3fe_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3c4_1f3fe_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f3c4_1f3fe_200d_2642.png
index 456ac2395..456ac2395 100644
--- a/data/emoticons/noto-emoticons/png/u1f3c4_1f3fe_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3c4_1f3fe_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3c4_1f3ff.png b/gajim/data/emoticons/noto-emoticons/png/u1f3c4_1f3ff.png
index de37359ab..de37359ab 100644
--- a/data/emoticons/noto-emoticons/png/u1f3c4_1f3ff.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3c4_1f3ff.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3c4_1f3ff_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f3c4_1f3ff_200d_2640.png
index 9a98850b4..9a98850b4 100644
--- a/data/emoticons/noto-emoticons/png/u1f3c4_1f3ff_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3c4_1f3ff_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3c4_1f3ff_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f3c4_1f3ff_200d_2642.png
index de37359ab..de37359ab 100644
--- a/data/emoticons/noto-emoticons/png/u1f3c4_1f3ff_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3c4_1f3ff_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3c4_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f3c4_200d_2640.png
index 4272e8106..4272e8106 100644
--- a/data/emoticons/noto-emoticons/png/u1f3c4_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3c4_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3c4_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f3c4_200d_2642.png
index 04ce0fcc4..04ce0fcc4 100644
--- a/data/emoticons/noto-emoticons/png/u1f3c4_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3c4_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3c5.png b/gajim/data/emoticons/noto-emoticons/png/u1f3c5.png
index bdd845c9d..bdd845c9d 100644
--- a/data/emoticons/noto-emoticons/png/u1f3c5.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3c5.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3c6.png b/gajim/data/emoticons/noto-emoticons/png/u1f3c6.png
index 6d7ba20a2..6d7ba20a2 100644
--- a/data/emoticons/noto-emoticons/png/u1f3c6.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3c6.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3c7.png b/gajim/data/emoticons/noto-emoticons/png/u1f3c7.png
index 0a4b803e0..0a4b803e0 100644
--- a/data/emoticons/noto-emoticons/png/u1f3c7.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3c7.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3c8.png b/gajim/data/emoticons/noto-emoticons/png/u1f3c8.png
index 695842610..695842610 100644
--- a/data/emoticons/noto-emoticons/png/u1f3c8.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3c8.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3c9.png b/gajim/data/emoticons/noto-emoticons/png/u1f3c9.png
index 46c2fc3ef..46c2fc3ef 100644
--- a/data/emoticons/noto-emoticons/png/u1f3c9.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3c9.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3ca.png b/gajim/data/emoticons/noto-emoticons/png/u1f3ca.png
index 835c6443f..835c6443f 100644
--- a/data/emoticons/noto-emoticons/png/u1f3ca.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3ca.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3ca_1f3fb.png b/gajim/data/emoticons/noto-emoticons/png/u1f3ca_1f3fb.png
index ab0a6f5a5..ab0a6f5a5 100644
--- a/data/emoticons/noto-emoticons/png/u1f3ca_1f3fb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3ca_1f3fb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3ca_1f3fb_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f3ca_1f3fb_200d_2640.png
index 785d618dd..785d618dd 100644
--- a/data/emoticons/noto-emoticons/png/u1f3ca_1f3fb_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3ca_1f3fb_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3ca_1f3fb_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f3ca_1f3fb_200d_2642.png
index ab0a6f5a5..ab0a6f5a5 100644
--- a/data/emoticons/noto-emoticons/png/u1f3ca_1f3fb_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3ca_1f3fb_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3ca_1f3fc.png b/gajim/data/emoticons/noto-emoticons/png/u1f3ca_1f3fc.png
index 5c0138111..5c0138111 100644
--- a/data/emoticons/noto-emoticons/png/u1f3ca_1f3fc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3ca_1f3fc.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3ca_1f3fc_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f3ca_1f3fc_200d_2640.png
index 049bca7ab..049bca7ab 100644
--- a/data/emoticons/noto-emoticons/png/u1f3ca_1f3fc_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3ca_1f3fc_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3ca_1f3fc_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f3ca_1f3fc_200d_2642.png
index 5c0138111..5c0138111 100644
--- a/data/emoticons/noto-emoticons/png/u1f3ca_1f3fc_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3ca_1f3fc_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3ca_1f3fd.png b/gajim/data/emoticons/noto-emoticons/png/u1f3ca_1f3fd.png
index 5dc628d91..5dc628d91 100644
--- a/data/emoticons/noto-emoticons/png/u1f3ca_1f3fd.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3ca_1f3fd.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3ca_1f3fd_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f3ca_1f3fd_200d_2640.png
index 8d838abd6..8d838abd6 100644
--- a/data/emoticons/noto-emoticons/png/u1f3ca_1f3fd_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3ca_1f3fd_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3ca_1f3fd_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f3ca_1f3fd_200d_2642.png
index 5dc628d91..5dc628d91 100644
--- a/data/emoticons/noto-emoticons/png/u1f3ca_1f3fd_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3ca_1f3fd_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3ca_1f3fe.png b/gajim/data/emoticons/noto-emoticons/png/u1f3ca_1f3fe.png
index 06a329efc..06a329efc 100644
--- a/data/emoticons/noto-emoticons/png/u1f3ca_1f3fe.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3ca_1f3fe.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3ca_1f3fe_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f3ca_1f3fe_200d_2640.png
index 6d315b079..6d315b079 100644
--- a/data/emoticons/noto-emoticons/png/u1f3ca_1f3fe_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3ca_1f3fe_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3ca_1f3fe_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f3ca_1f3fe_200d_2642.png
index 06a329efc..06a329efc 100644
--- a/data/emoticons/noto-emoticons/png/u1f3ca_1f3fe_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3ca_1f3fe_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3ca_1f3ff.png b/gajim/data/emoticons/noto-emoticons/png/u1f3ca_1f3ff.png
index 4b680128e..4b680128e 100644
--- a/data/emoticons/noto-emoticons/png/u1f3ca_1f3ff.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3ca_1f3ff.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3ca_1f3ff_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f3ca_1f3ff_200d_2640.png
index 6acc315ff..6acc315ff 100644
--- a/data/emoticons/noto-emoticons/png/u1f3ca_1f3ff_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3ca_1f3ff_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3ca_1f3ff_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f3ca_1f3ff_200d_2642.png
index 4b680128e..4b680128e 100644
--- a/data/emoticons/noto-emoticons/png/u1f3ca_1f3ff_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3ca_1f3ff_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3ca_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f3ca_200d_2640.png
index fa676577d..fa676577d 100644
--- a/data/emoticons/noto-emoticons/png/u1f3ca_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3ca_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3ca_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f3ca_200d_2642.png
index 835c6443f..835c6443f 100644
--- a/data/emoticons/noto-emoticons/png/u1f3ca_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3ca_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3cb.png b/gajim/data/emoticons/noto-emoticons/png/u1f3cb.png
index 70f448fd5..70f448fd5 100644
--- a/data/emoticons/noto-emoticons/png/u1f3cb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3cb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3cb_1f3fb.png b/gajim/data/emoticons/noto-emoticons/png/u1f3cb_1f3fb.png
index 36e7df109..36e7df109 100644
--- a/data/emoticons/noto-emoticons/png/u1f3cb_1f3fb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3cb_1f3fb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3cb_1f3fb_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f3cb_1f3fb_200d_2640.png
index 68381072c..68381072c 100644
--- a/data/emoticons/noto-emoticons/png/u1f3cb_1f3fb_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3cb_1f3fb_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3cb_1f3fb_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f3cb_1f3fb_200d_2642.png
index 36e7df109..36e7df109 100644
--- a/data/emoticons/noto-emoticons/png/u1f3cb_1f3fb_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3cb_1f3fb_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3cb_1f3fc.png b/gajim/data/emoticons/noto-emoticons/png/u1f3cb_1f3fc.png
index 655a4a684..655a4a684 100644
--- a/data/emoticons/noto-emoticons/png/u1f3cb_1f3fc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3cb_1f3fc.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3cb_1f3fc_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f3cb_1f3fc_200d_2640.png
index 647345014..647345014 100644
--- a/data/emoticons/noto-emoticons/png/u1f3cb_1f3fc_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3cb_1f3fc_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3cb_1f3fc_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f3cb_1f3fc_200d_2642.png
index 655a4a684..655a4a684 100644
--- a/data/emoticons/noto-emoticons/png/u1f3cb_1f3fc_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3cb_1f3fc_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3cb_1f3fd.png b/gajim/data/emoticons/noto-emoticons/png/u1f3cb_1f3fd.png
index f0f0e9ccd..f0f0e9ccd 100644
--- a/data/emoticons/noto-emoticons/png/u1f3cb_1f3fd.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3cb_1f3fd.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3cb_1f3fd_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f3cb_1f3fd_200d_2640.png
index f969b274d..f969b274d 100644
--- a/data/emoticons/noto-emoticons/png/u1f3cb_1f3fd_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3cb_1f3fd_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3cb_1f3fd_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f3cb_1f3fd_200d_2642.png
index f0f0e9ccd..f0f0e9ccd 100644
--- a/data/emoticons/noto-emoticons/png/u1f3cb_1f3fd_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3cb_1f3fd_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3cb_1f3fe.png b/gajim/data/emoticons/noto-emoticons/png/u1f3cb_1f3fe.png
index 2a3e79949..2a3e79949 100644
--- a/data/emoticons/noto-emoticons/png/u1f3cb_1f3fe.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3cb_1f3fe.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3cb_1f3fe_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f3cb_1f3fe_200d_2640.png
index 109cd7517..109cd7517 100644
--- a/data/emoticons/noto-emoticons/png/u1f3cb_1f3fe_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3cb_1f3fe_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3cb_1f3fe_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f3cb_1f3fe_200d_2642.png
index 2a3e79949..2a3e79949 100644
--- a/data/emoticons/noto-emoticons/png/u1f3cb_1f3fe_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3cb_1f3fe_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3cb_1f3ff.png b/gajim/data/emoticons/noto-emoticons/png/u1f3cb_1f3ff.png
index 0397da21f..0397da21f 100644
--- a/data/emoticons/noto-emoticons/png/u1f3cb_1f3ff.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3cb_1f3ff.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3cb_1f3ff_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f3cb_1f3ff_200d_2640.png
index d1a029ce5..d1a029ce5 100644
--- a/data/emoticons/noto-emoticons/png/u1f3cb_1f3ff_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3cb_1f3ff_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3cb_1f3ff_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f3cb_1f3ff_200d_2642.png
index 0397da21f..0397da21f 100644
--- a/data/emoticons/noto-emoticons/png/u1f3cb_1f3ff_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3cb_1f3ff_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3cb_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f3cb_200d_2640.png
index dd729fa06..dd729fa06 100644
--- a/data/emoticons/noto-emoticons/png/u1f3cb_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3cb_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3cb_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f3cb_200d_2642.png
index 70f448fd5..70f448fd5 100644
--- a/data/emoticons/noto-emoticons/png/u1f3cb_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3cb_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3cc.png b/gajim/data/emoticons/noto-emoticons/png/u1f3cc.png
index e28d603cf..e28d603cf 100644
--- a/data/emoticons/noto-emoticons/png/u1f3cc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3cc.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3cc_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f3cc_200d_2640.png
index 9f2647e06..9f2647e06 100644
--- a/data/emoticons/noto-emoticons/png/u1f3cc_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3cc_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3cc_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f3cc_200d_2642.png
index e28d603cf..e28d603cf 100644
--- a/data/emoticons/noto-emoticons/png/u1f3cc_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3cc_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3cd.png b/gajim/data/emoticons/noto-emoticons/png/u1f3cd.png
index bff423cf7..bff423cf7 100644
--- a/data/emoticons/noto-emoticons/png/u1f3cd.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3cd.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3ce.png b/gajim/data/emoticons/noto-emoticons/png/u1f3ce.png
index 3274ee942..3274ee942 100644
--- a/data/emoticons/noto-emoticons/png/u1f3ce.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3ce.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3cf.png b/gajim/data/emoticons/noto-emoticons/png/u1f3cf.png
index fca296eb2..fca296eb2 100644
--- a/data/emoticons/noto-emoticons/png/u1f3cf.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3cf.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3d0.png b/gajim/data/emoticons/noto-emoticons/png/u1f3d0.png
index 5db50990d..5db50990d 100644
--- a/data/emoticons/noto-emoticons/png/u1f3d0.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3d0.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3d1.png b/gajim/data/emoticons/noto-emoticons/png/u1f3d1.png
index e5fb2e4fb..e5fb2e4fb 100644
--- a/data/emoticons/noto-emoticons/png/u1f3d1.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3d1.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3d2.png b/gajim/data/emoticons/noto-emoticons/png/u1f3d2.png
index 4def1f56a..4def1f56a 100644
--- a/data/emoticons/noto-emoticons/png/u1f3d2.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3d2.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3d3.png b/gajim/data/emoticons/noto-emoticons/png/u1f3d3.png
index 9393d384e..9393d384e 100644
--- a/data/emoticons/noto-emoticons/png/u1f3d3.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3d3.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3d4.png b/gajim/data/emoticons/noto-emoticons/png/u1f3d4.png
index c6b2d3141..c6b2d3141 100644
--- a/data/emoticons/noto-emoticons/png/u1f3d4.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3d4.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3d5.png b/gajim/data/emoticons/noto-emoticons/png/u1f3d5.png
index a4f4b3d4d..a4f4b3d4d 100644
--- a/data/emoticons/noto-emoticons/png/u1f3d5.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3d5.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3d6.png b/gajim/data/emoticons/noto-emoticons/png/u1f3d6.png
index bc658d478..bc658d478 100644
--- a/data/emoticons/noto-emoticons/png/u1f3d6.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3d6.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3d7.png b/gajim/data/emoticons/noto-emoticons/png/u1f3d7.png
index dd8b16216..dd8b16216 100644
--- a/data/emoticons/noto-emoticons/png/u1f3d7.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3d7.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3d8.png b/gajim/data/emoticons/noto-emoticons/png/u1f3d8.png
index 278d8045c..278d8045c 100644
--- a/data/emoticons/noto-emoticons/png/u1f3d8.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3d8.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3d9.png b/gajim/data/emoticons/noto-emoticons/png/u1f3d9.png
index ff4db365f..ff4db365f 100644
--- a/data/emoticons/noto-emoticons/png/u1f3d9.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3d9.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3da.png b/gajim/data/emoticons/noto-emoticons/png/u1f3da.png
index 5ef1633d3..5ef1633d3 100644
--- a/data/emoticons/noto-emoticons/png/u1f3da.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3da.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3db.png b/gajim/data/emoticons/noto-emoticons/png/u1f3db.png
index 1212c8ea1..1212c8ea1 100644
--- a/data/emoticons/noto-emoticons/png/u1f3db.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3db.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3dc.png b/gajim/data/emoticons/noto-emoticons/png/u1f3dc.png
index 3b2275c5b..3b2275c5b 100644
--- a/data/emoticons/noto-emoticons/png/u1f3dc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3dc.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3dd.png b/gajim/data/emoticons/noto-emoticons/png/u1f3dd.png
index f01edb2c3..f01edb2c3 100644
--- a/data/emoticons/noto-emoticons/png/u1f3dd.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3dd.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3de.png b/gajim/data/emoticons/noto-emoticons/png/u1f3de.png
index bb0ccd9b4..bb0ccd9b4 100644
--- a/data/emoticons/noto-emoticons/png/u1f3de.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3de.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3df.png b/gajim/data/emoticons/noto-emoticons/png/u1f3df.png
index 2da579b0f..2da579b0f 100644
--- a/data/emoticons/noto-emoticons/png/u1f3df.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3df.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3e0.png b/gajim/data/emoticons/noto-emoticons/png/u1f3e0.png
index 2fd0d08bc..2fd0d08bc 100644
--- a/data/emoticons/noto-emoticons/png/u1f3e0.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3e0.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3e1.png b/gajim/data/emoticons/noto-emoticons/png/u1f3e1.png
index f56627a42..f56627a42 100644
--- a/data/emoticons/noto-emoticons/png/u1f3e1.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3e1.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3e2.png b/gajim/data/emoticons/noto-emoticons/png/u1f3e2.png
index 76c960987..76c960987 100644
--- a/data/emoticons/noto-emoticons/png/u1f3e2.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3e2.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3e3.png b/gajim/data/emoticons/noto-emoticons/png/u1f3e3.png
index 3c4b098ca..3c4b098ca 100644
--- a/data/emoticons/noto-emoticons/png/u1f3e3.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3e3.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3e4.png b/gajim/data/emoticons/noto-emoticons/png/u1f3e4.png
index 3f8e689e0..3f8e689e0 100644
--- a/data/emoticons/noto-emoticons/png/u1f3e4.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3e4.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3e5.png b/gajim/data/emoticons/noto-emoticons/png/u1f3e5.png
index fbb471524..fbb471524 100644
--- a/data/emoticons/noto-emoticons/png/u1f3e5.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3e5.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3e6.png b/gajim/data/emoticons/noto-emoticons/png/u1f3e6.png
index 63d8fa1e9..63d8fa1e9 100644
--- a/data/emoticons/noto-emoticons/png/u1f3e6.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3e6.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3e7.png b/gajim/data/emoticons/noto-emoticons/png/u1f3e7.png
index d3308077a..d3308077a 100644
--- a/data/emoticons/noto-emoticons/png/u1f3e7.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3e7.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3e8.png b/gajim/data/emoticons/noto-emoticons/png/u1f3e8.png
index d87d155cb..d87d155cb 100644
--- a/data/emoticons/noto-emoticons/png/u1f3e8.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3e8.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3e9.png b/gajim/data/emoticons/noto-emoticons/png/u1f3e9.png
index b48b36a7e..b48b36a7e 100644
--- a/data/emoticons/noto-emoticons/png/u1f3e9.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3e9.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3ea.png b/gajim/data/emoticons/noto-emoticons/png/u1f3ea.png
index 93e39e018..93e39e018 100644
--- a/data/emoticons/noto-emoticons/png/u1f3ea.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3ea.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3eb.png b/gajim/data/emoticons/noto-emoticons/png/u1f3eb.png
index 4b182b19d..4b182b19d 100644
--- a/data/emoticons/noto-emoticons/png/u1f3eb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3eb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3ec.png b/gajim/data/emoticons/noto-emoticons/png/u1f3ec.png
index db1bfd978..db1bfd978 100644
--- a/data/emoticons/noto-emoticons/png/u1f3ec.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3ec.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3ed.png b/gajim/data/emoticons/noto-emoticons/png/u1f3ed.png
index fd035378a..fd035378a 100644
--- a/data/emoticons/noto-emoticons/png/u1f3ed.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3ed.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3ee.png b/gajim/data/emoticons/noto-emoticons/png/u1f3ee.png
index 7bc55cddd..7bc55cddd 100644
--- a/data/emoticons/noto-emoticons/png/u1f3ee.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3ee.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3ef.png b/gajim/data/emoticons/noto-emoticons/png/u1f3ef.png
index 154ba9ed9..154ba9ed9 100644
--- a/data/emoticons/noto-emoticons/png/u1f3ef.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3ef.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3f0.png b/gajim/data/emoticons/noto-emoticons/png/u1f3f0.png
index 4da72c758..4da72c758 100644
--- a/data/emoticons/noto-emoticons/png/u1f3f0.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3f0.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3f3.png b/gajim/data/emoticons/noto-emoticons/png/u1f3f3.png
index 15fec1fe5..15fec1fe5 100644
--- a/data/emoticons/noto-emoticons/png/u1f3f3.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3f3.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3f4.png b/gajim/data/emoticons/noto-emoticons/png/u1f3f4.png
index 85e5368d0..85e5368d0 100644
--- a/data/emoticons/noto-emoticons/png/u1f3f4.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3f4.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3f5.png b/gajim/data/emoticons/noto-emoticons/png/u1f3f5.png
index b6b802adc..b6b802adc 100644
--- a/data/emoticons/noto-emoticons/png/u1f3f5.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3f5.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3f7.png b/gajim/data/emoticons/noto-emoticons/png/u1f3f7.png
index c107b65fd..c107b65fd 100644
--- a/data/emoticons/noto-emoticons/png/u1f3f7.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3f7.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3f8.png b/gajim/data/emoticons/noto-emoticons/png/u1f3f8.png
index 5c7f713b7..5c7f713b7 100644
--- a/data/emoticons/noto-emoticons/png/u1f3f8.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3f8.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3f9.png b/gajim/data/emoticons/noto-emoticons/png/u1f3f9.png
index 2140ecf26..2140ecf26 100644
--- a/data/emoticons/noto-emoticons/png/u1f3f9.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3f9.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3fa.png b/gajim/data/emoticons/noto-emoticons/png/u1f3fa.png
index 523bf9e60..523bf9e60 100644
--- a/data/emoticons/noto-emoticons/png/u1f3fa.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3fa.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3fb.png b/gajim/data/emoticons/noto-emoticons/png/u1f3fb.png
index 3d0d105fa..3d0d105fa 100644
--- a/data/emoticons/noto-emoticons/png/u1f3fb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3fb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3fc.png b/gajim/data/emoticons/noto-emoticons/png/u1f3fc.png
index 8839526d1..8839526d1 100644
--- a/data/emoticons/noto-emoticons/png/u1f3fc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3fc.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3fd.png b/gajim/data/emoticons/noto-emoticons/png/u1f3fd.png
index 0be21d27e..0be21d27e 100644
--- a/data/emoticons/noto-emoticons/png/u1f3fd.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3fd.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3fe.png b/gajim/data/emoticons/noto-emoticons/png/u1f3fe.png
index 5ec45aecd..5ec45aecd 100644
--- a/data/emoticons/noto-emoticons/png/u1f3fe.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3fe.png
diff --git a/data/emoticons/noto-emoticons/png/u1f3ff.png b/gajim/data/emoticons/noto-emoticons/png/u1f3ff.png
index 4a101a360..4a101a360 100644
--- a/data/emoticons/noto-emoticons/png/u1f3ff.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f3ff.png
diff --git a/data/emoticons/noto-emoticons/png/u1f400.png b/gajim/data/emoticons/noto-emoticons/png/u1f400.png
index 5148f55ff..5148f55ff 100644
--- a/data/emoticons/noto-emoticons/png/u1f400.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f400.png
diff --git a/data/emoticons/noto-emoticons/png/u1f401.png b/gajim/data/emoticons/noto-emoticons/png/u1f401.png
index 60f0c9f7d..60f0c9f7d 100644
--- a/data/emoticons/noto-emoticons/png/u1f401.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f401.png
diff --git a/data/emoticons/noto-emoticons/png/u1f402.png b/gajim/data/emoticons/noto-emoticons/png/u1f402.png
index 4848123b6..4848123b6 100644
--- a/data/emoticons/noto-emoticons/png/u1f402.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f402.png
diff --git a/data/emoticons/noto-emoticons/png/u1f403.png b/gajim/data/emoticons/noto-emoticons/png/u1f403.png
index fadb438b6..fadb438b6 100644
--- a/data/emoticons/noto-emoticons/png/u1f403.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f403.png
diff --git a/data/emoticons/noto-emoticons/png/u1f404.png b/gajim/data/emoticons/noto-emoticons/png/u1f404.png
index c8c879884..c8c879884 100644
--- a/data/emoticons/noto-emoticons/png/u1f404.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f404.png
diff --git a/data/emoticons/noto-emoticons/png/u1f405.png b/gajim/data/emoticons/noto-emoticons/png/u1f405.png
index 3e2bc68f0..3e2bc68f0 100644
--- a/data/emoticons/noto-emoticons/png/u1f405.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f405.png
diff --git a/data/emoticons/noto-emoticons/png/u1f406.png b/gajim/data/emoticons/noto-emoticons/png/u1f406.png
index 283bff5e9..283bff5e9 100644
--- a/data/emoticons/noto-emoticons/png/u1f406.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f406.png
diff --git a/data/emoticons/noto-emoticons/png/u1f407.png b/gajim/data/emoticons/noto-emoticons/png/u1f407.png
index 8a5f4fa9d..8a5f4fa9d 100644
--- a/data/emoticons/noto-emoticons/png/u1f407.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f407.png
diff --git a/data/emoticons/noto-emoticons/png/u1f408.png b/gajim/data/emoticons/noto-emoticons/png/u1f408.png
index 2ea112a56..2ea112a56 100644
--- a/data/emoticons/noto-emoticons/png/u1f408.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f408.png
diff --git a/data/emoticons/noto-emoticons/png/u1f409.png b/gajim/data/emoticons/noto-emoticons/png/u1f409.png
index d83c199b8..d83c199b8 100644
--- a/data/emoticons/noto-emoticons/png/u1f409.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f409.png
diff --git a/data/emoticons/noto-emoticons/png/u1f40a.png b/gajim/data/emoticons/noto-emoticons/png/u1f40a.png
index 7e5aab5df..7e5aab5df 100644
--- a/data/emoticons/noto-emoticons/png/u1f40a.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f40a.png
diff --git a/data/emoticons/noto-emoticons/png/u1f40b.png b/gajim/data/emoticons/noto-emoticons/png/u1f40b.png
index 1e19f812c..1e19f812c 100644
--- a/data/emoticons/noto-emoticons/png/u1f40b.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f40b.png
diff --git a/data/emoticons/noto-emoticons/png/u1f40c.png b/gajim/data/emoticons/noto-emoticons/png/u1f40c.png
index b4ee9ba6e..b4ee9ba6e 100644
--- a/data/emoticons/noto-emoticons/png/u1f40c.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f40c.png
diff --git a/data/emoticons/noto-emoticons/png/u1f40d.png b/gajim/data/emoticons/noto-emoticons/png/u1f40d.png
index 639475fe7..639475fe7 100644
--- a/data/emoticons/noto-emoticons/png/u1f40d.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f40d.png
diff --git a/data/emoticons/noto-emoticons/png/u1f40e.png b/gajim/data/emoticons/noto-emoticons/png/u1f40e.png
index 9abef3ed2..9abef3ed2 100644
--- a/data/emoticons/noto-emoticons/png/u1f40e.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f40e.png
diff --git a/data/emoticons/noto-emoticons/png/u1f40f.png b/gajim/data/emoticons/noto-emoticons/png/u1f40f.png
index fe8abf422..fe8abf422 100644
--- a/data/emoticons/noto-emoticons/png/u1f40f.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f40f.png
diff --git a/data/emoticons/noto-emoticons/png/u1f410.png b/gajim/data/emoticons/noto-emoticons/png/u1f410.png
index 5b582fc62..5b582fc62 100644
--- a/data/emoticons/noto-emoticons/png/u1f410.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f410.png
diff --git a/data/emoticons/noto-emoticons/png/u1f411.png b/gajim/data/emoticons/noto-emoticons/png/u1f411.png
index 1e5723fd1..1e5723fd1 100644
--- a/data/emoticons/noto-emoticons/png/u1f411.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f411.png
diff --git a/data/emoticons/noto-emoticons/png/u1f412.png b/gajim/data/emoticons/noto-emoticons/png/u1f412.png
index 421dd1d30..421dd1d30 100644
--- a/data/emoticons/noto-emoticons/png/u1f412.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f412.png
diff --git a/data/emoticons/noto-emoticons/png/u1f413.png b/gajim/data/emoticons/noto-emoticons/png/u1f413.png
index 80c8a526a..80c8a526a 100644
--- a/data/emoticons/noto-emoticons/png/u1f413.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f413.png
diff --git a/data/emoticons/noto-emoticons/png/u1f414.png b/gajim/data/emoticons/noto-emoticons/png/u1f414.png
index 47ef9e8c1..47ef9e8c1 100644
--- a/data/emoticons/noto-emoticons/png/u1f414.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f414.png
diff --git a/data/emoticons/noto-emoticons/png/u1f415.png b/gajim/data/emoticons/noto-emoticons/png/u1f415.png
index 92dec9782..92dec9782 100644
--- a/data/emoticons/noto-emoticons/png/u1f415.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f415.png
diff --git a/data/emoticons/noto-emoticons/png/u1f416.png b/gajim/data/emoticons/noto-emoticons/png/u1f416.png
index e07c6d8bb..e07c6d8bb 100644
--- a/data/emoticons/noto-emoticons/png/u1f416.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f416.png
diff --git a/data/emoticons/noto-emoticons/png/u1f417.png b/gajim/data/emoticons/noto-emoticons/png/u1f417.png
index 834961a3a..834961a3a 100644
--- a/data/emoticons/noto-emoticons/png/u1f417.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f417.png
diff --git a/data/emoticons/noto-emoticons/png/u1f418.png b/gajim/data/emoticons/noto-emoticons/png/u1f418.png
index ddd2b19bf..ddd2b19bf 100644
--- a/data/emoticons/noto-emoticons/png/u1f418.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f418.png
diff --git a/data/emoticons/noto-emoticons/png/u1f419.png b/gajim/data/emoticons/noto-emoticons/png/u1f419.png
index d80454762..d80454762 100644
--- a/data/emoticons/noto-emoticons/png/u1f419.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f419.png
diff --git a/data/emoticons/noto-emoticons/png/u1f41a.png b/gajim/data/emoticons/noto-emoticons/png/u1f41a.png
index 377aa8625..377aa8625 100644
--- a/data/emoticons/noto-emoticons/png/u1f41a.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f41a.png
diff --git a/data/emoticons/noto-emoticons/png/u1f41b.png b/gajim/data/emoticons/noto-emoticons/png/u1f41b.png
index ef461d81a..ef461d81a 100644
--- a/data/emoticons/noto-emoticons/png/u1f41b.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f41b.png
diff --git a/data/emoticons/noto-emoticons/png/u1f41c.png b/gajim/data/emoticons/noto-emoticons/png/u1f41c.png
index ab7486fcb..ab7486fcb 100644
--- a/data/emoticons/noto-emoticons/png/u1f41c.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f41c.png
diff --git a/data/emoticons/noto-emoticons/png/u1f41d.png b/gajim/data/emoticons/noto-emoticons/png/u1f41d.png
index 52e2604ba..52e2604ba 100644
--- a/data/emoticons/noto-emoticons/png/u1f41d.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f41d.png
diff --git a/data/emoticons/noto-emoticons/png/u1f41e.png b/gajim/data/emoticons/noto-emoticons/png/u1f41e.png
index 445ea40e7..445ea40e7 100644
--- a/data/emoticons/noto-emoticons/png/u1f41e.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f41e.png
diff --git a/data/emoticons/noto-emoticons/png/u1f41f.png b/gajim/data/emoticons/noto-emoticons/png/u1f41f.png
index 504dc14e1..504dc14e1 100644
--- a/data/emoticons/noto-emoticons/png/u1f41f.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f41f.png
diff --git a/data/emoticons/noto-emoticons/png/u1f420.png b/gajim/data/emoticons/noto-emoticons/png/u1f420.png
index 4258d0a9f..4258d0a9f 100644
--- a/data/emoticons/noto-emoticons/png/u1f420.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f420.png
diff --git a/data/emoticons/noto-emoticons/png/u1f421.png b/gajim/data/emoticons/noto-emoticons/png/u1f421.png
index de01dfb44..de01dfb44 100644
--- a/data/emoticons/noto-emoticons/png/u1f421.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f421.png
diff --git a/data/emoticons/noto-emoticons/png/u1f422.png b/gajim/data/emoticons/noto-emoticons/png/u1f422.png
index edee8f794..edee8f794 100644
--- a/data/emoticons/noto-emoticons/png/u1f422.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f422.png
diff --git a/data/emoticons/noto-emoticons/png/u1f423.png b/gajim/data/emoticons/noto-emoticons/png/u1f423.png
index 100d36b4f..100d36b4f 100644
--- a/data/emoticons/noto-emoticons/png/u1f423.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f423.png
diff --git a/data/emoticons/noto-emoticons/png/u1f424.png b/gajim/data/emoticons/noto-emoticons/png/u1f424.png
index f5059b5d8..f5059b5d8 100644
--- a/data/emoticons/noto-emoticons/png/u1f424.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f424.png
diff --git a/data/emoticons/noto-emoticons/png/u1f425.png b/gajim/data/emoticons/noto-emoticons/png/u1f425.png
index acbbdde10..acbbdde10 100644
--- a/data/emoticons/noto-emoticons/png/u1f425.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f425.png
diff --git a/data/emoticons/noto-emoticons/png/u1f426.png b/gajim/data/emoticons/noto-emoticons/png/u1f426.png
index 3cacdbbb8..3cacdbbb8 100644
--- a/data/emoticons/noto-emoticons/png/u1f426.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f426.png
diff --git a/data/emoticons/noto-emoticons/png/u1f427.png b/gajim/data/emoticons/noto-emoticons/png/u1f427.png
index c2c0523d1..c2c0523d1 100644
--- a/data/emoticons/noto-emoticons/png/u1f427.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f427.png
diff --git a/data/emoticons/noto-emoticons/png/u1f428.png b/gajim/data/emoticons/noto-emoticons/png/u1f428.png
index 9cbb8c84d..9cbb8c84d 100644
--- a/data/emoticons/noto-emoticons/png/u1f428.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f428.png
diff --git a/data/emoticons/noto-emoticons/png/u1f429.png b/gajim/data/emoticons/noto-emoticons/png/u1f429.png
index 042b24220..042b24220 100644
--- a/data/emoticons/noto-emoticons/png/u1f429.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f429.png
diff --git a/data/emoticons/noto-emoticons/png/u1f42a.png b/gajim/data/emoticons/noto-emoticons/png/u1f42a.png
index f5dd1d8f2..f5dd1d8f2 100644
--- a/data/emoticons/noto-emoticons/png/u1f42a.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f42a.png
diff --git a/data/emoticons/noto-emoticons/png/u1f42b.png b/gajim/data/emoticons/noto-emoticons/png/u1f42b.png
index 121442e57..121442e57 100644
--- a/data/emoticons/noto-emoticons/png/u1f42b.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f42b.png
diff --git a/data/emoticons/noto-emoticons/png/u1f42c.png b/gajim/data/emoticons/noto-emoticons/png/u1f42c.png
index 6615a7296..6615a7296 100644
--- a/data/emoticons/noto-emoticons/png/u1f42c.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f42c.png
diff --git a/data/emoticons/noto-emoticons/png/u1f42d.png b/gajim/data/emoticons/noto-emoticons/png/u1f42d.png
index 6807f4d04..6807f4d04 100644
--- a/data/emoticons/noto-emoticons/png/u1f42d.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f42d.png
diff --git a/data/emoticons/noto-emoticons/png/u1f42e.png b/gajim/data/emoticons/noto-emoticons/png/u1f42e.png
index c30ef565c..c30ef565c 100644
--- a/data/emoticons/noto-emoticons/png/u1f42e.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f42e.png
diff --git a/data/emoticons/noto-emoticons/png/u1f42f.png b/gajim/data/emoticons/noto-emoticons/png/u1f42f.png
index 6531ea7f2..6531ea7f2 100644
--- a/data/emoticons/noto-emoticons/png/u1f42f.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f42f.png
diff --git a/data/emoticons/noto-emoticons/png/u1f430.png b/gajim/data/emoticons/noto-emoticons/png/u1f430.png
index 70f8d2afb..70f8d2afb 100644
--- a/data/emoticons/noto-emoticons/png/u1f430.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f430.png
diff --git a/data/emoticons/noto-emoticons/png/u1f431.png b/gajim/data/emoticons/noto-emoticons/png/u1f431.png
index e00079c9a..e00079c9a 100644
--- a/data/emoticons/noto-emoticons/png/u1f431.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f431.png
diff --git a/data/emoticons/noto-emoticons/png/u1f432.png b/gajim/data/emoticons/noto-emoticons/png/u1f432.png
index a95d09b79..a95d09b79 100644
--- a/data/emoticons/noto-emoticons/png/u1f432.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f432.png
diff --git a/data/emoticons/noto-emoticons/png/u1f433.png b/gajim/data/emoticons/noto-emoticons/png/u1f433.png
index 0ba369c8c..0ba369c8c 100644
--- a/data/emoticons/noto-emoticons/png/u1f433.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f433.png
diff --git a/data/emoticons/noto-emoticons/png/u1f434.png b/gajim/data/emoticons/noto-emoticons/png/u1f434.png
index 9950bdafe..9950bdafe 100644
--- a/data/emoticons/noto-emoticons/png/u1f434.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f434.png
diff --git a/data/emoticons/noto-emoticons/png/u1f435.png b/gajim/data/emoticons/noto-emoticons/png/u1f435.png
index ca4648532..ca4648532 100644
--- a/data/emoticons/noto-emoticons/png/u1f435.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f435.png
diff --git a/data/emoticons/noto-emoticons/png/u1f436.png b/gajim/data/emoticons/noto-emoticons/png/u1f436.png
index fdc2e2ed1..fdc2e2ed1 100644
--- a/data/emoticons/noto-emoticons/png/u1f436.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f436.png
diff --git a/data/emoticons/noto-emoticons/png/u1f437.png b/gajim/data/emoticons/noto-emoticons/png/u1f437.png
index 4ad0b12e6..4ad0b12e6 100644
--- a/data/emoticons/noto-emoticons/png/u1f437.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f437.png
diff --git a/data/emoticons/noto-emoticons/png/u1f438.png b/gajim/data/emoticons/noto-emoticons/png/u1f438.png
index 15bee7d5b..15bee7d5b 100644
--- a/data/emoticons/noto-emoticons/png/u1f438.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f438.png
diff --git a/data/emoticons/noto-emoticons/png/u1f439.png b/gajim/data/emoticons/noto-emoticons/png/u1f439.png
index a309353ee..a309353ee 100644
--- a/data/emoticons/noto-emoticons/png/u1f439.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f439.png
diff --git a/data/emoticons/noto-emoticons/png/u1f43a.png b/gajim/data/emoticons/noto-emoticons/png/u1f43a.png
index 54294bdce..54294bdce 100644
--- a/data/emoticons/noto-emoticons/png/u1f43a.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f43a.png
diff --git a/data/emoticons/noto-emoticons/png/u1f43b.png b/gajim/data/emoticons/noto-emoticons/png/u1f43b.png
index 6e64a6b14..6e64a6b14 100644
--- a/data/emoticons/noto-emoticons/png/u1f43b.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f43b.png
diff --git a/data/emoticons/noto-emoticons/png/u1f43c.png b/gajim/data/emoticons/noto-emoticons/png/u1f43c.png
index 494e33897..494e33897 100644
--- a/data/emoticons/noto-emoticons/png/u1f43c.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f43c.png
diff --git a/data/emoticons/noto-emoticons/png/u1f43d.png b/gajim/data/emoticons/noto-emoticons/png/u1f43d.png
index 305ac898c..305ac898c 100644
--- a/data/emoticons/noto-emoticons/png/u1f43d.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f43d.png
diff --git a/data/emoticons/noto-emoticons/png/u1f43e.png b/gajim/data/emoticons/noto-emoticons/png/u1f43e.png
index ede081e11..ede081e11 100644
--- a/data/emoticons/noto-emoticons/png/u1f43e.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f43e.png
diff --git a/data/emoticons/noto-emoticons/png/u1f43f.png b/gajim/data/emoticons/noto-emoticons/png/u1f43f.png
index febb1ce06..febb1ce06 100644
--- a/data/emoticons/noto-emoticons/png/u1f43f.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f43f.png
diff --git a/data/emoticons/noto-emoticons/png/u1f440.png b/gajim/data/emoticons/noto-emoticons/png/u1f440.png
index 768f3115d..768f3115d 100644
--- a/data/emoticons/noto-emoticons/png/u1f440.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f440.png
diff --git a/data/emoticons/noto-emoticons/png/u1f441.png b/gajim/data/emoticons/noto-emoticons/png/u1f441.png
index 2cee5128f..2cee5128f 100644
--- a/data/emoticons/noto-emoticons/png/u1f441.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f441.png
diff --git a/data/emoticons/noto-emoticons/png/u1f441_200d_1f5e8.png b/gajim/data/emoticons/noto-emoticons/png/u1f441_200d_1f5e8.png
index c73256ae0..c73256ae0 100644
--- a/data/emoticons/noto-emoticons/png/u1f441_200d_1f5e8.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f441_200d_1f5e8.png
diff --git a/data/emoticons/noto-emoticons/png/u1f442.png b/gajim/data/emoticons/noto-emoticons/png/u1f442.png
index 076cff6e7..076cff6e7 100644
--- a/data/emoticons/noto-emoticons/png/u1f442.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f442.png
diff --git a/data/emoticons/noto-emoticons/png/u1f442_1f3fb.png b/gajim/data/emoticons/noto-emoticons/png/u1f442_1f3fb.png
index bf7cd6dbe..bf7cd6dbe 100644
--- a/data/emoticons/noto-emoticons/png/u1f442_1f3fb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f442_1f3fb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f442_1f3fc.png b/gajim/data/emoticons/noto-emoticons/png/u1f442_1f3fc.png
index f4ca35fa8..f4ca35fa8 100644
--- a/data/emoticons/noto-emoticons/png/u1f442_1f3fc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f442_1f3fc.png
diff --git a/data/emoticons/noto-emoticons/png/u1f442_1f3fd.png b/gajim/data/emoticons/noto-emoticons/png/u1f442_1f3fd.png
index 49ffb1209..49ffb1209 100644
--- a/data/emoticons/noto-emoticons/png/u1f442_1f3fd.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f442_1f3fd.png
diff --git a/data/emoticons/noto-emoticons/png/u1f442_1f3fe.png b/gajim/data/emoticons/noto-emoticons/png/u1f442_1f3fe.png
index 564e0e8be..564e0e8be 100644
--- a/data/emoticons/noto-emoticons/png/u1f442_1f3fe.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f442_1f3fe.png
diff --git a/data/emoticons/noto-emoticons/png/u1f442_1f3ff.png b/gajim/data/emoticons/noto-emoticons/png/u1f442_1f3ff.png
index 70996a464..70996a464 100644
--- a/data/emoticons/noto-emoticons/png/u1f442_1f3ff.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f442_1f3ff.png
diff --git a/data/emoticons/noto-emoticons/png/u1f443.png b/gajim/data/emoticons/noto-emoticons/png/u1f443.png
index bd15c0a09..bd15c0a09 100644
--- a/data/emoticons/noto-emoticons/png/u1f443.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f443.png
diff --git a/data/emoticons/noto-emoticons/png/u1f443_1f3fb.png b/gajim/data/emoticons/noto-emoticons/png/u1f443_1f3fb.png
index 54f19bb04..54f19bb04 100644
--- a/data/emoticons/noto-emoticons/png/u1f443_1f3fb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f443_1f3fb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f443_1f3fc.png b/gajim/data/emoticons/noto-emoticons/png/u1f443_1f3fc.png
index 7bff41f85..7bff41f85 100644
--- a/data/emoticons/noto-emoticons/png/u1f443_1f3fc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f443_1f3fc.png
diff --git a/data/emoticons/noto-emoticons/png/u1f443_1f3fd.png b/gajim/data/emoticons/noto-emoticons/png/u1f443_1f3fd.png
index 136996ebb..136996ebb 100644
--- a/data/emoticons/noto-emoticons/png/u1f443_1f3fd.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f443_1f3fd.png
diff --git a/data/emoticons/noto-emoticons/png/u1f443_1f3fe.png b/gajim/data/emoticons/noto-emoticons/png/u1f443_1f3fe.png
index 56b23889e..56b23889e 100644
--- a/data/emoticons/noto-emoticons/png/u1f443_1f3fe.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f443_1f3fe.png
diff --git a/data/emoticons/noto-emoticons/png/u1f443_1f3ff.png b/gajim/data/emoticons/noto-emoticons/png/u1f443_1f3ff.png
index f8de09a34..f8de09a34 100644
--- a/data/emoticons/noto-emoticons/png/u1f443_1f3ff.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f443_1f3ff.png
diff --git a/data/emoticons/noto-emoticons/png/u1f444.png b/gajim/data/emoticons/noto-emoticons/png/u1f444.png
index 1cffd0446..1cffd0446 100644
--- a/data/emoticons/noto-emoticons/png/u1f444.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f444.png
diff --git a/data/emoticons/noto-emoticons/png/u1f445.png b/gajim/data/emoticons/noto-emoticons/png/u1f445.png
index a07793696..a07793696 100644
--- a/data/emoticons/noto-emoticons/png/u1f445.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f445.png
diff --git a/data/emoticons/noto-emoticons/png/u1f446.png b/gajim/data/emoticons/noto-emoticons/png/u1f446.png
index 6773582fe..6773582fe 100644
--- a/data/emoticons/noto-emoticons/png/u1f446.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f446.png
diff --git a/data/emoticons/noto-emoticons/png/u1f446_1f3fb.png b/gajim/data/emoticons/noto-emoticons/png/u1f446_1f3fb.png
index 35f116f48..35f116f48 100644
--- a/data/emoticons/noto-emoticons/png/u1f446_1f3fb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f446_1f3fb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f446_1f3fc.png b/gajim/data/emoticons/noto-emoticons/png/u1f446_1f3fc.png
index 0a103cfc0..0a103cfc0 100644
--- a/data/emoticons/noto-emoticons/png/u1f446_1f3fc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f446_1f3fc.png
diff --git a/data/emoticons/noto-emoticons/png/u1f446_1f3fd.png b/gajim/data/emoticons/noto-emoticons/png/u1f446_1f3fd.png
index 62cf29649..62cf29649 100644
--- a/data/emoticons/noto-emoticons/png/u1f446_1f3fd.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f446_1f3fd.png
diff --git a/data/emoticons/noto-emoticons/png/u1f446_1f3fe.png b/gajim/data/emoticons/noto-emoticons/png/u1f446_1f3fe.png
index 3f9873faa..3f9873faa 100644
--- a/data/emoticons/noto-emoticons/png/u1f446_1f3fe.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f446_1f3fe.png
diff --git a/data/emoticons/noto-emoticons/png/u1f446_1f3ff.png b/gajim/data/emoticons/noto-emoticons/png/u1f446_1f3ff.png
index 5bccbe8bd..5bccbe8bd 100644
--- a/data/emoticons/noto-emoticons/png/u1f446_1f3ff.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f446_1f3ff.png
diff --git a/data/emoticons/noto-emoticons/png/u1f447.png b/gajim/data/emoticons/noto-emoticons/png/u1f447.png
index f8a1d1fb8..f8a1d1fb8 100644
--- a/data/emoticons/noto-emoticons/png/u1f447.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f447.png
diff --git a/data/emoticons/noto-emoticons/png/u1f447_1f3fb.png b/gajim/data/emoticons/noto-emoticons/png/u1f447_1f3fb.png
index 585f70322..585f70322 100644
--- a/data/emoticons/noto-emoticons/png/u1f447_1f3fb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f447_1f3fb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f447_1f3fc.png b/gajim/data/emoticons/noto-emoticons/png/u1f447_1f3fc.png
index 5478061ef..5478061ef 100644
--- a/data/emoticons/noto-emoticons/png/u1f447_1f3fc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f447_1f3fc.png
diff --git a/data/emoticons/noto-emoticons/png/u1f447_1f3fd.png b/gajim/data/emoticons/noto-emoticons/png/u1f447_1f3fd.png
index ec1f80845..ec1f80845 100644
--- a/data/emoticons/noto-emoticons/png/u1f447_1f3fd.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f447_1f3fd.png
diff --git a/data/emoticons/noto-emoticons/png/u1f447_1f3fe.png b/gajim/data/emoticons/noto-emoticons/png/u1f447_1f3fe.png
index d1d067a6b..d1d067a6b 100644
--- a/data/emoticons/noto-emoticons/png/u1f447_1f3fe.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f447_1f3fe.png
diff --git a/data/emoticons/noto-emoticons/png/u1f447_1f3ff.png b/gajim/data/emoticons/noto-emoticons/png/u1f447_1f3ff.png
index e72d4b011..e72d4b011 100644
--- a/data/emoticons/noto-emoticons/png/u1f447_1f3ff.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f447_1f3ff.png
diff --git a/data/emoticons/noto-emoticons/png/u1f448.png b/gajim/data/emoticons/noto-emoticons/png/u1f448.png
index f76002ded..f76002ded 100644
--- a/data/emoticons/noto-emoticons/png/u1f448.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f448.png
diff --git a/data/emoticons/noto-emoticons/png/u1f448_1f3fb.png b/gajim/data/emoticons/noto-emoticons/png/u1f448_1f3fb.png
index 516d8f3a8..516d8f3a8 100644
--- a/data/emoticons/noto-emoticons/png/u1f448_1f3fb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f448_1f3fb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f448_1f3fc.png b/gajim/data/emoticons/noto-emoticons/png/u1f448_1f3fc.png
index b7bace410..b7bace410 100644
--- a/data/emoticons/noto-emoticons/png/u1f448_1f3fc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f448_1f3fc.png
diff --git a/data/emoticons/noto-emoticons/png/u1f448_1f3fd.png b/gajim/data/emoticons/noto-emoticons/png/u1f448_1f3fd.png
index 6760c4899..6760c4899 100644
--- a/data/emoticons/noto-emoticons/png/u1f448_1f3fd.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f448_1f3fd.png
diff --git a/data/emoticons/noto-emoticons/png/u1f448_1f3fe.png b/gajim/data/emoticons/noto-emoticons/png/u1f448_1f3fe.png
index 063317ae1..063317ae1 100644
--- a/data/emoticons/noto-emoticons/png/u1f448_1f3fe.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f448_1f3fe.png
diff --git a/data/emoticons/noto-emoticons/png/u1f448_1f3ff.png b/gajim/data/emoticons/noto-emoticons/png/u1f448_1f3ff.png
index e3c0fac28..e3c0fac28 100644
--- a/data/emoticons/noto-emoticons/png/u1f448_1f3ff.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f448_1f3ff.png
diff --git a/data/emoticons/noto-emoticons/png/u1f449.png b/gajim/data/emoticons/noto-emoticons/png/u1f449.png
index eb27a82bf..eb27a82bf 100644
--- a/data/emoticons/noto-emoticons/png/u1f449.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f449.png
diff --git a/data/emoticons/noto-emoticons/png/u1f449_1f3fb.png b/gajim/data/emoticons/noto-emoticons/png/u1f449_1f3fb.png
index f4a576c75..f4a576c75 100644
--- a/data/emoticons/noto-emoticons/png/u1f449_1f3fb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f449_1f3fb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f449_1f3fc.png b/gajim/data/emoticons/noto-emoticons/png/u1f449_1f3fc.png
index 1b9fb3ca9..1b9fb3ca9 100644
--- a/data/emoticons/noto-emoticons/png/u1f449_1f3fc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f449_1f3fc.png
diff --git a/data/emoticons/noto-emoticons/png/u1f449_1f3fd.png b/gajim/data/emoticons/noto-emoticons/png/u1f449_1f3fd.png
index c547b3918..c547b3918 100644
--- a/data/emoticons/noto-emoticons/png/u1f449_1f3fd.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f449_1f3fd.png
diff --git a/data/emoticons/noto-emoticons/png/u1f449_1f3fe.png b/gajim/data/emoticons/noto-emoticons/png/u1f449_1f3fe.png
index e7dd65f19..e7dd65f19 100644
--- a/data/emoticons/noto-emoticons/png/u1f449_1f3fe.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f449_1f3fe.png
diff --git a/data/emoticons/noto-emoticons/png/u1f449_1f3ff.png b/gajim/data/emoticons/noto-emoticons/png/u1f449_1f3ff.png
index 6619cc539..6619cc539 100644
--- a/data/emoticons/noto-emoticons/png/u1f449_1f3ff.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f449_1f3ff.png
diff --git a/data/emoticons/noto-emoticons/png/u1f44a.png b/gajim/data/emoticons/noto-emoticons/png/u1f44a.png
index 622e8047d..622e8047d 100644
--- a/data/emoticons/noto-emoticons/png/u1f44a.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f44a.png
diff --git a/data/emoticons/noto-emoticons/png/u1f44a_1f3fb.png b/gajim/data/emoticons/noto-emoticons/png/u1f44a_1f3fb.png
index e8a5d9e80..e8a5d9e80 100644
--- a/data/emoticons/noto-emoticons/png/u1f44a_1f3fb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f44a_1f3fb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f44a_1f3fc.png b/gajim/data/emoticons/noto-emoticons/png/u1f44a_1f3fc.png
index 3ed343d3f..3ed343d3f 100644
--- a/data/emoticons/noto-emoticons/png/u1f44a_1f3fc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f44a_1f3fc.png
diff --git a/data/emoticons/noto-emoticons/png/u1f44a_1f3fd.png b/gajim/data/emoticons/noto-emoticons/png/u1f44a_1f3fd.png
index 239e6adf0..239e6adf0 100644
--- a/data/emoticons/noto-emoticons/png/u1f44a_1f3fd.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f44a_1f3fd.png
diff --git a/data/emoticons/noto-emoticons/png/u1f44a_1f3fe.png b/gajim/data/emoticons/noto-emoticons/png/u1f44a_1f3fe.png
index 370c110e7..370c110e7 100644
--- a/data/emoticons/noto-emoticons/png/u1f44a_1f3fe.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f44a_1f3fe.png
diff --git a/data/emoticons/noto-emoticons/png/u1f44a_1f3ff.png b/gajim/data/emoticons/noto-emoticons/png/u1f44a_1f3ff.png
index 80694980d..80694980d 100644
--- a/data/emoticons/noto-emoticons/png/u1f44a_1f3ff.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f44a_1f3ff.png
diff --git a/data/emoticons/noto-emoticons/png/u1f44b.png b/gajim/data/emoticons/noto-emoticons/png/u1f44b.png
index 01fa23518..01fa23518 100644
--- a/data/emoticons/noto-emoticons/png/u1f44b.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f44b.png
diff --git a/data/emoticons/noto-emoticons/png/u1f44b_1f3fb.png b/gajim/data/emoticons/noto-emoticons/png/u1f44b_1f3fb.png
index 0730a9cad..0730a9cad 100644
--- a/data/emoticons/noto-emoticons/png/u1f44b_1f3fb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f44b_1f3fb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f44b_1f3fc.png b/gajim/data/emoticons/noto-emoticons/png/u1f44b_1f3fc.png
index 5e20d6944..5e20d6944 100644
--- a/data/emoticons/noto-emoticons/png/u1f44b_1f3fc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f44b_1f3fc.png
diff --git a/data/emoticons/noto-emoticons/png/u1f44b_1f3fd.png b/gajim/data/emoticons/noto-emoticons/png/u1f44b_1f3fd.png
index 9fd21e721..9fd21e721 100644
--- a/data/emoticons/noto-emoticons/png/u1f44b_1f3fd.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f44b_1f3fd.png
diff --git a/data/emoticons/noto-emoticons/png/u1f44b_1f3fe.png b/gajim/data/emoticons/noto-emoticons/png/u1f44b_1f3fe.png
index 75451b439..75451b439 100644
--- a/data/emoticons/noto-emoticons/png/u1f44b_1f3fe.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f44b_1f3fe.png
diff --git a/data/emoticons/noto-emoticons/png/u1f44b_1f3ff.png b/gajim/data/emoticons/noto-emoticons/png/u1f44b_1f3ff.png
index e155db294..e155db294 100644
--- a/data/emoticons/noto-emoticons/png/u1f44b_1f3ff.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f44b_1f3ff.png
diff --git a/data/emoticons/noto-emoticons/png/u1f44c.png b/gajim/data/emoticons/noto-emoticons/png/u1f44c.png
index 39f811631..39f811631 100644
--- a/data/emoticons/noto-emoticons/png/u1f44c.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f44c.png
diff --git a/data/emoticons/noto-emoticons/png/u1f44c_1f3fb.png b/gajim/data/emoticons/noto-emoticons/png/u1f44c_1f3fb.png
index 18cb92083..18cb92083 100644
--- a/data/emoticons/noto-emoticons/png/u1f44c_1f3fb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f44c_1f3fb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f44c_1f3fc.png b/gajim/data/emoticons/noto-emoticons/png/u1f44c_1f3fc.png
index ed74cf272..ed74cf272 100644
--- a/data/emoticons/noto-emoticons/png/u1f44c_1f3fc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f44c_1f3fc.png
diff --git a/data/emoticons/noto-emoticons/png/u1f44c_1f3fd.png b/gajim/data/emoticons/noto-emoticons/png/u1f44c_1f3fd.png
index 35d357d71..35d357d71 100644
--- a/data/emoticons/noto-emoticons/png/u1f44c_1f3fd.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f44c_1f3fd.png
diff --git a/data/emoticons/noto-emoticons/png/u1f44c_1f3fe.png b/gajim/data/emoticons/noto-emoticons/png/u1f44c_1f3fe.png
index 3928467e1..3928467e1 100644
--- a/data/emoticons/noto-emoticons/png/u1f44c_1f3fe.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f44c_1f3fe.png
diff --git a/data/emoticons/noto-emoticons/png/u1f44c_1f3ff.png b/gajim/data/emoticons/noto-emoticons/png/u1f44c_1f3ff.png
index 65506403b..65506403b 100644
--- a/data/emoticons/noto-emoticons/png/u1f44c_1f3ff.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f44c_1f3ff.png
diff --git a/data/emoticons/noto-emoticons/png/u1f44d.png b/gajim/data/emoticons/noto-emoticons/png/u1f44d.png
index b389065a5..b389065a5 100644
--- a/data/emoticons/noto-emoticons/png/u1f44d.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f44d.png
diff --git a/data/emoticons/noto-emoticons/png/u1f44d_1f3fb.png b/gajim/data/emoticons/noto-emoticons/png/u1f44d_1f3fb.png
index 7425e564a..7425e564a 100644
--- a/data/emoticons/noto-emoticons/png/u1f44d_1f3fb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f44d_1f3fb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f44d_1f3fc.png b/gajim/data/emoticons/noto-emoticons/png/u1f44d_1f3fc.png
index ea47ac9c0..ea47ac9c0 100644
--- a/data/emoticons/noto-emoticons/png/u1f44d_1f3fc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f44d_1f3fc.png
diff --git a/data/emoticons/noto-emoticons/png/u1f44d_1f3fd.png b/gajim/data/emoticons/noto-emoticons/png/u1f44d_1f3fd.png
index 74dd554ae..74dd554ae 100644
--- a/data/emoticons/noto-emoticons/png/u1f44d_1f3fd.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f44d_1f3fd.png
diff --git a/data/emoticons/noto-emoticons/png/u1f44d_1f3fe.png b/gajim/data/emoticons/noto-emoticons/png/u1f44d_1f3fe.png
index 9c2a42b4b..9c2a42b4b 100644
--- a/data/emoticons/noto-emoticons/png/u1f44d_1f3fe.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f44d_1f3fe.png
diff --git a/data/emoticons/noto-emoticons/png/u1f44d_1f3ff.png b/gajim/data/emoticons/noto-emoticons/png/u1f44d_1f3ff.png
index 96cf68892..96cf68892 100644
--- a/data/emoticons/noto-emoticons/png/u1f44d_1f3ff.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f44d_1f3ff.png
diff --git a/data/emoticons/noto-emoticons/png/u1f44e.png b/gajim/data/emoticons/noto-emoticons/png/u1f44e.png
index e11c3d5ae..e11c3d5ae 100644
--- a/data/emoticons/noto-emoticons/png/u1f44e.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f44e.png
diff --git a/data/emoticons/noto-emoticons/png/u1f44e_1f3fb.png b/gajim/data/emoticons/noto-emoticons/png/u1f44e_1f3fb.png
index edf043931..edf043931 100644
--- a/data/emoticons/noto-emoticons/png/u1f44e_1f3fb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f44e_1f3fb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f44e_1f3fc.png b/gajim/data/emoticons/noto-emoticons/png/u1f44e_1f3fc.png
index 425d5b620..425d5b620 100644
--- a/data/emoticons/noto-emoticons/png/u1f44e_1f3fc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f44e_1f3fc.png
diff --git a/data/emoticons/noto-emoticons/png/u1f44e_1f3fd.png b/gajim/data/emoticons/noto-emoticons/png/u1f44e_1f3fd.png
index 7b6e3df8d..7b6e3df8d 100644
--- a/data/emoticons/noto-emoticons/png/u1f44e_1f3fd.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f44e_1f3fd.png
diff --git a/data/emoticons/noto-emoticons/png/u1f44e_1f3fe.png b/gajim/data/emoticons/noto-emoticons/png/u1f44e_1f3fe.png
index 616d5f2f6..616d5f2f6 100644
--- a/data/emoticons/noto-emoticons/png/u1f44e_1f3fe.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f44e_1f3fe.png
diff --git a/data/emoticons/noto-emoticons/png/u1f44e_1f3ff.png b/gajim/data/emoticons/noto-emoticons/png/u1f44e_1f3ff.png
index b610b6775..b610b6775 100644
--- a/data/emoticons/noto-emoticons/png/u1f44e_1f3ff.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f44e_1f3ff.png
diff --git a/data/emoticons/noto-emoticons/png/u1f44f.png b/gajim/data/emoticons/noto-emoticons/png/u1f44f.png
index ae2de5a60..ae2de5a60 100644
--- a/data/emoticons/noto-emoticons/png/u1f44f.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f44f.png
diff --git a/data/emoticons/noto-emoticons/png/u1f44f_1f3fb.png b/gajim/data/emoticons/noto-emoticons/png/u1f44f_1f3fb.png
index f3f57b0d4..f3f57b0d4 100644
--- a/data/emoticons/noto-emoticons/png/u1f44f_1f3fb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f44f_1f3fb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f44f_1f3fc.png b/gajim/data/emoticons/noto-emoticons/png/u1f44f_1f3fc.png
index 7dcec3053..7dcec3053 100644
--- a/data/emoticons/noto-emoticons/png/u1f44f_1f3fc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f44f_1f3fc.png
diff --git a/data/emoticons/noto-emoticons/png/u1f44f_1f3fd.png b/gajim/data/emoticons/noto-emoticons/png/u1f44f_1f3fd.png
index 9b290fbfa..9b290fbfa 100644
--- a/data/emoticons/noto-emoticons/png/u1f44f_1f3fd.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f44f_1f3fd.png
diff --git a/data/emoticons/noto-emoticons/png/u1f44f_1f3fe.png b/gajim/data/emoticons/noto-emoticons/png/u1f44f_1f3fe.png
index 83520b0b7..83520b0b7 100644
--- a/data/emoticons/noto-emoticons/png/u1f44f_1f3fe.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f44f_1f3fe.png
diff --git a/data/emoticons/noto-emoticons/png/u1f44f_1f3ff.png b/gajim/data/emoticons/noto-emoticons/png/u1f44f_1f3ff.png
index 1f042aa72..1f042aa72 100644
--- a/data/emoticons/noto-emoticons/png/u1f44f_1f3ff.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f44f_1f3ff.png
diff --git a/data/emoticons/noto-emoticons/png/u1f450.png b/gajim/data/emoticons/noto-emoticons/png/u1f450.png
index 3c53ceb88..3c53ceb88 100644
--- a/data/emoticons/noto-emoticons/png/u1f450.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f450.png
diff --git a/data/emoticons/noto-emoticons/png/u1f450_1f3fb.png b/gajim/data/emoticons/noto-emoticons/png/u1f450_1f3fb.png
index 44e26af71..44e26af71 100644
--- a/data/emoticons/noto-emoticons/png/u1f450_1f3fb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f450_1f3fb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f450_1f3fc.png b/gajim/data/emoticons/noto-emoticons/png/u1f450_1f3fc.png
index 5465eed43..5465eed43 100644
--- a/data/emoticons/noto-emoticons/png/u1f450_1f3fc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f450_1f3fc.png
diff --git a/data/emoticons/noto-emoticons/png/u1f450_1f3fd.png b/gajim/data/emoticons/noto-emoticons/png/u1f450_1f3fd.png
index 2510666d1..2510666d1 100644
--- a/data/emoticons/noto-emoticons/png/u1f450_1f3fd.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f450_1f3fd.png
diff --git a/data/emoticons/noto-emoticons/png/u1f450_1f3fe.png b/gajim/data/emoticons/noto-emoticons/png/u1f450_1f3fe.png
index 744b0ce57..744b0ce57 100644
--- a/data/emoticons/noto-emoticons/png/u1f450_1f3fe.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f450_1f3fe.png
diff --git a/data/emoticons/noto-emoticons/png/u1f450_1f3ff.png b/gajim/data/emoticons/noto-emoticons/png/u1f450_1f3ff.png
index 524c18ef5..524c18ef5 100644
--- a/data/emoticons/noto-emoticons/png/u1f450_1f3ff.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f450_1f3ff.png
diff --git a/data/emoticons/noto-emoticons/png/u1f451.png b/gajim/data/emoticons/noto-emoticons/png/u1f451.png
index a1e4b3900..a1e4b3900 100644
--- a/data/emoticons/noto-emoticons/png/u1f451.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f451.png
diff --git a/data/emoticons/noto-emoticons/png/u1f452.png b/gajim/data/emoticons/noto-emoticons/png/u1f452.png
index cadb6db0a..cadb6db0a 100644
--- a/data/emoticons/noto-emoticons/png/u1f452.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f452.png
diff --git a/data/emoticons/noto-emoticons/png/u1f453.png b/gajim/data/emoticons/noto-emoticons/png/u1f453.png
index ed701c92c..ed701c92c 100644
--- a/data/emoticons/noto-emoticons/png/u1f453.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f453.png
diff --git a/data/emoticons/noto-emoticons/png/u1f454.png b/gajim/data/emoticons/noto-emoticons/png/u1f454.png
index 70c38949a..70c38949a 100644
--- a/data/emoticons/noto-emoticons/png/u1f454.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f454.png
diff --git a/data/emoticons/noto-emoticons/png/u1f455.png b/gajim/data/emoticons/noto-emoticons/png/u1f455.png
index 29cc9796b..29cc9796b 100644
--- a/data/emoticons/noto-emoticons/png/u1f455.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f455.png
diff --git a/data/emoticons/noto-emoticons/png/u1f456.png b/gajim/data/emoticons/noto-emoticons/png/u1f456.png
index 14daa81ce..14daa81ce 100644
--- a/data/emoticons/noto-emoticons/png/u1f456.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f456.png
diff --git a/data/emoticons/noto-emoticons/png/u1f457.png b/gajim/data/emoticons/noto-emoticons/png/u1f457.png
index 48d1749ae..48d1749ae 100644
--- a/data/emoticons/noto-emoticons/png/u1f457.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f457.png
diff --git a/data/emoticons/noto-emoticons/png/u1f458.png b/gajim/data/emoticons/noto-emoticons/png/u1f458.png
index 58e00ab69..58e00ab69 100644
--- a/data/emoticons/noto-emoticons/png/u1f458.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f458.png
diff --git a/data/emoticons/noto-emoticons/png/u1f459.png b/gajim/data/emoticons/noto-emoticons/png/u1f459.png
index c886ac305..c886ac305 100644
--- a/data/emoticons/noto-emoticons/png/u1f459.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f459.png
diff --git a/data/emoticons/noto-emoticons/png/u1f45a.png b/gajim/data/emoticons/noto-emoticons/png/u1f45a.png
index 0379df95b..0379df95b 100644
--- a/data/emoticons/noto-emoticons/png/u1f45a.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f45a.png
diff --git a/data/emoticons/noto-emoticons/png/u1f45b.png b/gajim/data/emoticons/noto-emoticons/png/u1f45b.png
index 6b1791c32..6b1791c32 100644
--- a/data/emoticons/noto-emoticons/png/u1f45b.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f45b.png
diff --git a/data/emoticons/noto-emoticons/png/u1f45c.png b/gajim/data/emoticons/noto-emoticons/png/u1f45c.png
index f8f60ad02..f8f60ad02 100644
--- a/data/emoticons/noto-emoticons/png/u1f45c.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f45c.png
diff --git a/data/emoticons/noto-emoticons/png/u1f45d.png b/gajim/data/emoticons/noto-emoticons/png/u1f45d.png
index 1435a5687..1435a5687 100644
--- a/data/emoticons/noto-emoticons/png/u1f45d.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f45d.png
diff --git a/data/emoticons/noto-emoticons/png/u1f45e.png b/gajim/data/emoticons/noto-emoticons/png/u1f45e.png
index 59e27c1e5..59e27c1e5 100644
--- a/data/emoticons/noto-emoticons/png/u1f45e.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f45e.png
diff --git a/data/emoticons/noto-emoticons/png/u1f45f.png b/gajim/data/emoticons/noto-emoticons/png/u1f45f.png
index fed006aab..fed006aab 100644
--- a/data/emoticons/noto-emoticons/png/u1f45f.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f45f.png
diff --git a/data/emoticons/noto-emoticons/png/u1f460.png b/gajim/data/emoticons/noto-emoticons/png/u1f460.png
index 5f94be48c..5f94be48c 100644
--- a/data/emoticons/noto-emoticons/png/u1f460.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f460.png
diff --git a/data/emoticons/noto-emoticons/png/u1f461.png b/gajim/data/emoticons/noto-emoticons/png/u1f461.png
index a5da77633..a5da77633 100644
--- a/data/emoticons/noto-emoticons/png/u1f461.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f461.png
diff --git a/data/emoticons/noto-emoticons/png/u1f462.png b/gajim/data/emoticons/noto-emoticons/png/u1f462.png
index eaca5b04b..eaca5b04b 100644
--- a/data/emoticons/noto-emoticons/png/u1f462.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f462.png
diff --git a/data/emoticons/noto-emoticons/png/u1f463.png b/gajim/data/emoticons/noto-emoticons/png/u1f463.png
index a0cb024fb..a0cb024fb 100644
--- a/data/emoticons/noto-emoticons/png/u1f463.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f463.png
diff --git a/data/emoticons/noto-emoticons/png/u1f464.png b/gajim/data/emoticons/noto-emoticons/png/u1f464.png
index 0e2264e40..0e2264e40 100644
--- a/data/emoticons/noto-emoticons/png/u1f464.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f464.png
diff --git a/data/emoticons/noto-emoticons/png/u1f465.png b/gajim/data/emoticons/noto-emoticons/png/u1f465.png
index 1bb33b83e..1bb33b83e 100644
--- a/data/emoticons/noto-emoticons/png/u1f465.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f465.png
diff --git a/data/emoticons/noto-emoticons/png/u1f466.png b/gajim/data/emoticons/noto-emoticons/png/u1f466.png
index 266de3f7b..266de3f7b 100644
--- a/data/emoticons/noto-emoticons/png/u1f466.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f466.png
diff --git a/data/emoticons/noto-emoticons/png/u1f466_1f3fb.png b/gajim/data/emoticons/noto-emoticons/png/u1f466_1f3fb.png
index 45abcf5d8..45abcf5d8 100644
--- a/data/emoticons/noto-emoticons/png/u1f466_1f3fb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f466_1f3fb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f466_1f3fc.png b/gajim/data/emoticons/noto-emoticons/png/u1f466_1f3fc.png
index 4439dc734..4439dc734 100644
--- a/data/emoticons/noto-emoticons/png/u1f466_1f3fc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f466_1f3fc.png
diff --git a/data/emoticons/noto-emoticons/png/u1f466_1f3fd.png b/gajim/data/emoticons/noto-emoticons/png/u1f466_1f3fd.png
index e98d6ff8f..e98d6ff8f 100644
--- a/data/emoticons/noto-emoticons/png/u1f466_1f3fd.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f466_1f3fd.png
diff --git a/data/emoticons/noto-emoticons/png/u1f466_1f3fe.png b/gajim/data/emoticons/noto-emoticons/png/u1f466_1f3fe.png
index e0ccc20b8..e0ccc20b8 100644
--- a/data/emoticons/noto-emoticons/png/u1f466_1f3fe.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f466_1f3fe.png
diff --git a/data/emoticons/noto-emoticons/png/u1f466_1f3ff.png b/gajim/data/emoticons/noto-emoticons/png/u1f466_1f3ff.png
index 1101a196e..1101a196e 100644
--- a/data/emoticons/noto-emoticons/png/u1f466_1f3ff.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f466_1f3ff.png
diff --git a/data/emoticons/noto-emoticons/png/u1f467.png b/gajim/data/emoticons/noto-emoticons/png/u1f467.png
index 3b59252d0..3b59252d0 100644
--- a/data/emoticons/noto-emoticons/png/u1f467.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f467.png
diff --git a/data/emoticons/noto-emoticons/png/u1f467_1f3fb.png b/gajim/data/emoticons/noto-emoticons/png/u1f467_1f3fb.png
index 81ab84d46..81ab84d46 100644
--- a/data/emoticons/noto-emoticons/png/u1f467_1f3fb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f467_1f3fb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f467_1f3fc.png b/gajim/data/emoticons/noto-emoticons/png/u1f467_1f3fc.png
index 015c2380e..015c2380e 100644
--- a/data/emoticons/noto-emoticons/png/u1f467_1f3fc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f467_1f3fc.png
diff --git a/data/emoticons/noto-emoticons/png/u1f467_1f3fd.png b/gajim/data/emoticons/noto-emoticons/png/u1f467_1f3fd.png
index 6014c4561..6014c4561 100644
--- a/data/emoticons/noto-emoticons/png/u1f467_1f3fd.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f467_1f3fd.png
diff --git a/data/emoticons/noto-emoticons/png/u1f467_1f3fe.png b/gajim/data/emoticons/noto-emoticons/png/u1f467_1f3fe.png
index 7e7336fed..7e7336fed 100644
--- a/data/emoticons/noto-emoticons/png/u1f467_1f3fe.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f467_1f3fe.png
diff --git a/data/emoticons/noto-emoticons/png/u1f467_1f3ff.png b/gajim/data/emoticons/noto-emoticons/png/u1f467_1f3ff.png
index 7ca8d4040..7ca8d4040 100644
--- a/data/emoticons/noto-emoticons/png/u1f467_1f3ff.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f467_1f3ff.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468.png b/gajim/data/emoticons/noto-emoticons/png/u1f468.png
index 71758a14a..71758a14a 100644
--- a/data/emoticons/noto-emoticons/png/u1f468.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_1f3fb.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fb.png
index 52210eb1d..52210eb1d 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_1f3fb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_1f3fb_200d_1f33e.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fb_200d_1f33e.png
index 912d073f4..912d073f4 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_1f3fb_200d_1f33e.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fb_200d_1f33e.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_1f3fb_200d_1f373.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fb_200d_1f373.png
index 7f3604f65..7f3604f65 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_1f3fb_200d_1f373.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fb_200d_1f373.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_1f3fb_200d_1f393.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fb_200d_1f393.png
index dbf25a049..dbf25a049 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_1f3fb_200d_1f393.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fb_200d_1f393.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_1f3fb_200d_1f3a4.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fb_200d_1f3a4.png
index 5b9f759d3..5b9f759d3 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_1f3fb_200d_1f3a4.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fb_200d_1f3a4.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_1f3fb_200d_1f3a8.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fb_200d_1f3a8.png
index f64f3dd42..f64f3dd42 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_1f3fb_200d_1f3a8.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fb_200d_1f3a8.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_1f3fb_200d_1f3eb.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fb_200d_1f3eb.png
index 6d5f79ca6..6d5f79ca6 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_1f3fb_200d_1f3eb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fb_200d_1f3eb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_1f3fb_200d_1f3ed.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fb_200d_1f3ed.png
index d424b7073..d424b7073 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_1f3fb_200d_1f3ed.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fb_200d_1f3ed.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_1f3fb_200d_1f4bb.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fb_200d_1f4bb.png
index d2b4b3e73..d2b4b3e73 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_1f3fb_200d_1f4bb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fb_200d_1f4bb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_1f3fb_200d_1f4bc.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fb_200d_1f4bc.png
index e196c1cf4..e196c1cf4 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_1f3fb_200d_1f4bc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fb_200d_1f4bc.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_1f3fb_200d_1f527.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fb_200d_1f527.png
index 473bccce5..473bccce5 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_1f3fb_200d_1f527.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fb_200d_1f527.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_1f3fb_200d_1f52c.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fb_200d_1f52c.png
index 0af0093b2..0af0093b2 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_1f3fb_200d_1f52c.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fb_200d_1f52c.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_1f3fb_200d_1f680.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fb_200d_1f680.png
index 71b8d5937..71b8d5937 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_1f3fb_200d_1f680.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fb_200d_1f680.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_1f3fb_200d_1f692.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fb_200d_1f692.png
index 61a7da20a..61a7da20a 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_1f3fb_200d_1f692.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fb_200d_1f692.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_1f3fb_200d_2695.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fb_200d_2695.png
index 5a65d4536..5a65d4536 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_1f3fb_200d_2695.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fb_200d_2695.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_1f3fb_200d_2696.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fb_200d_2696.png
index af203489c..af203489c 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_1f3fb_200d_2696.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fb_200d_2696.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_1f3fb_200d_2708.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fb_200d_2708.png
index e55acc7d9..e55acc7d9 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_1f3fb_200d_2708.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fb_200d_2708.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_1f3fc.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fc.png
index 1c40d1964..1c40d1964 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_1f3fc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fc.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_1f3fc_200d_1f33e.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fc_200d_1f33e.png
index 1a6ab276a..1a6ab276a 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_1f3fc_200d_1f33e.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fc_200d_1f33e.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_1f3fc_200d_1f373.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fc_200d_1f373.png
index 81837a800..81837a800 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_1f3fc_200d_1f373.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fc_200d_1f373.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_1f3fc_200d_1f393.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fc_200d_1f393.png
index 498cd5018..498cd5018 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_1f3fc_200d_1f393.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fc_200d_1f393.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_1f3fc_200d_1f3a4.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fc_200d_1f3a4.png
index 2b8342415..2b8342415 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_1f3fc_200d_1f3a4.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fc_200d_1f3a4.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_1f3fc_200d_1f3a8.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fc_200d_1f3a8.png
index 132490034..132490034 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_1f3fc_200d_1f3a8.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fc_200d_1f3a8.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_1f3fc_200d_1f3eb.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fc_200d_1f3eb.png
index 1001d3627..1001d3627 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_1f3fc_200d_1f3eb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fc_200d_1f3eb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_1f3fc_200d_1f3ed.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fc_200d_1f3ed.png
index bd52a14d6..bd52a14d6 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_1f3fc_200d_1f3ed.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fc_200d_1f3ed.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_1f3fc_200d_1f4bb.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fc_200d_1f4bb.png
index ff87f5947..ff87f5947 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_1f3fc_200d_1f4bb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fc_200d_1f4bb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_1f3fc_200d_1f4bc.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fc_200d_1f4bc.png
index 308acc39f..308acc39f 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_1f3fc_200d_1f4bc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fc_200d_1f4bc.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_1f3fc_200d_1f527.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fc_200d_1f527.png
index 6c3ad0e4e..6c3ad0e4e 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_1f3fc_200d_1f527.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fc_200d_1f527.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_1f3fc_200d_1f52c.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fc_200d_1f52c.png
index 890f852e0..890f852e0 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_1f3fc_200d_1f52c.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fc_200d_1f52c.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_1f3fc_200d_1f680.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fc_200d_1f680.png
index 1e140890b..1e140890b 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_1f3fc_200d_1f680.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fc_200d_1f680.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_1f3fc_200d_1f692.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fc_200d_1f692.png
index a6410f355..a6410f355 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_1f3fc_200d_1f692.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fc_200d_1f692.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_1f3fc_200d_2695.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fc_200d_2695.png
index d7bd84422..d7bd84422 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_1f3fc_200d_2695.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fc_200d_2695.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_1f3fc_200d_2696.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fc_200d_2696.png
index c6b52b5e1..c6b52b5e1 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_1f3fc_200d_2696.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fc_200d_2696.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_1f3fc_200d_2708.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fc_200d_2708.png
index f9c951283..f9c951283 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_1f3fc_200d_2708.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fc_200d_2708.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_1f3fd.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fd.png
index 2fb65814b..2fb65814b 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_1f3fd.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fd.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_1f3fd_200d_1f33e.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fd_200d_1f33e.png
index 8ceb3ece1..8ceb3ece1 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_1f3fd_200d_1f33e.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fd_200d_1f33e.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_1f3fd_200d_1f373.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fd_200d_1f373.png
index 0ada369cd..0ada369cd 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_1f3fd_200d_1f373.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fd_200d_1f373.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_1f3fd_200d_1f393.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fd_200d_1f393.png
index af66714b3..af66714b3 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_1f3fd_200d_1f393.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fd_200d_1f393.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_1f3fd_200d_1f3a4.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fd_200d_1f3a4.png
index 090093748..090093748 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_1f3fd_200d_1f3a4.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fd_200d_1f3a4.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_1f3fd_200d_1f3a8.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fd_200d_1f3a8.png
index 4053e2a3d..4053e2a3d 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_1f3fd_200d_1f3a8.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fd_200d_1f3a8.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_1f3fd_200d_1f3eb.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fd_200d_1f3eb.png
index d75c5a2a6..d75c5a2a6 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_1f3fd_200d_1f3eb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fd_200d_1f3eb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_1f3fd_200d_1f3ed.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fd_200d_1f3ed.png
index 333a53b29..333a53b29 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_1f3fd_200d_1f3ed.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fd_200d_1f3ed.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_1f3fd_200d_1f4bb.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fd_200d_1f4bb.png
index f31f7272e..f31f7272e 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_1f3fd_200d_1f4bb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fd_200d_1f4bb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_1f3fd_200d_1f4bc.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fd_200d_1f4bc.png
index 0bb85f89f..0bb85f89f 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_1f3fd_200d_1f4bc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fd_200d_1f4bc.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_1f3fd_200d_1f527.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fd_200d_1f527.png
index 2c8688c2a..2c8688c2a 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_1f3fd_200d_1f527.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fd_200d_1f527.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_1f3fd_200d_1f52c.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fd_200d_1f52c.png
index 166ad9dd6..166ad9dd6 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_1f3fd_200d_1f52c.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fd_200d_1f52c.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_1f3fd_200d_1f680.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fd_200d_1f680.png
index 7ddf44abe..7ddf44abe 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_1f3fd_200d_1f680.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fd_200d_1f680.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_1f3fd_200d_1f692.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fd_200d_1f692.png
index 40c282459..40c282459 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_1f3fd_200d_1f692.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fd_200d_1f692.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_1f3fd_200d_2695.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fd_200d_2695.png
index 9cf12daca..9cf12daca 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_1f3fd_200d_2695.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fd_200d_2695.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_1f3fd_200d_2696.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fd_200d_2696.png
index a8bbae062..a8bbae062 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_1f3fd_200d_2696.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fd_200d_2696.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_1f3fd_200d_2708.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fd_200d_2708.png
index fad124c6b..fad124c6b 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_1f3fd_200d_2708.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fd_200d_2708.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_1f3fe.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fe.png
index 663ef42a3..663ef42a3 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_1f3fe.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fe.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_1f3fe_200d_1f33e.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fe_200d_1f33e.png
index 855d5a563..855d5a563 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_1f3fe_200d_1f33e.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fe_200d_1f33e.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_1f3fe_200d_1f373.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fe_200d_1f373.png
index 5aa087672..5aa087672 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_1f3fe_200d_1f373.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fe_200d_1f373.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_1f3fe_200d_1f393.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fe_200d_1f393.png
index d947ca81f..d947ca81f 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_1f3fe_200d_1f393.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fe_200d_1f393.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_1f3fe_200d_1f3a4.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fe_200d_1f3a4.png
index a35bcaf1e..a35bcaf1e 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_1f3fe_200d_1f3a4.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fe_200d_1f3a4.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_1f3fe_200d_1f3a8.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fe_200d_1f3a8.png
index 92da6d9b0..92da6d9b0 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_1f3fe_200d_1f3a8.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fe_200d_1f3a8.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_1f3fe_200d_1f3eb.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fe_200d_1f3eb.png
index e26fba7ba..e26fba7ba 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_1f3fe_200d_1f3eb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fe_200d_1f3eb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_1f3fe_200d_1f3ed.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fe_200d_1f3ed.png
index 51d076f33..51d076f33 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_1f3fe_200d_1f3ed.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fe_200d_1f3ed.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_1f3fe_200d_1f4bb.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fe_200d_1f4bb.png
index e158ce78c..e158ce78c 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_1f3fe_200d_1f4bb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fe_200d_1f4bb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_1f3fe_200d_1f4bc.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fe_200d_1f4bc.png
index 4c7d24590..4c7d24590 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_1f3fe_200d_1f4bc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fe_200d_1f4bc.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_1f3fe_200d_1f527.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fe_200d_1f527.png
index ecbf7455e..ecbf7455e 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_1f3fe_200d_1f527.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fe_200d_1f527.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_1f3fe_200d_1f52c.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fe_200d_1f52c.png
index 00a4558be..00a4558be 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_1f3fe_200d_1f52c.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fe_200d_1f52c.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_1f3fe_200d_1f680.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fe_200d_1f680.png
index d9bcca2e9..d9bcca2e9 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_1f3fe_200d_1f680.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fe_200d_1f680.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_1f3fe_200d_1f692.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fe_200d_1f692.png
index f1d995f5f..f1d995f5f 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_1f3fe_200d_1f692.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fe_200d_1f692.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_1f3fe_200d_2695.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fe_200d_2695.png
index 2a1c2ac86..2a1c2ac86 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_1f3fe_200d_2695.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fe_200d_2695.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_1f3fe_200d_2696.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fe_200d_2696.png
index c3c01acfd..c3c01acfd 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_1f3fe_200d_2696.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fe_200d_2696.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_1f3fe_200d_2708.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fe_200d_2708.png
index 9aee7824e..9aee7824e 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_1f3fe_200d_2708.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3fe_200d_2708.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_1f3ff.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3ff.png
index 62315e629..62315e629 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_1f3ff.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3ff.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_1f3ff_200d_1f33e.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3ff_200d_1f33e.png
index 104dc0c07..104dc0c07 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_1f3ff_200d_1f33e.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3ff_200d_1f33e.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_1f3ff_200d_1f373.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3ff_200d_1f373.png
index 304c2ea48..304c2ea48 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_1f3ff_200d_1f373.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3ff_200d_1f373.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_1f3ff_200d_1f393.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3ff_200d_1f393.png
index 9954fb2c1..9954fb2c1 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_1f3ff_200d_1f393.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3ff_200d_1f393.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_1f3ff_200d_1f3a4.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3ff_200d_1f3a4.png
index 478a1a4cf..478a1a4cf 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_1f3ff_200d_1f3a4.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3ff_200d_1f3a4.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_1f3ff_200d_1f3a8.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3ff_200d_1f3a8.png
index 590ddaf84..590ddaf84 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_1f3ff_200d_1f3a8.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3ff_200d_1f3a8.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_1f3ff_200d_1f3eb.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3ff_200d_1f3eb.png
index 01f4417ef..01f4417ef 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_1f3ff_200d_1f3eb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3ff_200d_1f3eb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_1f3ff_200d_1f3ed.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3ff_200d_1f3ed.png
index 10442d203..10442d203 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_1f3ff_200d_1f3ed.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3ff_200d_1f3ed.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_1f3ff_200d_1f4bb.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3ff_200d_1f4bb.png
index 357bf259c..357bf259c 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_1f3ff_200d_1f4bb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3ff_200d_1f4bb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_1f3ff_200d_1f4bc.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3ff_200d_1f4bc.png
index 8ef69760b..8ef69760b 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_1f3ff_200d_1f4bc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3ff_200d_1f4bc.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_1f3ff_200d_1f527.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3ff_200d_1f527.png
index 6b0076e57..6b0076e57 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_1f3ff_200d_1f527.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3ff_200d_1f527.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_1f3ff_200d_1f52c.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3ff_200d_1f52c.png
index f721b19fd..f721b19fd 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_1f3ff_200d_1f52c.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3ff_200d_1f52c.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_1f3ff_200d_1f680.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3ff_200d_1f680.png
index 842977d5c..842977d5c 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_1f3ff_200d_1f680.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3ff_200d_1f680.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_1f3ff_200d_1f692.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3ff_200d_1f692.png
index e32a49cf4..e32a49cf4 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_1f3ff_200d_1f692.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3ff_200d_1f692.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_1f3ff_200d_2695.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3ff_200d_2695.png
index 27c0449d0..27c0449d0 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_1f3ff_200d_2695.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3ff_200d_2695.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_1f3ff_200d_2696.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3ff_200d_2696.png
index ae28ed5ad..ae28ed5ad 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_1f3ff_200d_2696.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3ff_200d_2696.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_1f3ff_200d_2708.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3ff_200d_2708.png
index 95d501359..95d501359 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_1f3ff_200d_2708.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_1f3ff_200d_2708.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_200d_1f33e.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_200d_1f33e.png
index 89c71f26b..89c71f26b 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_200d_1f33e.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_200d_1f33e.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_200d_1f373.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_200d_1f373.png
index 22464629b..22464629b 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_200d_1f373.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_200d_1f373.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_200d_1f393.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_200d_1f393.png
index 3439a9405..3439a9405 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_200d_1f393.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_200d_1f393.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_200d_1f3a4.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_200d_1f3a4.png
index af627c6b5..af627c6b5 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_200d_1f3a4.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_200d_1f3a4.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_200d_1f3a8.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_200d_1f3a8.png
index 37204913f..37204913f 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_200d_1f3a8.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_200d_1f3a8.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_200d_1f3eb.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_200d_1f3eb.png
index 8afa1deb9..8afa1deb9 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_200d_1f3eb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_200d_1f3eb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_200d_1f3ed.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_200d_1f3ed.png
index 85402a0f5..85402a0f5 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_200d_1f3ed.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_200d_1f3ed.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_200d_1f466.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_200d_1f466.png
index 7edf4eb9a..7edf4eb9a 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_200d_1f466.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_200d_1f466.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_200d_1f466_200d_1f466.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_200d_1f466_200d_1f466.png
index fbaa71f4a..fbaa71f4a 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_200d_1f466_200d_1f466.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_200d_1f466_200d_1f466.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_200d_1f467.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_200d_1f467.png
index 47bfb46e6..47bfb46e6 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_200d_1f467.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_200d_1f467.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_200d_1f467_200d_1f466.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_200d_1f467_200d_1f466.png
index 0b86c0d92..0b86c0d92 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_200d_1f467_200d_1f466.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_200d_1f467_200d_1f466.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_200d_1f467_200d_1f467.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_200d_1f467_200d_1f467.png
index f6caf02f0..f6caf02f0 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_200d_1f467_200d_1f467.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_200d_1f467_200d_1f467.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_200d_1f468_200d_1f466.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_200d_1f468_200d_1f466.png
index 48db8952c..48db8952c 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_200d_1f468_200d_1f466.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_200d_1f468_200d_1f466.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_200d_1f468_200d_1f466_200d_1f466.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_200d_1f468_200d_1f466_200d_1f466.png
index 97d29728f..97d29728f 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_200d_1f468_200d_1f466_200d_1f466.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_200d_1f468_200d_1f466_200d_1f466.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_200d_1f468_200d_1f467.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_200d_1f468_200d_1f467.png
index 5a1074ce4..5a1074ce4 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_200d_1f468_200d_1f467.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_200d_1f468_200d_1f467.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_200d_1f468_200d_1f467_200d_1f466.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_200d_1f468_200d_1f467_200d_1f466.png
index dd8d55664..dd8d55664 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_200d_1f468_200d_1f467_200d_1f466.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_200d_1f468_200d_1f467_200d_1f466.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_200d_1f468_200d_1f467_200d_1f467.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_200d_1f468_200d_1f467_200d_1f467.png
index 781ed7ed2..781ed7ed2 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_200d_1f468_200d_1f467_200d_1f467.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_200d_1f468_200d_1f467_200d_1f467.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_200d_1f469_200d_1f466.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_200d_1f469_200d_1f466.png
index c50c1f5b3..c50c1f5b3 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_200d_1f469_200d_1f466.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_200d_1f469_200d_1f466.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_200d_1f469_200d_1f466_200d_1f466.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_200d_1f469_200d_1f466_200d_1f466.png
index 7f6db1518..7f6db1518 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_200d_1f469_200d_1f466_200d_1f466.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_200d_1f469_200d_1f466_200d_1f466.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_200d_1f469_200d_1f467.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_200d_1f469_200d_1f467.png
index 09449afc6..09449afc6 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_200d_1f469_200d_1f467.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_200d_1f469_200d_1f467.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_200d_1f469_200d_1f467_200d_1f466.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_200d_1f469_200d_1f467_200d_1f466.png
index cf840d4cb..cf840d4cb 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_200d_1f469_200d_1f467_200d_1f466.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_200d_1f469_200d_1f467_200d_1f466.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_200d_1f469_200d_1f467_200d_1f467.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_200d_1f469_200d_1f467_200d_1f467.png
index e12389982..e12389982 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_200d_1f469_200d_1f467_200d_1f467.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_200d_1f469_200d_1f467_200d_1f467.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_200d_1f4bb.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_200d_1f4bb.png
index 63d5f5f8f..63d5f5f8f 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_200d_1f4bb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_200d_1f4bb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_200d_1f4bc.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_200d_1f4bc.png
index f8d14846c..f8d14846c 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_200d_1f4bc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_200d_1f4bc.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_200d_1f527.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_200d_1f527.png
index 591ce8572..591ce8572 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_200d_1f527.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_200d_1f527.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_200d_1f52c.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_200d_1f52c.png
index 4de967cc4..4de967cc4 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_200d_1f52c.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_200d_1f52c.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_200d_1f680.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_200d_1f680.png
index 31980f52a..31980f52a 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_200d_1f680.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_200d_1f680.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_200d_1f692.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_200d_1f692.png
index a362b5895..a362b5895 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_200d_1f692.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_200d_1f692.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_200d_2695.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_200d_2695.png
index cab2469ea..cab2469ea 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_200d_2695.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_200d_2695.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_200d_2696.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_200d_2696.png
index 4419fd952..4419fd952 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_200d_2696.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_200d_2696.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_200d_2708.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_200d_2708.png
index b655dbefe..b655dbefe 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_200d_2708.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_200d_2708.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_200d_2764_200d_1f468.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_200d_2764_200d_1f468.png
index 9fa755fe3..9fa755fe3 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_200d_2764_200d_1f468.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_200d_2764_200d_1f468.png
diff --git a/data/emoticons/noto-emoticons/png/u1f468_200d_2764_200d_1f48b_200d_1f468.png b/gajim/data/emoticons/noto-emoticons/png/u1f468_200d_2764_200d_1f48b_200d_1f468.png
index 8c90648e4..8c90648e4 100644
--- a/data/emoticons/noto-emoticons/png/u1f468_200d_2764_200d_1f48b_200d_1f468.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f468_200d_2764_200d_1f48b_200d_1f468.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469.png b/gajim/data/emoticons/noto-emoticons/png/u1f469.png
index 29b44b4a1..29b44b4a1 100644
--- a/data/emoticons/noto-emoticons/png/u1f469.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_1f3fb.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fb.png
index 6cc3a1f36..6cc3a1f36 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_1f3fb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_1f3fb_200d_1f33e.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fb_200d_1f33e.png
index a8b5aa005..a8b5aa005 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_1f3fb_200d_1f33e.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fb_200d_1f33e.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_1f3fb_200d_1f373.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fb_200d_1f373.png
index 3aa073ece..3aa073ece 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_1f3fb_200d_1f373.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fb_200d_1f373.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_1f3fb_200d_1f393.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fb_200d_1f393.png
index 84592ed0b..84592ed0b 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_1f3fb_200d_1f393.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fb_200d_1f393.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_1f3fb_200d_1f3a4.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fb_200d_1f3a4.png
index 2a3076e03..2a3076e03 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_1f3fb_200d_1f3a4.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fb_200d_1f3a4.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_1f3fb_200d_1f3a8.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fb_200d_1f3a8.png
index b58338c55..b58338c55 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_1f3fb_200d_1f3a8.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fb_200d_1f3a8.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_1f3fb_200d_1f3eb.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fb_200d_1f3eb.png
index 9d762974b..9d762974b 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_1f3fb_200d_1f3eb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fb_200d_1f3eb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_1f3fb_200d_1f3ed.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fb_200d_1f3ed.png
index 37743aa8c..37743aa8c 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_1f3fb_200d_1f3ed.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fb_200d_1f3ed.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_1f3fb_200d_1f4bb.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fb_200d_1f4bb.png
index de9459f3f..de9459f3f 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_1f3fb_200d_1f4bb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fb_200d_1f4bb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_1f3fb_200d_1f4bc.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fb_200d_1f4bc.png
index 572cf0161..572cf0161 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_1f3fb_200d_1f4bc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fb_200d_1f4bc.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_1f3fb_200d_1f527.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fb_200d_1f527.png
index 84c1d0af1..84c1d0af1 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_1f3fb_200d_1f527.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fb_200d_1f527.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_1f3fb_200d_1f52c.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fb_200d_1f52c.png
index 63a960ef8..63a960ef8 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_1f3fb_200d_1f52c.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fb_200d_1f52c.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_1f3fb_200d_1f680.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fb_200d_1f680.png
index 873df8e62..873df8e62 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_1f3fb_200d_1f680.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fb_200d_1f680.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_1f3fb_200d_1f692.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fb_200d_1f692.png
index 47201eb1f..47201eb1f 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_1f3fb_200d_1f692.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fb_200d_1f692.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_1f3fb_200d_2695.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fb_200d_2695.png
index 5202fb265..5202fb265 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_1f3fb_200d_2695.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fb_200d_2695.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_1f3fb_200d_2696.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fb_200d_2696.png
index 7e414bf31..7e414bf31 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_1f3fb_200d_2696.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fb_200d_2696.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_1f3fb_200d_2708.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fb_200d_2708.png
index 8354a864b..8354a864b 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_1f3fb_200d_2708.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fb_200d_2708.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_1f3fc.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fc.png
index b0541498a..b0541498a 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_1f3fc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fc.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_1f3fc_200d_1f33e.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fc_200d_1f33e.png
index ec5376e12..ec5376e12 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_1f3fc_200d_1f33e.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fc_200d_1f33e.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_1f3fc_200d_1f373.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fc_200d_1f373.png
index d7e4a8a4f..d7e4a8a4f 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_1f3fc_200d_1f373.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fc_200d_1f373.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_1f3fc_200d_1f393.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fc_200d_1f393.png
index 497730403..497730403 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_1f3fc_200d_1f393.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fc_200d_1f393.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_1f3fc_200d_1f3a4.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fc_200d_1f3a4.png
index a8ea7a2bc..a8ea7a2bc 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_1f3fc_200d_1f3a4.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fc_200d_1f3a4.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_1f3fc_200d_1f3a8.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fc_200d_1f3a8.png
index 6fe5a1360..6fe5a1360 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_1f3fc_200d_1f3a8.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fc_200d_1f3a8.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_1f3fc_200d_1f3eb.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fc_200d_1f3eb.png
index 071e70046..071e70046 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_1f3fc_200d_1f3eb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fc_200d_1f3eb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_1f3fc_200d_1f3ed.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fc_200d_1f3ed.png
index 283e97515..283e97515 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_1f3fc_200d_1f3ed.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fc_200d_1f3ed.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_1f3fc_200d_1f4bb.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fc_200d_1f4bb.png
index 539e193af..539e193af 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_1f3fc_200d_1f4bb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fc_200d_1f4bb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_1f3fc_200d_1f4bc.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fc_200d_1f4bc.png
index 147552e14..147552e14 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_1f3fc_200d_1f4bc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fc_200d_1f4bc.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_1f3fc_200d_1f527.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fc_200d_1f527.png
index 4a52628d6..4a52628d6 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_1f3fc_200d_1f527.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fc_200d_1f527.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_1f3fc_200d_1f52c.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fc_200d_1f52c.png
index 0ad5b9750..0ad5b9750 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_1f3fc_200d_1f52c.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fc_200d_1f52c.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_1f3fc_200d_1f680.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fc_200d_1f680.png
index 11abc401d..11abc401d 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_1f3fc_200d_1f680.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fc_200d_1f680.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_1f3fc_200d_1f692.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fc_200d_1f692.png
index 30dc16c0e..30dc16c0e 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_1f3fc_200d_1f692.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fc_200d_1f692.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_1f3fc_200d_2695.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fc_200d_2695.png
index fd6e5437d..fd6e5437d 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_1f3fc_200d_2695.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fc_200d_2695.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_1f3fc_200d_2696.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fc_200d_2696.png
index 359ffcabd..359ffcabd 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_1f3fc_200d_2696.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fc_200d_2696.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_1f3fc_200d_2708.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fc_200d_2708.png
index 187dd0eab..187dd0eab 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_1f3fc_200d_2708.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fc_200d_2708.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_1f3fd.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fd.png
index ff13d0a46..ff13d0a46 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_1f3fd.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fd.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_1f3fd_200d_1f33e.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fd_200d_1f33e.png
index 62517054e..62517054e 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_1f3fd_200d_1f33e.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fd_200d_1f33e.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_1f3fd_200d_1f373.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fd_200d_1f373.png
index 32051167e..32051167e 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_1f3fd_200d_1f373.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fd_200d_1f373.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_1f3fd_200d_1f393.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fd_200d_1f393.png
index 382b6a1f6..382b6a1f6 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_1f3fd_200d_1f393.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fd_200d_1f393.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_1f3fd_200d_1f3a4.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fd_200d_1f3a4.png
index efefbe951..efefbe951 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_1f3fd_200d_1f3a4.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fd_200d_1f3a4.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_1f3fd_200d_1f3a8.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fd_200d_1f3a8.png
index 13dafeac5..13dafeac5 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_1f3fd_200d_1f3a8.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fd_200d_1f3a8.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_1f3fd_200d_1f3eb.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fd_200d_1f3eb.png
index a5709a149..a5709a149 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_1f3fd_200d_1f3eb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fd_200d_1f3eb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_1f3fd_200d_1f3ed.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fd_200d_1f3ed.png
index 218db6e82..218db6e82 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_1f3fd_200d_1f3ed.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fd_200d_1f3ed.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_1f3fd_200d_1f4bb.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fd_200d_1f4bb.png
index 5f514422b..5f514422b 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_1f3fd_200d_1f4bb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fd_200d_1f4bb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_1f3fd_200d_1f4bc.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fd_200d_1f4bc.png
index 03134c5bc..03134c5bc 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_1f3fd_200d_1f4bc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fd_200d_1f4bc.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_1f3fd_200d_1f527.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fd_200d_1f527.png
index c8818b354..c8818b354 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_1f3fd_200d_1f527.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fd_200d_1f527.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_1f3fd_200d_1f52c.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fd_200d_1f52c.png
index 43ebfb5e2..43ebfb5e2 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_1f3fd_200d_1f52c.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fd_200d_1f52c.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_1f3fd_200d_1f680.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fd_200d_1f680.png
index f4685f619..f4685f619 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_1f3fd_200d_1f680.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fd_200d_1f680.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_1f3fd_200d_1f692.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fd_200d_1f692.png
index 3667f2882..3667f2882 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_1f3fd_200d_1f692.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fd_200d_1f692.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_1f3fd_200d_2695.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fd_200d_2695.png
index f0743922d..f0743922d 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_1f3fd_200d_2695.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fd_200d_2695.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_1f3fd_200d_2696.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fd_200d_2696.png
index 31d64af86..31d64af86 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_1f3fd_200d_2696.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fd_200d_2696.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_1f3fd_200d_2708.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fd_200d_2708.png
index d394195c5..d394195c5 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_1f3fd_200d_2708.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fd_200d_2708.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_1f3fe.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fe.png
index aac21cf0e..aac21cf0e 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_1f3fe.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fe.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_1f3fe_200d_1f33e.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fe_200d_1f33e.png
index ffa0ed305..ffa0ed305 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_1f3fe_200d_1f33e.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fe_200d_1f33e.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_1f3fe_200d_1f373.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fe_200d_1f373.png
index da0eb5792..da0eb5792 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_1f3fe_200d_1f373.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fe_200d_1f373.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_1f3fe_200d_1f393.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fe_200d_1f393.png
index d38742919..d38742919 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_1f3fe_200d_1f393.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fe_200d_1f393.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_1f3fe_200d_1f3a4.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fe_200d_1f3a4.png
index fce74eff7..fce74eff7 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_1f3fe_200d_1f3a4.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fe_200d_1f3a4.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_1f3fe_200d_1f3a8.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fe_200d_1f3a8.png
index 1d0f476e4..1d0f476e4 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_1f3fe_200d_1f3a8.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fe_200d_1f3a8.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_1f3fe_200d_1f3eb.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fe_200d_1f3eb.png
index e1016f2c1..e1016f2c1 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_1f3fe_200d_1f3eb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fe_200d_1f3eb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_1f3fe_200d_1f3ed.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fe_200d_1f3ed.png
index d66f4ad3f..d66f4ad3f 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_1f3fe_200d_1f3ed.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fe_200d_1f3ed.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_1f3fe_200d_1f4bb.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fe_200d_1f4bb.png
index 20200e087..20200e087 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_1f3fe_200d_1f4bb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fe_200d_1f4bb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_1f3fe_200d_1f4bc.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fe_200d_1f4bc.png
index b4e05b873..b4e05b873 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_1f3fe_200d_1f4bc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fe_200d_1f4bc.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_1f3fe_200d_1f527.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fe_200d_1f527.png
index 4b78e7b34..4b78e7b34 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_1f3fe_200d_1f527.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fe_200d_1f527.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_1f3fe_200d_1f52c.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fe_200d_1f52c.png
index 7d80082b0..7d80082b0 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_1f3fe_200d_1f52c.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fe_200d_1f52c.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_1f3fe_200d_1f680.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fe_200d_1f680.png
index c712c0670..c712c0670 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_1f3fe_200d_1f680.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fe_200d_1f680.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_1f3fe_200d_1f692.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fe_200d_1f692.png
index 8df6713e9..8df6713e9 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_1f3fe_200d_1f692.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fe_200d_1f692.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_1f3fe_200d_2695.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fe_200d_2695.png
index d187f6c65..d187f6c65 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_1f3fe_200d_2695.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fe_200d_2695.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_1f3fe_200d_2696.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fe_200d_2696.png
index 6d32f1a54..6d32f1a54 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_1f3fe_200d_2696.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fe_200d_2696.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_1f3fe_200d_2708.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fe_200d_2708.png
index b6fd642fe..b6fd642fe 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_1f3fe_200d_2708.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3fe_200d_2708.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_1f3ff.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3ff.png
index 9bc79bee2..9bc79bee2 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_1f3ff.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3ff.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_1f3ff_200d_1f33e.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3ff_200d_1f33e.png
index fb2dce531..fb2dce531 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_1f3ff_200d_1f33e.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3ff_200d_1f33e.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_1f3ff_200d_1f373.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3ff_200d_1f373.png
index 48de6fc69..48de6fc69 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_1f3ff_200d_1f373.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3ff_200d_1f373.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_1f3ff_200d_1f393.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3ff_200d_1f393.png
index dd2b95ddd..dd2b95ddd 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_1f3ff_200d_1f393.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3ff_200d_1f393.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_1f3ff_200d_1f3a4.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3ff_200d_1f3a4.png
index eb8b8fe4c..eb8b8fe4c 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_1f3ff_200d_1f3a4.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3ff_200d_1f3a4.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_1f3ff_200d_1f3a8.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3ff_200d_1f3a8.png
index fbff1591b..fbff1591b 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_1f3ff_200d_1f3a8.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3ff_200d_1f3a8.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_1f3ff_200d_1f3eb.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3ff_200d_1f3eb.png
index 1c0aed78e..1c0aed78e 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_1f3ff_200d_1f3eb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3ff_200d_1f3eb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_1f3ff_200d_1f3ed.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3ff_200d_1f3ed.png
index 55cd2b400..55cd2b400 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_1f3ff_200d_1f3ed.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3ff_200d_1f3ed.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_1f3ff_200d_1f4bb.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3ff_200d_1f4bb.png
index bc955e7a8..bc955e7a8 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_1f3ff_200d_1f4bb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3ff_200d_1f4bb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_1f3ff_200d_1f4bc.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3ff_200d_1f4bc.png
index bedfbc52f..bedfbc52f 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_1f3ff_200d_1f4bc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3ff_200d_1f4bc.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_1f3ff_200d_1f527.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3ff_200d_1f527.png
index b4995f073..b4995f073 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_1f3ff_200d_1f527.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3ff_200d_1f527.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_1f3ff_200d_1f52c.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3ff_200d_1f52c.png
index 86656384d..86656384d 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_1f3ff_200d_1f52c.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3ff_200d_1f52c.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_1f3ff_200d_1f680.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3ff_200d_1f680.png
index 002b6044b..002b6044b 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_1f3ff_200d_1f680.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3ff_200d_1f680.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_1f3ff_200d_1f692.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3ff_200d_1f692.png
index 39a09a875..39a09a875 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_1f3ff_200d_1f692.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3ff_200d_1f692.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_1f3ff_200d_2695.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3ff_200d_2695.png
index fd54c432d..fd54c432d 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_1f3ff_200d_2695.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3ff_200d_2695.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_1f3ff_200d_2696.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3ff_200d_2696.png
index e86007a71..e86007a71 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_1f3ff_200d_2696.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3ff_200d_2696.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_1f3ff_200d_2708.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3ff_200d_2708.png
index 5817776cb..5817776cb 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_1f3ff_200d_2708.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_1f3ff_200d_2708.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_200d_1f33e.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_200d_1f33e.png
index 1a568a7ec..1a568a7ec 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_200d_1f33e.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_200d_1f33e.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_200d_1f373.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_200d_1f373.png
index 35c15c739..35c15c739 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_200d_1f373.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_200d_1f373.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_200d_1f393.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_200d_1f393.png
index 048548d6d..048548d6d 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_200d_1f393.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_200d_1f393.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_200d_1f3a4.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_200d_1f3a4.png
index b51b8cc67..b51b8cc67 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_200d_1f3a4.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_200d_1f3a4.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_200d_1f3a8.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_200d_1f3a8.png
index 3c70a4c1d..3c70a4c1d 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_200d_1f3a8.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_200d_1f3a8.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_200d_1f3eb.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_200d_1f3eb.png
index 7861958ab..7861958ab 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_200d_1f3eb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_200d_1f3eb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_200d_1f3ed.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_200d_1f3ed.png
index ae4ca6ad7..ae4ca6ad7 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_200d_1f3ed.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_200d_1f3ed.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_200d_1f466.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_200d_1f466.png
index 0d455af36..0d455af36 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_200d_1f466.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_200d_1f466.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_200d_1f466_200d_1f466.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_200d_1f466_200d_1f466.png
index b6216f4d5..b6216f4d5 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_200d_1f466_200d_1f466.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_200d_1f466_200d_1f466.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_200d_1f467.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_200d_1f467.png
index 1f509e670..1f509e670 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_200d_1f467.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_200d_1f467.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_200d_1f467_200d_1f466.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_200d_1f467_200d_1f466.png
index 0d6aa4e40..0d6aa4e40 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_200d_1f467_200d_1f466.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_200d_1f467_200d_1f466.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_200d_1f467_200d_1f467.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_200d_1f467_200d_1f467.png
index 0b4d4be6a..0b4d4be6a 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_200d_1f467_200d_1f467.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_200d_1f467_200d_1f467.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_200d_1f469_200d_1f466.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_200d_1f469_200d_1f466.png
index 98e5b19e3..98e5b19e3 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_200d_1f469_200d_1f466.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_200d_1f469_200d_1f466.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_200d_1f469_200d_1f466_200d_1f466.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_200d_1f469_200d_1f466_200d_1f466.png
index 9c81ab5f0..9c81ab5f0 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_200d_1f469_200d_1f466_200d_1f466.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_200d_1f469_200d_1f466_200d_1f466.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_200d_1f469_200d_1f467.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_200d_1f469_200d_1f467.png
index 9639c756a..9639c756a 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_200d_1f469_200d_1f467.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_200d_1f469_200d_1f467.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_200d_1f469_200d_1f467_200d_1f466.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_200d_1f469_200d_1f467_200d_1f466.png
index f2f50074e..f2f50074e 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_200d_1f469_200d_1f467_200d_1f466.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_200d_1f469_200d_1f467_200d_1f466.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_200d_1f469_200d_1f467_200d_1f467.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_200d_1f469_200d_1f467_200d_1f467.png
index c1338f701..c1338f701 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_200d_1f469_200d_1f467_200d_1f467.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_200d_1f469_200d_1f467_200d_1f467.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_200d_1f4bb.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_200d_1f4bb.png
index 9e203f9fb..9e203f9fb 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_200d_1f4bb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_200d_1f4bb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_200d_1f4bc.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_200d_1f4bc.png
index cf103dfc5..cf103dfc5 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_200d_1f4bc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_200d_1f4bc.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_200d_1f527.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_200d_1f527.png
index 2cf924029..2cf924029 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_200d_1f527.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_200d_1f527.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_200d_1f52c.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_200d_1f52c.png
index c51849de1..c51849de1 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_200d_1f52c.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_200d_1f52c.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_200d_1f680.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_200d_1f680.png
index c11f476f0..c11f476f0 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_200d_1f680.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_200d_1f680.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_200d_1f692.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_200d_1f692.png
index 730d3b56e..730d3b56e 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_200d_1f692.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_200d_1f692.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_200d_2695.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_200d_2695.png
index 5227a2bda..5227a2bda 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_200d_2695.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_200d_2695.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_200d_2696.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_200d_2696.png
index 7bf2ca7b8..7bf2ca7b8 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_200d_2696.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_200d_2696.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_200d_2708.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_200d_2708.png
index 8cfe6ecd1..8cfe6ecd1 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_200d_2708.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_200d_2708.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_200d_2764_200d_1f468.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_200d_2764_200d_1f468.png
index 586e3ce1a..586e3ce1a 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_200d_2764_200d_1f468.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_200d_2764_200d_1f468.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_200d_2764_200d_1f469.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_200d_2764_200d_1f469.png
index 15030f516..15030f516 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_200d_2764_200d_1f469.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_200d_2764_200d_1f469.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_200d_2764_200d_1f48b_200d_1f468.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_200d_2764_200d_1f48b_200d_1f468.png
index d5ef552f7..d5ef552f7 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_200d_2764_200d_1f48b_200d_1f468.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_200d_2764_200d_1f48b_200d_1f468.png
diff --git a/data/emoticons/noto-emoticons/png/u1f469_200d_2764_200d_1f48b_200d_1f469.png b/gajim/data/emoticons/noto-emoticons/png/u1f469_200d_2764_200d_1f48b_200d_1f469.png
index fcf2a3597..fcf2a3597 100644
--- a/data/emoticons/noto-emoticons/png/u1f469_200d_2764_200d_1f48b_200d_1f469.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f469_200d_2764_200d_1f48b_200d_1f469.png
diff --git a/data/emoticons/noto-emoticons/png/u1f46a.png b/gajim/data/emoticons/noto-emoticons/png/u1f46a.png
index c50c1f5b3..c50c1f5b3 100644
--- a/data/emoticons/noto-emoticons/png/u1f46a.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f46a.png
diff --git a/data/emoticons/noto-emoticons/png/u1f46b.png b/gajim/data/emoticons/noto-emoticons/png/u1f46b.png
index cdeeb96d2..cdeeb96d2 100644
--- a/data/emoticons/noto-emoticons/png/u1f46b.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f46b.png
diff --git a/data/emoticons/noto-emoticons/png/u1f46c.png b/gajim/data/emoticons/noto-emoticons/png/u1f46c.png
index d3e9025e0..d3e9025e0 100644
--- a/data/emoticons/noto-emoticons/png/u1f46c.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f46c.png
diff --git a/data/emoticons/noto-emoticons/png/u1f46d.png b/gajim/data/emoticons/noto-emoticons/png/u1f46d.png
index 70c2c6ed9..70c2c6ed9 100644
--- a/data/emoticons/noto-emoticons/png/u1f46d.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f46d.png
diff --git a/data/emoticons/noto-emoticons/png/u1f46e.png b/gajim/data/emoticons/noto-emoticons/png/u1f46e.png
index f473d73e7..f473d73e7 100644
--- a/data/emoticons/noto-emoticons/png/u1f46e.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f46e.png
diff --git a/data/emoticons/noto-emoticons/png/u1f46e_1f3fb.png b/gajim/data/emoticons/noto-emoticons/png/u1f46e_1f3fb.png
index ebcad9b9a..ebcad9b9a 100644
--- a/data/emoticons/noto-emoticons/png/u1f46e_1f3fb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f46e_1f3fb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f46e_1f3fb_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f46e_1f3fb_200d_2640.png
index 6c3c3f65b..6c3c3f65b 100644
--- a/data/emoticons/noto-emoticons/png/u1f46e_1f3fb_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f46e_1f3fb_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f46e_1f3fb_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f46e_1f3fb_200d_2642.png
index ebcad9b9a..ebcad9b9a 100644
--- a/data/emoticons/noto-emoticons/png/u1f46e_1f3fb_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f46e_1f3fb_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f46e_1f3fc.png b/gajim/data/emoticons/noto-emoticons/png/u1f46e_1f3fc.png
index 59369049f..59369049f 100644
--- a/data/emoticons/noto-emoticons/png/u1f46e_1f3fc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f46e_1f3fc.png
diff --git a/data/emoticons/noto-emoticons/png/u1f46e_1f3fc_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f46e_1f3fc_200d_2640.png
index 1f2bb11c6..1f2bb11c6 100644
--- a/data/emoticons/noto-emoticons/png/u1f46e_1f3fc_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f46e_1f3fc_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f46e_1f3fc_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f46e_1f3fc_200d_2642.png
index 59369049f..59369049f 100644
--- a/data/emoticons/noto-emoticons/png/u1f46e_1f3fc_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f46e_1f3fc_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f46e_1f3fd.png b/gajim/data/emoticons/noto-emoticons/png/u1f46e_1f3fd.png
index d03c66f2e..d03c66f2e 100644
--- a/data/emoticons/noto-emoticons/png/u1f46e_1f3fd.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f46e_1f3fd.png
diff --git a/data/emoticons/noto-emoticons/png/u1f46e_1f3fd_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f46e_1f3fd_200d_2640.png
index 2d9b70093..2d9b70093 100644
--- a/data/emoticons/noto-emoticons/png/u1f46e_1f3fd_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f46e_1f3fd_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f46e_1f3fd_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f46e_1f3fd_200d_2642.png
index d03c66f2e..d03c66f2e 100644
--- a/data/emoticons/noto-emoticons/png/u1f46e_1f3fd_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f46e_1f3fd_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f46e_1f3fe.png b/gajim/data/emoticons/noto-emoticons/png/u1f46e_1f3fe.png
index dadcf488b..dadcf488b 100644
--- a/data/emoticons/noto-emoticons/png/u1f46e_1f3fe.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f46e_1f3fe.png
diff --git a/data/emoticons/noto-emoticons/png/u1f46e_1f3fe_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f46e_1f3fe_200d_2640.png
index 655f9d554..655f9d554 100644
--- a/data/emoticons/noto-emoticons/png/u1f46e_1f3fe_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f46e_1f3fe_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f46e_1f3fe_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f46e_1f3fe_200d_2642.png
index dadcf488b..dadcf488b 100644
--- a/data/emoticons/noto-emoticons/png/u1f46e_1f3fe_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f46e_1f3fe_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f46e_1f3ff.png b/gajim/data/emoticons/noto-emoticons/png/u1f46e_1f3ff.png
index b9668db08..b9668db08 100644
--- a/data/emoticons/noto-emoticons/png/u1f46e_1f3ff.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f46e_1f3ff.png
diff --git a/data/emoticons/noto-emoticons/png/u1f46e_1f3ff_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f46e_1f3ff_200d_2640.png
index f544060e6..f544060e6 100644
--- a/data/emoticons/noto-emoticons/png/u1f46e_1f3ff_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f46e_1f3ff_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f46e_1f3ff_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f46e_1f3ff_200d_2642.png
index b9668db08..b9668db08 100644
--- a/data/emoticons/noto-emoticons/png/u1f46e_1f3ff_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f46e_1f3ff_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f46e_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f46e_200d_2640.png
index 0826468a3..0826468a3 100644
--- a/data/emoticons/noto-emoticons/png/u1f46e_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f46e_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f46e_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f46e_200d_2642.png
index f473d73e7..f473d73e7 100644
--- a/data/emoticons/noto-emoticons/png/u1f46e_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f46e_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f46f.png b/gajim/data/emoticons/noto-emoticons/png/u1f46f.png
index 970ac30ae..970ac30ae 100644
--- a/data/emoticons/noto-emoticons/png/u1f46f.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f46f.png
diff --git a/data/emoticons/noto-emoticons/png/u1f46f_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f46f_200d_2640.png
index 970ac30ae..970ac30ae 100644
--- a/data/emoticons/noto-emoticons/png/u1f46f_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f46f_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f46f_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f46f_200d_2642.png
index b1ce04a79..b1ce04a79 100644
--- a/data/emoticons/noto-emoticons/png/u1f46f_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f46f_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f470.png b/gajim/data/emoticons/noto-emoticons/png/u1f470.png
index f638e675a..f638e675a 100644
--- a/data/emoticons/noto-emoticons/png/u1f470.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f470.png
diff --git a/data/emoticons/noto-emoticons/png/u1f470_1f3fb.png b/gajim/data/emoticons/noto-emoticons/png/u1f470_1f3fb.png
index fb445243d..fb445243d 100644
--- a/data/emoticons/noto-emoticons/png/u1f470_1f3fb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f470_1f3fb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f470_1f3fc.png b/gajim/data/emoticons/noto-emoticons/png/u1f470_1f3fc.png
index d6bd67832..d6bd67832 100644
--- a/data/emoticons/noto-emoticons/png/u1f470_1f3fc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f470_1f3fc.png
diff --git a/data/emoticons/noto-emoticons/png/u1f470_1f3fd.png b/gajim/data/emoticons/noto-emoticons/png/u1f470_1f3fd.png
index 565e3a500..565e3a500 100644
--- a/data/emoticons/noto-emoticons/png/u1f470_1f3fd.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f470_1f3fd.png
diff --git a/data/emoticons/noto-emoticons/png/u1f470_1f3fe.png b/gajim/data/emoticons/noto-emoticons/png/u1f470_1f3fe.png
index 193d6b9b5..193d6b9b5 100644
--- a/data/emoticons/noto-emoticons/png/u1f470_1f3fe.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f470_1f3fe.png
diff --git a/data/emoticons/noto-emoticons/png/u1f470_1f3ff.png b/gajim/data/emoticons/noto-emoticons/png/u1f470_1f3ff.png
index fa3f92e1d..fa3f92e1d 100644
--- a/data/emoticons/noto-emoticons/png/u1f470_1f3ff.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f470_1f3ff.png
diff --git a/data/emoticons/noto-emoticons/png/u1f471.png b/gajim/data/emoticons/noto-emoticons/png/u1f471.png
index a7f166396..a7f166396 100644
--- a/data/emoticons/noto-emoticons/png/u1f471.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f471.png
diff --git a/data/emoticons/noto-emoticons/png/u1f471_1f3fb.png b/gajim/data/emoticons/noto-emoticons/png/u1f471_1f3fb.png
index eac679c55..eac679c55 100644
--- a/data/emoticons/noto-emoticons/png/u1f471_1f3fb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f471_1f3fb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f471_1f3fb_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f471_1f3fb_200d_2640.png
index 40e7eaa16..40e7eaa16 100644
--- a/data/emoticons/noto-emoticons/png/u1f471_1f3fb_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f471_1f3fb_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f471_1f3fb_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f471_1f3fb_200d_2642.png
index eac679c55..eac679c55 100644
--- a/data/emoticons/noto-emoticons/png/u1f471_1f3fb_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f471_1f3fb_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f471_1f3fc.png b/gajim/data/emoticons/noto-emoticons/png/u1f471_1f3fc.png
index bb86339e2..bb86339e2 100644
--- a/data/emoticons/noto-emoticons/png/u1f471_1f3fc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f471_1f3fc.png
diff --git a/data/emoticons/noto-emoticons/png/u1f471_1f3fc_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f471_1f3fc_200d_2640.png
index 1dbd6f81b..1dbd6f81b 100644
--- a/data/emoticons/noto-emoticons/png/u1f471_1f3fc_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f471_1f3fc_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f471_1f3fc_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f471_1f3fc_200d_2642.png
index bb86339e2..bb86339e2 100644
--- a/data/emoticons/noto-emoticons/png/u1f471_1f3fc_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f471_1f3fc_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f471_1f3fd.png b/gajim/data/emoticons/noto-emoticons/png/u1f471_1f3fd.png
index 602912c7f..602912c7f 100644
--- a/data/emoticons/noto-emoticons/png/u1f471_1f3fd.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f471_1f3fd.png
diff --git a/data/emoticons/noto-emoticons/png/u1f471_1f3fd_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f471_1f3fd_200d_2640.png
index 293b87a62..293b87a62 100644
--- a/data/emoticons/noto-emoticons/png/u1f471_1f3fd_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f471_1f3fd_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f471_1f3fd_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f471_1f3fd_200d_2642.png
index 602912c7f..602912c7f 100644
--- a/data/emoticons/noto-emoticons/png/u1f471_1f3fd_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f471_1f3fd_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f471_1f3fe.png b/gajim/data/emoticons/noto-emoticons/png/u1f471_1f3fe.png
index 1cb35f6f0..1cb35f6f0 100644
--- a/data/emoticons/noto-emoticons/png/u1f471_1f3fe.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f471_1f3fe.png
diff --git a/data/emoticons/noto-emoticons/png/u1f471_1f3fe_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f471_1f3fe_200d_2640.png
index 4566d5fbb..4566d5fbb 100644
--- a/data/emoticons/noto-emoticons/png/u1f471_1f3fe_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f471_1f3fe_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f471_1f3fe_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f471_1f3fe_200d_2642.png
index 1cb35f6f0..1cb35f6f0 100644
--- a/data/emoticons/noto-emoticons/png/u1f471_1f3fe_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f471_1f3fe_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f471_1f3ff.png b/gajim/data/emoticons/noto-emoticons/png/u1f471_1f3ff.png
index f07c3ef8f..f07c3ef8f 100644
--- a/data/emoticons/noto-emoticons/png/u1f471_1f3ff.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f471_1f3ff.png
diff --git a/data/emoticons/noto-emoticons/png/u1f471_1f3ff_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f471_1f3ff_200d_2640.png
index 05e06b10b..05e06b10b 100644
--- a/data/emoticons/noto-emoticons/png/u1f471_1f3ff_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f471_1f3ff_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f471_1f3ff_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f471_1f3ff_200d_2642.png
index f07c3ef8f..f07c3ef8f 100644
--- a/data/emoticons/noto-emoticons/png/u1f471_1f3ff_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f471_1f3ff_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f471_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f471_200d_2640.png
index 77070facc..77070facc 100644
--- a/data/emoticons/noto-emoticons/png/u1f471_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f471_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f471_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f471_200d_2642.png
index a7f166396..a7f166396 100644
--- a/data/emoticons/noto-emoticons/png/u1f471_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f471_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f472.png b/gajim/data/emoticons/noto-emoticons/png/u1f472.png
index 6fdf4d058..6fdf4d058 100644
--- a/data/emoticons/noto-emoticons/png/u1f472.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f472.png
diff --git a/data/emoticons/noto-emoticons/png/u1f472_1f3fb.png b/gajim/data/emoticons/noto-emoticons/png/u1f472_1f3fb.png
index 9982cf09e..9982cf09e 100644
--- a/data/emoticons/noto-emoticons/png/u1f472_1f3fb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f472_1f3fb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f472_1f3fc.png b/gajim/data/emoticons/noto-emoticons/png/u1f472_1f3fc.png
index 66688fdf1..66688fdf1 100644
--- a/data/emoticons/noto-emoticons/png/u1f472_1f3fc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f472_1f3fc.png
diff --git a/data/emoticons/noto-emoticons/png/u1f472_1f3fd.png b/gajim/data/emoticons/noto-emoticons/png/u1f472_1f3fd.png
index 583021604..583021604 100644
--- a/data/emoticons/noto-emoticons/png/u1f472_1f3fd.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f472_1f3fd.png
diff --git a/data/emoticons/noto-emoticons/png/u1f472_1f3fe.png b/gajim/data/emoticons/noto-emoticons/png/u1f472_1f3fe.png
index 18d7058eb..18d7058eb 100644
--- a/data/emoticons/noto-emoticons/png/u1f472_1f3fe.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f472_1f3fe.png
diff --git a/data/emoticons/noto-emoticons/png/u1f472_1f3ff.png b/gajim/data/emoticons/noto-emoticons/png/u1f472_1f3ff.png
index 013787d3e..013787d3e 100644
--- a/data/emoticons/noto-emoticons/png/u1f472_1f3ff.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f472_1f3ff.png
diff --git a/data/emoticons/noto-emoticons/png/u1f473.png b/gajim/data/emoticons/noto-emoticons/png/u1f473.png
index 3dece3880..3dece3880 100644
--- a/data/emoticons/noto-emoticons/png/u1f473.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f473.png
diff --git a/data/emoticons/noto-emoticons/png/u1f473_1f3fb.png b/gajim/data/emoticons/noto-emoticons/png/u1f473_1f3fb.png
index e0f19714b..e0f19714b 100644
--- a/data/emoticons/noto-emoticons/png/u1f473_1f3fb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f473_1f3fb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f473_1f3fb_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f473_1f3fb_200d_2640.png
index 5b9e44728..5b9e44728 100644
--- a/data/emoticons/noto-emoticons/png/u1f473_1f3fb_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f473_1f3fb_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f473_1f3fb_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f473_1f3fb_200d_2642.png
index e0f19714b..e0f19714b 100644
--- a/data/emoticons/noto-emoticons/png/u1f473_1f3fb_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f473_1f3fb_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f473_1f3fc.png b/gajim/data/emoticons/noto-emoticons/png/u1f473_1f3fc.png
index 5f1d37733..5f1d37733 100644
--- a/data/emoticons/noto-emoticons/png/u1f473_1f3fc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f473_1f3fc.png
diff --git a/data/emoticons/noto-emoticons/png/u1f473_1f3fc_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f473_1f3fc_200d_2640.png
index 4a644fb64..4a644fb64 100644
--- a/data/emoticons/noto-emoticons/png/u1f473_1f3fc_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f473_1f3fc_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f473_1f3fc_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f473_1f3fc_200d_2642.png
index 5f1d37733..5f1d37733 100644
--- a/data/emoticons/noto-emoticons/png/u1f473_1f3fc_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f473_1f3fc_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f473_1f3fd.png b/gajim/data/emoticons/noto-emoticons/png/u1f473_1f3fd.png
index 27879642f..27879642f 100644
--- a/data/emoticons/noto-emoticons/png/u1f473_1f3fd.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f473_1f3fd.png
diff --git a/data/emoticons/noto-emoticons/png/u1f473_1f3fd_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f473_1f3fd_200d_2640.png
index 53c1e953c..53c1e953c 100644
--- a/data/emoticons/noto-emoticons/png/u1f473_1f3fd_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f473_1f3fd_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f473_1f3fd_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f473_1f3fd_200d_2642.png
index 27879642f..27879642f 100644
--- a/data/emoticons/noto-emoticons/png/u1f473_1f3fd_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f473_1f3fd_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f473_1f3fe.png b/gajim/data/emoticons/noto-emoticons/png/u1f473_1f3fe.png
index 92703ba57..92703ba57 100644
--- a/data/emoticons/noto-emoticons/png/u1f473_1f3fe.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f473_1f3fe.png
diff --git a/data/emoticons/noto-emoticons/png/u1f473_1f3fe_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f473_1f3fe_200d_2640.png
index 43a293f84..43a293f84 100644
--- a/data/emoticons/noto-emoticons/png/u1f473_1f3fe_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f473_1f3fe_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f473_1f3fe_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f473_1f3fe_200d_2642.png
index 92703ba57..92703ba57 100644
--- a/data/emoticons/noto-emoticons/png/u1f473_1f3fe_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f473_1f3fe_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f473_1f3ff.png b/gajim/data/emoticons/noto-emoticons/png/u1f473_1f3ff.png
index a079defda..a079defda 100644
--- a/data/emoticons/noto-emoticons/png/u1f473_1f3ff.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f473_1f3ff.png
diff --git a/data/emoticons/noto-emoticons/png/u1f473_1f3ff_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f473_1f3ff_200d_2640.png
index c9c222a6a..c9c222a6a 100644
--- a/data/emoticons/noto-emoticons/png/u1f473_1f3ff_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f473_1f3ff_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f473_1f3ff_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f473_1f3ff_200d_2642.png
index a079defda..a079defda 100644
--- a/data/emoticons/noto-emoticons/png/u1f473_1f3ff_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f473_1f3ff_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f473_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f473_200d_2640.png
index 640ec4921..640ec4921 100644
--- a/data/emoticons/noto-emoticons/png/u1f473_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f473_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f473_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f473_200d_2642.png
index 3dece3880..3dece3880 100644
--- a/data/emoticons/noto-emoticons/png/u1f473_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f473_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f474.png b/gajim/data/emoticons/noto-emoticons/png/u1f474.png
index ae2238e8a..ae2238e8a 100644
--- a/data/emoticons/noto-emoticons/png/u1f474.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f474.png
diff --git a/data/emoticons/noto-emoticons/png/u1f474_1f3fb.png b/gajim/data/emoticons/noto-emoticons/png/u1f474_1f3fb.png
index 0fe906c9d..0fe906c9d 100644
--- a/data/emoticons/noto-emoticons/png/u1f474_1f3fb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f474_1f3fb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f474_1f3fc.png b/gajim/data/emoticons/noto-emoticons/png/u1f474_1f3fc.png
index 64d1e22c9..64d1e22c9 100644
--- a/data/emoticons/noto-emoticons/png/u1f474_1f3fc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f474_1f3fc.png
diff --git a/data/emoticons/noto-emoticons/png/u1f474_1f3fd.png b/gajim/data/emoticons/noto-emoticons/png/u1f474_1f3fd.png
index 25452eba4..25452eba4 100644
--- a/data/emoticons/noto-emoticons/png/u1f474_1f3fd.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f474_1f3fd.png
diff --git a/data/emoticons/noto-emoticons/png/u1f474_1f3fe.png b/gajim/data/emoticons/noto-emoticons/png/u1f474_1f3fe.png
index ee78be66f..ee78be66f 100644
--- a/data/emoticons/noto-emoticons/png/u1f474_1f3fe.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f474_1f3fe.png
diff --git a/data/emoticons/noto-emoticons/png/u1f474_1f3ff.png b/gajim/data/emoticons/noto-emoticons/png/u1f474_1f3ff.png
index 3e789da91..3e789da91 100644
--- a/data/emoticons/noto-emoticons/png/u1f474_1f3ff.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f474_1f3ff.png
diff --git a/data/emoticons/noto-emoticons/png/u1f475.png b/gajim/data/emoticons/noto-emoticons/png/u1f475.png
index b13c7420a..b13c7420a 100644
--- a/data/emoticons/noto-emoticons/png/u1f475.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f475.png
diff --git a/data/emoticons/noto-emoticons/png/u1f475_1f3fb.png b/gajim/data/emoticons/noto-emoticons/png/u1f475_1f3fb.png
index d444159d7..d444159d7 100644
--- a/data/emoticons/noto-emoticons/png/u1f475_1f3fb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f475_1f3fb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f475_1f3fc.png b/gajim/data/emoticons/noto-emoticons/png/u1f475_1f3fc.png
index 170adcada..170adcada 100644
--- a/data/emoticons/noto-emoticons/png/u1f475_1f3fc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f475_1f3fc.png
diff --git a/data/emoticons/noto-emoticons/png/u1f475_1f3fd.png b/gajim/data/emoticons/noto-emoticons/png/u1f475_1f3fd.png
index 8f8b5474d..8f8b5474d 100644
--- a/data/emoticons/noto-emoticons/png/u1f475_1f3fd.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f475_1f3fd.png
diff --git a/data/emoticons/noto-emoticons/png/u1f475_1f3fe.png b/gajim/data/emoticons/noto-emoticons/png/u1f475_1f3fe.png
index 05cae5cb2..05cae5cb2 100644
--- a/data/emoticons/noto-emoticons/png/u1f475_1f3fe.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f475_1f3fe.png
diff --git a/data/emoticons/noto-emoticons/png/u1f475_1f3ff.png b/gajim/data/emoticons/noto-emoticons/png/u1f475_1f3ff.png
index b4742ee49..b4742ee49 100644
--- a/data/emoticons/noto-emoticons/png/u1f475_1f3ff.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f475_1f3ff.png
diff --git a/data/emoticons/noto-emoticons/png/u1f476.png b/gajim/data/emoticons/noto-emoticons/png/u1f476.png
index 6e5ea63e6..6e5ea63e6 100644
--- a/data/emoticons/noto-emoticons/png/u1f476.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f476.png
diff --git a/data/emoticons/noto-emoticons/png/u1f476_1f3fb.png b/gajim/data/emoticons/noto-emoticons/png/u1f476_1f3fb.png
index 6e1994cc0..6e1994cc0 100644
--- a/data/emoticons/noto-emoticons/png/u1f476_1f3fb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f476_1f3fb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f476_1f3fc.png b/gajim/data/emoticons/noto-emoticons/png/u1f476_1f3fc.png
index b8c676408..b8c676408 100644
--- a/data/emoticons/noto-emoticons/png/u1f476_1f3fc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f476_1f3fc.png
diff --git a/data/emoticons/noto-emoticons/png/u1f476_1f3fd.png b/gajim/data/emoticons/noto-emoticons/png/u1f476_1f3fd.png
index 3532ead2f..3532ead2f 100644
--- a/data/emoticons/noto-emoticons/png/u1f476_1f3fd.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f476_1f3fd.png
diff --git a/data/emoticons/noto-emoticons/png/u1f476_1f3fe.png b/gajim/data/emoticons/noto-emoticons/png/u1f476_1f3fe.png
index 1574933de..1574933de 100644
--- a/data/emoticons/noto-emoticons/png/u1f476_1f3fe.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f476_1f3fe.png
diff --git a/data/emoticons/noto-emoticons/png/u1f476_1f3ff.png b/gajim/data/emoticons/noto-emoticons/png/u1f476_1f3ff.png
index b7b0a9af3..b7b0a9af3 100644
--- a/data/emoticons/noto-emoticons/png/u1f476_1f3ff.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f476_1f3ff.png
diff --git a/data/emoticons/noto-emoticons/png/u1f477.png b/gajim/data/emoticons/noto-emoticons/png/u1f477.png
index 6dcccfc03..6dcccfc03 100644
--- a/data/emoticons/noto-emoticons/png/u1f477.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f477.png
diff --git a/data/emoticons/noto-emoticons/png/u1f477_1f3fb.png b/gajim/data/emoticons/noto-emoticons/png/u1f477_1f3fb.png
index d5aaa3807..d5aaa3807 100644
--- a/data/emoticons/noto-emoticons/png/u1f477_1f3fb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f477_1f3fb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f477_1f3fb_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f477_1f3fb_200d_2640.png
index 2111ec532..2111ec532 100644
--- a/data/emoticons/noto-emoticons/png/u1f477_1f3fb_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f477_1f3fb_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f477_1f3fb_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f477_1f3fb_200d_2642.png
index d5aaa3807..d5aaa3807 100644
--- a/data/emoticons/noto-emoticons/png/u1f477_1f3fb_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f477_1f3fb_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f477_1f3fc.png b/gajim/data/emoticons/noto-emoticons/png/u1f477_1f3fc.png
index 2616523bf..2616523bf 100644
--- a/data/emoticons/noto-emoticons/png/u1f477_1f3fc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f477_1f3fc.png
diff --git a/data/emoticons/noto-emoticons/png/u1f477_1f3fc_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f477_1f3fc_200d_2640.png
index c4ea029e7..c4ea029e7 100644
--- a/data/emoticons/noto-emoticons/png/u1f477_1f3fc_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f477_1f3fc_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f477_1f3fc_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f477_1f3fc_200d_2642.png
index 2616523bf..2616523bf 100644
--- a/data/emoticons/noto-emoticons/png/u1f477_1f3fc_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f477_1f3fc_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f477_1f3fd.png b/gajim/data/emoticons/noto-emoticons/png/u1f477_1f3fd.png
index d34a4d4fb..d34a4d4fb 100644
--- a/data/emoticons/noto-emoticons/png/u1f477_1f3fd.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f477_1f3fd.png
diff --git a/data/emoticons/noto-emoticons/png/u1f477_1f3fd_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f477_1f3fd_200d_2640.png
index cc02b0477..cc02b0477 100644
--- a/data/emoticons/noto-emoticons/png/u1f477_1f3fd_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f477_1f3fd_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f477_1f3fd_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f477_1f3fd_200d_2642.png
index d34a4d4fb..d34a4d4fb 100644
--- a/data/emoticons/noto-emoticons/png/u1f477_1f3fd_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f477_1f3fd_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f477_1f3fe.png b/gajim/data/emoticons/noto-emoticons/png/u1f477_1f3fe.png
index 6e9e735ae..6e9e735ae 100644
--- a/data/emoticons/noto-emoticons/png/u1f477_1f3fe.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f477_1f3fe.png
diff --git a/data/emoticons/noto-emoticons/png/u1f477_1f3fe_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f477_1f3fe_200d_2640.png
index 22f1da782..22f1da782 100644
--- a/data/emoticons/noto-emoticons/png/u1f477_1f3fe_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f477_1f3fe_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f477_1f3fe_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f477_1f3fe_200d_2642.png
index 6e9e735ae..6e9e735ae 100644
--- a/data/emoticons/noto-emoticons/png/u1f477_1f3fe_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f477_1f3fe_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f477_1f3ff.png b/gajim/data/emoticons/noto-emoticons/png/u1f477_1f3ff.png
index b44eec271..b44eec271 100644
--- a/data/emoticons/noto-emoticons/png/u1f477_1f3ff.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f477_1f3ff.png
diff --git a/data/emoticons/noto-emoticons/png/u1f477_1f3ff_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f477_1f3ff_200d_2640.png
index 10eaa3621..10eaa3621 100644
--- a/data/emoticons/noto-emoticons/png/u1f477_1f3ff_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f477_1f3ff_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f477_1f3ff_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f477_1f3ff_200d_2642.png
index b44eec271..b44eec271 100644
--- a/data/emoticons/noto-emoticons/png/u1f477_1f3ff_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f477_1f3ff_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f477_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f477_200d_2640.png
index 1ea20ec16..1ea20ec16 100644
--- a/data/emoticons/noto-emoticons/png/u1f477_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f477_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f477_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f477_200d_2642.png
index 6dcccfc03..6dcccfc03 100644
--- a/data/emoticons/noto-emoticons/png/u1f477_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f477_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f478.png b/gajim/data/emoticons/noto-emoticons/png/u1f478.png
index e62e27a2a..e62e27a2a 100644
--- a/data/emoticons/noto-emoticons/png/u1f478.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f478.png
diff --git a/data/emoticons/noto-emoticons/png/u1f478_1f3fb.png b/gajim/data/emoticons/noto-emoticons/png/u1f478_1f3fb.png
index 464f32450..464f32450 100644
--- a/data/emoticons/noto-emoticons/png/u1f478_1f3fb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f478_1f3fb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f478_1f3fc.png b/gajim/data/emoticons/noto-emoticons/png/u1f478_1f3fc.png
index e06db8c58..e06db8c58 100644
--- a/data/emoticons/noto-emoticons/png/u1f478_1f3fc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f478_1f3fc.png
diff --git a/data/emoticons/noto-emoticons/png/u1f478_1f3fd.png b/gajim/data/emoticons/noto-emoticons/png/u1f478_1f3fd.png
index 851d0cb11..851d0cb11 100644
--- a/data/emoticons/noto-emoticons/png/u1f478_1f3fd.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f478_1f3fd.png
diff --git a/data/emoticons/noto-emoticons/png/u1f478_1f3fe.png b/gajim/data/emoticons/noto-emoticons/png/u1f478_1f3fe.png
index ec0aa2bb6..ec0aa2bb6 100644
--- a/data/emoticons/noto-emoticons/png/u1f478_1f3fe.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f478_1f3fe.png
diff --git a/data/emoticons/noto-emoticons/png/u1f478_1f3ff.png b/gajim/data/emoticons/noto-emoticons/png/u1f478_1f3ff.png
index 2175da974..2175da974 100644
--- a/data/emoticons/noto-emoticons/png/u1f478_1f3ff.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f478_1f3ff.png
diff --git a/data/emoticons/noto-emoticons/png/u1f479.png b/gajim/data/emoticons/noto-emoticons/png/u1f479.png
index 081ea7739..081ea7739 100644
--- a/data/emoticons/noto-emoticons/png/u1f479.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f479.png
diff --git a/data/emoticons/noto-emoticons/png/u1f47a.png b/gajim/data/emoticons/noto-emoticons/png/u1f47a.png
index ca8eb3ba6..ca8eb3ba6 100644
--- a/data/emoticons/noto-emoticons/png/u1f47a.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f47a.png
diff --git a/data/emoticons/noto-emoticons/png/u1f47b.png b/gajim/data/emoticons/noto-emoticons/png/u1f47b.png
index 68b3c1ce1..68b3c1ce1 100644
--- a/data/emoticons/noto-emoticons/png/u1f47b.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f47b.png
diff --git a/data/emoticons/noto-emoticons/png/u1f47c.png b/gajim/data/emoticons/noto-emoticons/png/u1f47c.png
index 4532a9c35..4532a9c35 100644
--- a/data/emoticons/noto-emoticons/png/u1f47c.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f47c.png
diff --git a/data/emoticons/noto-emoticons/png/u1f47c_1f3fb.png b/gajim/data/emoticons/noto-emoticons/png/u1f47c_1f3fb.png
index b81e90978..b81e90978 100644
--- a/data/emoticons/noto-emoticons/png/u1f47c_1f3fb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f47c_1f3fb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f47c_1f3fc.png b/gajim/data/emoticons/noto-emoticons/png/u1f47c_1f3fc.png
index 3614ce40b..3614ce40b 100644
--- a/data/emoticons/noto-emoticons/png/u1f47c_1f3fc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f47c_1f3fc.png
diff --git a/data/emoticons/noto-emoticons/png/u1f47c_1f3fd.png b/gajim/data/emoticons/noto-emoticons/png/u1f47c_1f3fd.png
index f82bb77f8..f82bb77f8 100644
--- a/data/emoticons/noto-emoticons/png/u1f47c_1f3fd.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f47c_1f3fd.png
diff --git a/data/emoticons/noto-emoticons/png/u1f47c_1f3fe.png b/gajim/data/emoticons/noto-emoticons/png/u1f47c_1f3fe.png
index e01fcdcc7..e01fcdcc7 100644
--- a/data/emoticons/noto-emoticons/png/u1f47c_1f3fe.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f47c_1f3fe.png
diff --git a/data/emoticons/noto-emoticons/png/u1f47c_1f3ff.png b/gajim/data/emoticons/noto-emoticons/png/u1f47c_1f3ff.png
index 0d48718a9..0d48718a9 100644
--- a/data/emoticons/noto-emoticons/png/u1f47c_1f3ff.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f47c_1f3ff.png
diff --git a/data/emoticons/noto-emoticons/png/u1f47d.png b/gajim/data/emoticons/noto-emoticons/png/u1f47d.png
index 299dfe827..299dfe827 100644
--- a/data/emoticons/noto-emoticons/png/u1f47d.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f47d.png
diff --git a/data/emoticons/noto-emoticons/png/u1f47e.png b/gajim/data/emoticons/noto-emoticons/png/u1f47e.png
index 31e794896..31e794896 100644
--- a/data/emoticons/noto-emoticons/png/u1f47e.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f47e.png
diff --git a/data/emoticons/noto-emoticons/png/u1f47f.png b/gajim/data/emoticons/noto-emoticons/png/u1f47f.png
index 859957ca0..859957ca0 100644
--- a/data/emoticons/noto-emoticons/png/u1f47f.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f47f.png
diff --git a/data/emoticons/noto-emoticons/png/u1f480.png b/gajim/data/emoticons/noto-emoticons/png/u1f480.png
index 85ad83743..85ad83743 100644
--- a/data/emoticons/noto-emoticons/png/u1f480.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f480.png
diff --git a/data/emoticons/noto-emoticons/png/u1f481.png b/gajim/data/emoticons/noto-emoticons/png/u1f481.png
index f45593dad..f45593dad 100644
--- a/data/emoticons/noto-emoticons/png/u1f481.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f481.png
diff --git a/data/emoticons/noto-emoticons/png/u1f481_1f3fb.png b/gajim/data/emoticons/noto-emoticons/png/u1f481_1f3fb.png
index de0b7bd16..de0b7bd16 100644
--- a/data/emoticons/noto-emoticons/png/u1f481_1f3fb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f481_1f3fb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f481_1f3fb_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f481_1f3fb_200d_2640.png
index de0b7bd16..de0b7bd16 100644
--- a/data/emoticons/noto-emoticons/png/u1f481_1f3fb_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f481_1f3fb_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f481_1f3fb_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f481_1f3fb_200d_2642.png
index ec2e5f6a0..ec2e5f6a0 100644
--- a/data/emoticons/noto-emoticons/png/u1f481_1f3fb_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f481_1f3fb_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f481_1f3fc.png b/gajim/data/emoticons/noto-emoticons/png/u1f481_1f3fc.png
index dc16fe1ea..dc16fe1ea 100644
--- a/data/emoticons/noto-emoticons/png/u1f481_1f3fc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f481_1f3fc.png
diff --git a/data/emoticons/noto-emoticons/png/u1f481_1f3fc_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f481_1f3fc_200d_2640.png
index dc16fe1ea..dc16fe1ea 100644
--- a/data/emoticons/noto-emoticons/png/u1f481_1f3fc_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f481_1f3fc_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f481_1f3fc_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f481_1f3fc_200d_2642.png
index 0d8e6201d..0d8e6201d 100644
--- a/data/emoticons/noto-emoticons/png/u1f481_1f3fc_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f481_1f3fc_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f481_1f3fd.png b/gajim/data/emoticons/noto-emoticons/png/u1f481_1f3fd.png
index cbaddc2ac..cbaddc2ac 100644
--- a/data/emoticons/noto-emoticons/png/u1f481_1f3fd.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f481_1f3fd.png
diff --git a/data/emoticons/noto-emoticons/png/u1f481_1f3fd_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f481_1f3fd_200d_2640.png
index cbaddc2ac..cbaddc2ac 100644
--- a/data/emoticons/noto-emoticons/png/u1f481_1f3fd_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f481_1f3fd_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f481_1f3fd_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f481_1f3fd_200d_2642.png
index 61527738d..61527738d 100644
--- a/data/emoticons/noto-emoticons/png/u1f481_1f3fd_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f481_1f3fd_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f481_1f3fe.png b/gajim/data/emoticons/noto-emoticons/png/u1f481_1f3fe.png
index e888f186a..e888f186a 100644
--- a/data/emoticons/noto-emoticons/png/u1f481_1f3fe.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f481_1f3fe.png
diff --git a/data/emoticons/noto-emoticons/png/u1f481_1f3fe_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f481_1f3fe_200d_2640.png
index e888f186a..e888f186a 100644
--- a/data/emoticons/noto-emoticons/png/u1f481_1f3fe_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f481_1f3fe_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f481_1f3fe_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f481_1f3fe_200d_2642.png
index 94709cdce..94709cdce 100644
--- a/data/emoticons/noto-emoticons/png/u1f481_1f3fe_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f481_1f3fe_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f481_1f3ff.png b/gajim/data/emoticons/noto-emoticons/png/u1f481_1f3ff.png
index cae3e1486..cae3e1486 100644
--- a/data/emoticons/noto-emoticons/png/u1f481_1f3ff.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f481_1f3ff.png
diff --git a/data/emoticons/noto-emoticons/png/u1f481_1f3ff_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f481_1f3ff_200d_2640.png
index cae3e1486..cae3e1486 100644
--- a/data/emoticons/noto-emoticons/png/u1f481_1f3ff_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f481_1f3ff_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f481_1f3ff_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f481_1f3ff_200d_2642.png
index 34de79e16..34de79e16 100644
--- a/data/emoticons/noto-emoticons/png/u1f481_1f3ff_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f481_1f3ff_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f481_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f481_200d_2640.png
index f45593dad..f45593dad 100644
--- a/data/emoticons/noto-emoticons/png/u1f481_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f481_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f481_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f481_200d_2642.png
index ee8c33d83..ee8c33d83 100644
--- a/data/emoticons/noto-emoticons/png/u1f481_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f481_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f482.png b/gajim/data/emoticons/noto-emoticons/png/u1f482.png
index af0562678..af0562678 100644
--- a/data/emoticons/noto-emoticons/png/u1f482.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f482.png
diff --git a/data/emoticons/noto-emoticons/png/u1f482_1f3fb.png b/gajim/data/emoticons/noto-emoticons/png/u1f482_1f3fb.png
index 298375b44..298375b44 100644
--- a/data/emoticons/noto-emoticons/png/u1f482_1f3fb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f482_1f3fb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f482_1f3fb_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f482_1f3fb_200d_2640.png
index b7f179cc7..b7f179cc7 100644
--- a/data/emoticons/noto-emoticons/png/u1f482_1f3fb_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f482_1f3fb_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f482_1f3fb_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f482_1f3fb_200d_2642.png
index 298375b44..298375b44 100644
--- a/data/emoticons/noto-emoticons/png/u1f482_1f3fb_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f482_1f3fb_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f482_1f3fc.png b/gajim/data/emoticons/noto-emoticons/png/u1f482_1f3fc.png
index 6e64d3629..6e64d3629 100644
--- a/data/emoticons/noto-emoticons/png/u1f482_1f3fc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f482_1f3fc.png
diff --git a/data/emoticons/noto-emoticons/png/u1f482_1f3fc_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f482_1f3fc_200d_2640.png
index de95bddf0..de95bddf0 100644
--- a/data/emoticons/noto-emoticons/png/u1f482_1f3fc_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f482_1f3fc_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f482_1f3fc_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f482_1f3fc_200d_2642.png
index 6e64d3629..6e64d3629 100644
--- a/data/emoticons/noto-emoticons/png/u1f482_1f3fc_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f482_1f3fc_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f482_1f3fd.png b/gajim/data/emoticons/noto-emoticons/png/u1f482_1f3fd.png
index 25ccde246..25ccde246 100644
--- a/data/emoticons/noto-emoticons/png/u1f482_1f3fd.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f482_1f3fd.png
diff --git a/data/emoticons/noto-emoticons/png/u1f482_1f3fd_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f482_1f3fd_200d_2640.png
index f962b01c3..f962b01c3 100644
--- a/data/emoticons/noto-emoticons/png/u1f482_1f3fd_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f482_1f3fd_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f482_1f3fd_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f482_1f3fd_200d_2642.png
index 25ccde246..25ccde246 100644
--- a/data/emoticons/noto-emoticons/png/u1f482_1f3fd_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f482_1f3fd_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f482_1f3fe.png b/gajim/data/emoticons/noto-emoticons/png/u1f482_1f3fe.png
index 743d599d2..743d599d2 100644
--- a/data/emoticons/noto-emoticons/png/u1f482_1f3fe.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f482_1f3fe.png
diff --git a/data/emoticons/noto-emoticons/png/u1f482_1f3fe_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f482_1f3fe_200d_2640.png
index 1de12d5ac..1de12d5ac 100644
--- a/data/emoticons/noto-emoticons/png/u1f482_1f3fe_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f482_1f3fe_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f482_1f3fe_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f482_1f3fe_200d_2642.png
index 743d599d2..743d599d2 100644
--- a/data/emoticons/noto-emoticons/png/u1f482_1f3fe_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f482_1f3fe_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f482_1f3ff.png b/gajim/data/emoticons/noto-emoticons/png/u1f482_1f3ff.png
index 0f03fca45..0f03fca45 100644
--- a/data/emoticons/noto-emoticons/png/u1f482_1f3ff.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f482_1f3ff.png
diff --git a/data/emoticons/noto-emoticons/png/u1f482_1f3ff_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f482_1f3ff_200d_2640.png
index 334f59129..334f59129 100644
--- a/data/emoticons/noto-emoticons/png/u1f482_1f3ff_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f482_1f3ff_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f482_1f3ff_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f482_1f3ff_200d_2642.png
index 0f03fca45..0f03fca45 100644
--- a/data/emoticons/noto-emoticons/png/u1f482_1f3ff_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f482_1f3ff_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f482_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f482_200d_2640.png
index 5993fb7cb..5993fb7cb 100644
--- a/data/emoticons/noto-emoticons/png/u1f482_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f482_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f482_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f482_200d_2642.png
index af0562678..af0562678 100644
--- a/data/emoticons/noto-emoticons/png/u1f482_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f482_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f483.png b/gajim/data/emoticons/noto-emoticons/png/u1f483.png
index 320100d60..320100d60 100644
--- a/data/emoticons/noto-emoticons/png/u1f483.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f483.png
diff --git a/data/emoticons/noto-emoticons/png/u1f483_1f3fb.png b/gajim/data/emoticons/noto-emoticons/png/u1f483_1f3fb.png
index 13f593322..13f593322 100644
--- a/data/emoticons/noto-emoticons/png/u1f483_1f3fb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f483_1f3fb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f483_1f3fc.png b/gajim/data/emoticons/noto-emoticons/png/u1f483_1f3fc.png
index b9e8aab9f..b9e8aab9f 100644
--- a/data/emoticons/noto-emoticons/png/u1f483_1f3fc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f483_1f3fc.png
diff --git a/data/emoticons/noto-emoticons/png/u1f483_1f3fd.png b/gajim/data/emoticons/noto-emoticons/png/u1f483_1f3fd.png
index 54e60e921..54e60e921 100644
--- a/data/emoticons/noto-emoticons/png/u1f483_1f3fd.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f483_1f3fd.png
diff --git a/data/emoticons/noto-emoticons/png/u1f483_1f3fe.png b/gajim/data/emoticons/noto-emoticons/png/u1f483_1f3fe.png
index b8daabfad..b8daabfad 100644
--- a/data/emoticons/noto-emoticons/png/u1f483_1f3fe.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f483_1f3fe.png
diff --git a/data/emoticons/noto-emoticons/png/u1f483_1f3ff.png b/gajim/data/emoticons/noto-emoticons/png/u1f483_1f3ff.png
index 1483e6b7e..1483e6b7e 100644
--- a/data/emoticons/noto-emoticons/png/u1f483_1f3ff.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f483_1f3ff.png
diff --git a/data/emoticons/noto-emoticons/png/u1f484.png b/gajim/data/emoticons/noto-emoticons/png/u1f484.png
index 2349c54bc..2349c54bc 100644
--- a/data/emoticons/noto-emoticons/png/u1f484.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f484.png
diff --git a/data/emoticons/noto-emoticons/png/u1f485.png b/gajim/data/emoticons/noto-emoticons/png/u1f485.png
index a76903884..a76903884 100644
--- a/data/emoticons/noto-emoticons/png/u1f485.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f485.png
diff --git a/data/emoticons/noto-emoticons/png/u1f485_1f3fb.png b/gajim/data/emoticons/noto-emoticons/png/u1f485_1f3fb.png
index 24c52c707..24c52c707 100644
--- a/data/emoticons/noto-emoticons/png/u1f485_1f3fb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f485_1f3fb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f485_1f3fc.png b/gajim/data/emoticons/noto-emoticons/png/u1f485_1f3fc.png
index a9847f877..a9847f877 100644
--- a/data/emoticons/noto-emoticons/png/u1f485_1f3fc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f485_1f3fc.png
diff --git a/data/emoticons/noto-emoticons/png/u1f485_1f3fd.png b/gajim/data/emoticons/noto-emoticons/png/u1f485_1f3fd.png
index c27772350..c27772350 100644
--- a/data/emoticons/noto-emoticons/png/u1f485_1f3fd.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f485_1f3fd.png
diff --git a/data/emoticons/noto-emoticons/png/u1f485_1f3fe.png b/gajim/data/emoticons/noto-emoticons/png/u1f485_1f3fe.png
index a4fb96593..a4fb96593 100644
--- a/data/emoticons/noto-emoticons/png/u1f485_1f3fe.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f485_1f3fe.png
diff --git a/data/emoticons/noto-emoticons/png/u1f485_1f3ff.png b/gajim/data/emoticons/noto-emoticons/png/u1f485_1f3ff.png
index 351304f49..351304f49 100644
--- a/data/emoticons/noto-emoticons/png/u1f485_1f3ff.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f485_1f3ff.png
diff --git a/data/emoticons/noto-emoticons/png/u1f486.png b/gajim/data/emoticons/noto-emoticons/png/u1f486.png
index 3cfef7f16..3cfef7f16 100644
--- a/data/emoticons/noto-emoticons/png/u1f486.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f486.png
diff --git a/data/emoticons/noto-emoticons/png/u1f486_1f3fb.png b/gajim/data/emoticons/noto-emoticons/png/u1f486_1f3fb.png
index f283388c0..f283388c0 100644
--- a/data/emoticons/noto-emoticons/png/u1f486_1f3fb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f486_1f3fb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f486_1f3fb_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f486_1f3fb_200d_2640.png
index f283388c0..f283388c0 100644
--- a/data/emoticons/noto-emoticons/png/u1f486_1f3fb_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f486_1f3fb_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f486_1f3fb_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f486_1f3fb_200d_2642.png
index 6e12f14e6..6e12f14e6 100644
--- a/data/emoticons/noto-emoticons/png/u1f486_1f3fb_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f486_1f3fb_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f486_1f3fc.png b/gajim/data/emoticons/noto-emoticons/png/u1f486_1f3fc.png
index cfc889cea..cfc889cea 100644
--- a/data/emoticons/noto-emoticons/png/u1f486_1f3fc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f486_1f3fc.png
diff --git a/data/emoticons/noto-emoticons/png/u1f486_1f3fc_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f486_1f3fc_200d_2640.png
index cfc889cea..cfc889cea 100644
--- a/data/emoticons/noto-emoticons/png/u1f486_1f3fc_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f486_1f3fc_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f486_1f3fc_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f486_1f3fc_200d_2642.png
index fc03d362d..fc03d362d 100644
--- a/data/emoticons/noto-emoticons/png/u1f486_1f3fc_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f486_1f3fc_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f486_1f3fd.png b/gajim/data/emoticons/noto-emoticons/png/u1f486_1f3fd.png
index 6524ecc1b..6524ecc1b 100644
--- a/data/emoticons/noto-emoticons/png/u1f486_1f3fd.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f486_1f3fd.png
diff --git a/data/emoticons/noto-emoticons/png/u1f486_1f3fd_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f486_1f3fd_200d_2640.png
index 6524ecc1b..6524ecc1b 100644
--- a/data/emoticons/noto-emoticons/png/u1f486_1f3fd_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f486_1f3fd_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f486_1f3fd_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f486_1f3fd_200d_2642.png
index 257aa660f..257aa660f 100644
--- a/data/emoticons/noto-emoticons/png/u1f486_1f3fd_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f486_1f3fd_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f486_1f3fe.png b/gajim/data/emoticons/noto-emoticons/png/u1f486_1f3fe.png
index ead4bca02..ead4bca02 100644
--- a/data/emoticons/noto-emoticons/png/u1f486_1f3fe.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f486_1f3fe.png
diff --git a/data/emoticons/noto-emoticons/png/u1f486_1f3fe_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f486_1f3fe_200d_2640.png
index ead4bca02..ead4bca02 100644
--- a/data/emoticons/noto-emoticons/png/u1f486_1f3fe_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f486_1f3fe_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f486_1f3fe_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f486_1f3fe_200d_2642.png
index 68d534ff2..68d534ff2 100644
--- a/data/emoticons/noto-emoticons/png/u1f486_1f3fe_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f486_1f3fe_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f486_1f3ff.png b/gajim/data/emoticons/noto-emoticons/png/u1f486_1f3ff.png
index 273086fe6..273086fe6 100644
--- a/data/emoticons/noto-emoticons/png/u1f486_1f3ff.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f486_1f3ff.png
diff --git a/data/emoticons/noto-emoticons/png/u1f486_1f3ff_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f486_1f3ff_200d_2640.png
index 273086fe6..273086fe6 100644
--- a/data/emoticons/noto-emoticons/png/u1f486_1f3ff_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f486_1f3ff_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f486_1f3ff_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f486_1f3ff_200d_2642.png
index f3b747bcc..f3b747bcc 100644
--- a/data/emoticons/noto-emoticons/png/u1f486_1f3ff_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f486_1f3ff_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f486_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f486_200d_2640.png
index 3cfef7f16..3cfef7f16 100644
--- a/data/emoticons/noto-emoticons/png/u1f486_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f486_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f486_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f486_200d_2642.png
index 58e817b7d..58e817b7d 100644
--- a/data/emoticons/noto-emoticons/png/u1f486_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f486_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f487.png b/gajim/data/emoticons/noto-emoticons/png/u1f487.png
index 83840bc73..83840bc73 100644
--- a/data/emoticons/noto-emoticons/png/u1f487.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f487.png
diff --git a/data/emoticons/noto-emoticons/png/u1f487_1f3fb.png b/gajim/data/emoticons/noto-emoticons/png/u1f487_1f3fb.png
index 16c90fb63..16c90fb63 100644
--- a/data/emoticons/noto-emoticons/png/u1f487_1f3fb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f487_1f3fb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f487_1f3fb_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f487_1f3fb_200d_2640.png
index 16c90fb63..16c90fb63 100644
--- a/data/emoticons/noto-emoticons/png/u1f487_1f3fb_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f487_1f3fb_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f487_1f3fb_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f487_1f3fb_200d_2642.png
index 25a132077..25a132077 100644
--- a/data/emoticons/noto-emoticons/png/u1f487_1f3fb_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f487_1f3fb_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f487_1f3fc.png b/gajim/data/emoticons/noto-emoticons/png/u1f487_1f3fc.png
index 158d18366..158d18366 100644
--- a/data/emoticons/noto-emoticons/png/u1f487_1f3fc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f487_1f3fc.png
diff --git a/data/emoticons/noto-emoticons/png/u1f487_1f3fc_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f487_1f3fc_200d_2640.png
index 158d18366..158d18366 100644
--- a/data/emoticons/noto-emoticons/png/u1f487_1f3fc_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f487_1f3fc_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f487_1f3fc_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f487_1f3fc_200d_2642.png
index d5ad55817..d5ad55817 100644
--- a/data/emoticons/noto-emoticons/png/u1f487_1f3fc_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f487_1f3fc_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f487_1f3fd.png b/gajim/data/emoticons/noto-emoticons/png/u1f487_1f3fd.png
index 9183df20b..9183df20b 100644
--- a/data/emoticons/noto-emoticons/png/u1f487_1f3fd.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f487_1f3fd.png
diff --git a/data/emoticons/noto-emoticons/png/u1f487_1f3fd_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f487_1f3fd_200d_2640.png
index 9183df20b..9183df20b 100644
--- a/data/emoticons/noto-emoticons/png/u1f487_1f3fd_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f487_1f3fd_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f487_1f3fd_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f487_1f3fd_200d_2642.png
index 6aaa6d120..6aaa6d120 100644
--- a/data/emoticons/noto-emoticons/png/u1f487_1f3fd_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f487_1f3fd_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f487_1f3fe.png b/gajim/data/emoticons/noto-emoticons/png/u1f487_1f3fe.png
index 419f5f447..419f5f447 100644
--- a/data/emoticons/noto-emoticons/png/u1f487_1f3fe.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f487_1f3fe.png
diff --git a/data/emoticons/noto-emoticons/png/u1f487_1f3fe_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f487_1f3fe_200d_2640.png
index 419f5f447..419f5f447 100644
--- a/data/emoticons/noto-emoticons/png/u1f487_1f3fe_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f487_1f3fe_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f487_1f3fe_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f487_1f3fe_200d_2642.png
index 27871b370..27871b370 100644
--- a/data/emoticons/noto-emoticons/png/u1f487_1f3fe_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f487_1f3fe_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f487_1f3ff.png b/gajim/data/emoticons/noto-emoticons/png/u1f487_1f3ff.png
index 3614cf57a..3614cf57a 100644
--- a/data/emoticons/noto-emoticons/png/u1f487_1f3ff.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f487_1f3ff.png
diff --git a/data/emoticons/noto-emoticons/png/u1f487_1f3ff_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f487_1f3ff_200d_2640.png
index 3614cf57a..3614cf57a 100644
--- a/data/emoticons/noto-emoticons/png/u1f487_1f3ff_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f487_1f3ff_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f487_1f3ff_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f487_1f3ff_200d_2642.png
index ce9cf1bbc..ce9cf1bbc 100644
--- a/data/emoticons/noto-emoticons/png/u1f487_1f3ff_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f487_1f3ff_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f487_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f487_200d_2640.png
index 83840bc73..83840bc73 100644
--- a/data/emoticons/noto-emoticons/png/u1f487_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f487_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f487_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f487_200d_2642.png
index 5b86e4dfb..5b86e4dfb 100644
--- a/data/emoticons/noto-emoticons/png/u1f487_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f487_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f488.png b/gajim/data/emoticons/noto-emoticons/png/u1f488.png
index 3e4eeda73..3e4eeda73 100644
--- a/data/emoticons/noto-emoticons/png/u1f488.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f488.png
diff --git a/data/emoticons/noto-emoticons/png/u1f489.png b/gajim/data/emoticons/noto-emoticons/png/u1f489.png
index 4338a85a6..4338a85a6 100644
--- a/data/emoticons/noto-emoticons/png/u1f489.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f489.png
diff --git a/data/emoticons/noto-emoticons/png/u1f48a.png b/gajim/data/emoticons/noto-emoticons/png/u1f48a.png
index 238fafbdd..238fafbdd 100644
--- a/data/emoticons/noto-emoticons/png/u1f48a.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f48a.png
diff --git a/data/emoticons/noto-emoticons/png/u1f48b.png b/gajim/data/emoticons/noto-emoticons/png/u1f48b.png
index a56c09cfe..a56c09cfe 100644
--- a/data/emoticons/noto-emoticons/png/u1f48b.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f48b.png
diff --git a/data/emoticons/noto-emoticons/png/u1f48c.png b/gajim/data/emoticons/noto-emoticons/png/u1f48c.png
index 00906b1d8..00906b1d8 100644
--- a/data/emoticons/noto-emoticons/png/u1f48c.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f48c.png
diff --git a/data/emoticons/noto-emoticons/png/u1f48d.png b/gajim/data/emoticons/noto-emoticons/png/u1f48d.png
index b30f30797..b30f30797 100644
--- a/data/emoticons/noto-emoticons/png/u1f48d.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f48d.png
diff --git a/data/emoticons/noto-emoticons/png/u1f48e.png b/gajim/data/emoticons/noto-emoticons/png/u1f48e.png
index 72054e3aa..72054e3aa 100644
--- a/data/emoticons/noto-emoticons/png/u1f48e.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f48e.png
diff --git a/data/emoticons/noto-emoticons/png/u1f490.png b/gajim/data/emoticons/noto-emoticons/png/u1f490.png
index 247f08aca..247f08aca 100644
--- a/data/emoticons/noto-emoticons/png/u1f490.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f490.png
diff --git a/data/emoticons/noto-emoticons/png/u1f492.png b/gajim/data/emoticons/noto-emoticons/png/u1f492.png
index 5cf0a3d76..5cf0a3d76 100644
--- a/data/emoticons/noto-emoticons/png/u1f492.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f492.png
diff --git a/data/emoticons/noto-emoticons/png/u1f493.png b/gajim/data/emoticons/noto-emoticons/png/u1f493.png
index 8eb444a7f..8eb444a7f 100644
--- a/data/emoticons/noto-emoticons/png/u1f493.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f493.png
diff --git a/data/emoticons/noto-emoticons/png/u1f494.png b/gajim/data/emoticons/noto-emoticons/png/u1f494.png
index b5fd6a86e..b5fd6a86e 100644
--- a/data/emoticons/noto-emoticons/png/u1f494.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f494.png
diff --git a/data/emoticons/noto-emoticons/png/u1f495.png b/gajim/data/emoticons/noto-emoticons/png/u1f495.png
index ca8a5dd58..ca8a5dd58 100644
--- a/data/emoticons/noto-emoticons/png/u1f495.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f495.png
diff --git a/data/emoticons/noto-emoticons/png/u1f496.png b/gajim/data/emoticons/noto-emoticons/png/u1f496.png
index 5e1ded5dc..5e1ded5dc 100644
--- a/data/emoticons/noto-emoticons/png/u1f496.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f496.png
diff --git a/data/emoticons/noto-emoticons/png/u1f497.png b/gajim/data/emoticons/noto-emoticons/png/u1f497.png
index b07227e9a..b07227e9a 100644
--- a/data/emoticons/noto-emoticons/png/u1f497.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f497.png
diff --git a/data/emoticons/noto-emoticons/png/u1f498.png b/gajim/data/emoticons/noto-emoticons/png/u1f498.png
index 91c388c96..91c388c96 100644
--- a/data/emoticons/noto-emoticons/png/u1f498.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f498.png
diff --git a/data/emoticons/noto-emoticons/png/u1f499.png b/gajim/data/emoticons/noto-emoticons/png/u1f499.png
index e447d73e9..e447d73e9 100644
--- a/data/emoticons/noto-emoticons/png/u1f499.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f499.png
diff --git a/data/emoticons/noto-emoticons/png/u1f49a.png b/gajim/data/emoticons/noto-emoticons/png/u1f49a.png
index 2cae402f8..2cae402f8 100644
--- a/data/emoticons/noto-emoticons/png/u1f49a.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f49a.png
diff --git a/data/emoticons/noto-emoticons/png/u1f49b.png b/gajim/data/emoticons/noto-emoticons/png/u1f49b.png
index ea7a3a0ad..ea7a3a0ad 100644
--- a/data/emoticons/noto-emoticons/png/u1f49b.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f49b.png
diff --git a/data/emoticons/noto-emoticons/png/u1f49c.png b/gajim/data/emoticons/noto-emoticons/png/u1f49c.png
index 76fb3bc46..76fb3bc46 100644
--- a/data/emoticons/noto-emoticons/png/u1f49c.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f49c.png
diff --git a/data/emoticons/noto-emoticons/png/u1f49d.png b/gajim/data/emoticons/noto-emoticons/png/u1f49d.png
index eb4f4f6af..eb4f4f6af 100644
--- a/data/emoticons/noto-emoticons/png/u1f49d.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f49d.png
diff --git a/data/emoticons/noto-emoticons/png/u1f49e.png b/gajim/data/emoticons/noto-emoticons/png/u1f49e.png
index ef455a3b0..ef455a3b0 100644
--- a/data/emoticons/noto-emoticons/png/u1f49e.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f49e.png
diff --git a/data/emoticons/noto-emoticons/png/u1f49f.png b/gajim/data/emoticons/noto-emoticons/png/u1f49f.png
index 522ef12a5..522ef12a5 100644
--- a/data/emoticons/noto-emoticons/png/u1f49f.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f49f.png
diff --git a/data/emoticons/noto-emoticons/png/u1f4a0.png b/gajim/data/emoticons/noto-emoticons/png/u1f4a0.png
index d70d559a3..d70d559a3 100644
--- a/data/emoticons/noto-emoticons/png/u1f4a0.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f4a0.png
diff --git a/data/emoticons/noto-emoticons/png/u1f4a1.png b/gajim/data/emoticons/noto-emoticons/png/u1f4a1.png
index 892329708..892329708 100644
--- a/data/emoticons/noto-emoticons/png/u1f4a1.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f4a1.png
diff --git a/data/emoticons/noto-emoticons/png/u1f4a2.png b/gajim/data/emoticons/noto-emoticons/png/u1f4a2.png
index b4414f357..b4414f357 100644
--- a/data/emoticons/noto-emoticons/png/u1f4a2.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f4a2.png
diff --git a/data/emoticons/noto-emoticons/png/u1f4a3.png b/gajim/data/emoticons/noto-emoticons/png/u1f4a3.png
index 427bbcc34..427bbcc34 100644
--- a/data/emoticons/noto-emoticons/png/u1f4a3.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f4a3.png
diff --git a/data/emoticons/noto-emoticons/png/u1f4a4.png b/gajim/data/emoticons/noto-emoticons/png/u1f4a4.png
index f870a52f3..f870a52f3 100644
--- a/data/emoticons/noto-emoticons/png/u1f4a4.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f4a4.png
diff --git a/data/emoticons/noto-emoticons/png/u1f4a5.png b/gajim/data/emoticons/noto-emoticons/png/u1f4a5.png
index b277b2f1b..b277b2f1b 100644
--- a/data/emoticons/noto-emoticons/png/u1f4a5.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f4a5.png
diff --git a/data/emoticons/noto-emoticons/png/u1f4a6.png b/gajim/data/emoticons/noto-emoticons/png/u1f4a6.png
index ec676a452..ec676a452 100644
--- a/data/emoticons/noto-emoticons/png/u1f4a6.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f4a6.png
diff --git a/data/emoticons/noto-emoticons/png/u1f4a7.png b/gajim/data/emoticons/noto-emoticons/png/u1f4a7.png
index 4387342c4..4387342c4 100644
--- a/data/emoticons/noto-emoticons/png/u1f4a7.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f4a7.png
diff --git a/data/emoticons/noto-emoticons/png/u1f4a8.png b/gajim/data/emoticons/noto-emoticons/png/u1f4a8.png
index e7aca9bfb..e7aca9bfb 100644
--- a/data/emoticons/noto-emoticons/png/u1f4a8.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f4a8.png
diff --git a/data/emoticons/noto-emoticons/png/u1f4a9.png b/gajim/data/emoticons/noto-emoticons/png/u1f4a9.png
index f5dec2531..f5dec2531 100644
--- a/data/emoticons/noto-emoticons/png/u1f4a9.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f4a9.png
diff --git a/data/emoticons/noto-emoticons/png/u1f4aa.png b/gajim/data/emoticons/noto-emoticons/png/u1f4aa.png
index 8bb9f57d1..8bb9f57d1 100644
--- a/data/emoticons/noto-emoticons/png/u1f4aa.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f4aa.png
diff --git a/data/emoticons/noto-emoticons/png/u1f4aa_1f3fb.png b/gajim/data/emoticons/noto-emoticons/png/u1f4aa_1f3fb.png
index 84d59ce8e..84d59ce8e 100644
--- a/data/emoticons/noto-emoticons/png/u1f4aa_1f3fb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f4aa_1f3fb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f4aa_1f3fc.png b/gajim/data/emoticons/noto-emoticons/png/u1f4aa_1f3fc.png
index 1ee0349a6..1ee0349a6 100644
--- a/data/emoticons/noto-emoticons/png/u1f4aa_1f3fc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f4aa_1f3fc.png
diff --git a/data/emoticons/noto-emoticons/png/u1f4aa_1f3fd.png b/gajim/data/emoticons/noto-emoticons/png/u1f4aa_1f3fd.png
index f3fe461b0..f3fe461b0 100644
--- a/data/emoticons/noto-emoticons/png/u1f4aa_1f3fd.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f4aa_1f3fd.png
diff --git a/data/emoticons/noto-emoticons/png/u1f4aa_1f3fe.png b/gajim/data/emoticons/noto-emoticons/png/u1f4aa_1f3fe.png
index 9857ebc79..9857ebc79 100644
--- a/data/emoticons/noto-emoticons/png/u1f4aa_1f3fe.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f4aa_1f3fe.png
diff --git a/data/emoticons/noto-emoticons/png/u1f4aa_1f3ff.png b/gajim/data/emoticons/noto-emoticons/png/u1f4aa_1f3ff.png
index 871cf9626..871cf9626 100644
--- a/data/emoticons/noto-emoticons/png/u1f4aa_1f3ff.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f4aa_1f3ff.png
diff --git a/data/emoticons/noto-emoticons/png/u1f4ab.png b/gajim/data/emoticons/noto-emoticons/png/u1f4ab.png
index fee9c64a0..fee9c64a0 100644
--- a/data/emoticons/noto-emoticons/png/u1f4ab.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f4ab.png
diff --git a/data/emoticons/noto-emoticons/png/u1f4ac.png b/gajim/data/emoticons/noto-emoticons/png/u1f4ac.png
index 7ba7be0f6..7ba7be0f6 100644
--- a/data/emoticons/noto-emoticons/png/u1f4ac.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f4ac.png
diff --git a/data/emoticons/noto-emoticons/png/u1f4ad.png b/gajim/data/emoticons/noto-emoticons/png/u1f4ad.png
index edf60baaf..edf60baaf 100644
--- a/data/emoticons/noto-emoticons/png/u1f4ad.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f4ad.png
diff --git a/data/emoticons/noto-emoticons/png/u1f4ae.png b/gajim/data/emoticons/noto-emoticons/png/u1f4ae.png
index 513b41566..513b41566 100644
--- a/data/emoticons/noto-emoticons/png/u1f4ae.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f4ae.png
diff --git a/data/emoticons/noto-emoticons/png/u1f4af.png b/gajim/data/emoticons/noto-emoticons/png/u1f4af.png
index 73af4cbc7..73af4cbc7 100644
--- a/data/emoticons/noto-emoticons/png/u1f4af.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f4af.png
diff --git a/data/emoticons/noto-emoticons/png/u1f4b0.png b/gajim/data/emoticons/noto-emoticons/png/u1f4b0.png
index 1784e244a..1784e244a 100644
--- a/data/emoticons/noto-emoticons/png/u1f4b0.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f4b0.png
diff --git a/data/emoticons/noto-emoticons/png/u1f4b1.png b/gajim/data/emoticons/noto-emoticons/png/u1f4b1.png
index 2ff4b8bac..2ff4b8bac 100644
--- a/data/emoticons/noto-emoticons/png/u1f4b1.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f4b1.png
diff --git a/data/emoticons/noto-emoticons/png/u1f4b2.png b/gajim/data/emoticons/noto-emoticons/png/u1f4b2.png
index eed4af61d..eed4af61d 100644
--- a/data/emoticons/noto-emoticons/png/u1f4b2.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f4b2.png
diff --git a/data/emoticons/noto-emoticons/png/u1f4b3.png b/gajim/data/emoticons/noto-emoticons/png/u1f4b3.png
index 1b00bbe81..1b00bbe81 100644
--- a/data/emoticons/noto-emoticons/png/u1f4b3.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f4b3.png
diff --git a/data/emoticons/noto-emoticons/png/u1f4b4.png b/gajim/data/emoticons/noto-emoticons/png/u1f4b4.png
index 5cd065e2c..5cd065e2c 100644
--- a/data/emoticons/noto-emoticons/png/u1f4b4.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f4b4.png
diff --git a/data/emoticons/noto-emoticons/png/u1f4b5.png b/gajim/data/emoticons/noto-emoticons/png/u1f4b5.png
index 5e1bcdd59..5e1bcdd59 100644
--- a/data/emoticons/noto-emoticons/png/u1f4b5.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f4b5.png
diff --git a/data/emoticons/noto-emoticons/png/u1f4b6.png b/gajim/data/emoticons/noto-emoticons/png/u1f4b6.png
index 8727282ad..8727282ad 100644
--- a/data/emoticons/noto-emoticons/png/u1f4b6.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f4b6.png
diff --git a/data/emoticons/noto-emoticons/png/u1f4b7.png b/gajim/data/emoticons/noto-emoticons/png/u1f4b7.png
index 836f29385..836f29385 100644
--- a/data/emoticons/noto-emoticons/png/u1f4b7.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f4b7.png
diff --git a/data/emoticons/noto-emoticons/png/u1f4b8.png b/gajim/data/emoticons/noto-emoticons/png/u1f4b8.png
index 5c876bd43..5c876bd43 100644
--- a/data/emoticons/noto-emoticons/png/u1f4b8.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f4b8.png
diff --git a/data/emoticons/noto-emoticons/png/u1f4b9.png b/gajim/data/emoticons/noto-emoticons/png/u1f4b9.png
index 34aeec3ba..34aeec3ba 100644
--- a/data/emoticons/noto-emoticons/png/u1f4b9.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f4b9.png
diff --git a/data/emoticons/noto-emoticons/png/u1f4ba.png b/gajim/data/emoticons/noto-emoticons/png/u1f4ba.png
index 8b0d2604c..8b0d2604c 100644
--- a/data/emoticons/noto-emoticons/png/u1f4ba.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f4ba.png
diff --git a/data/emoticons/noto-emoticons/png/u1f4bb.png b/gajim/data/emoticons/noto-emoticons/png/u1f4bb.png
index 3ee862a78..3ee862a78 100644
--- a/data/emoticons/noto-emoticons/png/u1f4bb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f4bb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f4bc.png b/gajim/data/emoticons/noto-emoticons/png/u1f4bc.png
index beb82eb3a..beb82eb3a 100644
--- a/data/emoticons/noto-emoticons/png/u1f4bc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f4bc.png
diff --git a/data/emoticons/noto-emoticons/png/u1f4bd.png b/gajim/data/emoticons/noto-emoticons/png/u1f4bd.png
index 8c628607d..8c628607d 100644
--- a/data/emoticons/noto-emoticons/png/u1f4bd.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f4bd.png
diff --git a/data/emoticons/noto-emoticons/png/u1f4be.png b/gajim/data/emoticons/noto-emoticons/png/u1f4be.png
index ccf6a4c54..ccf6a4c54 100644
--- a/data/emoticons/noto-emoticons/png/u1f4be.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f4be.png
diff --git a/data/emoticons/noto-emoticons/png/u1f4bf.png b/gajim/data/emoticons/noto-emoticons/png/u1f4bf.png
index b3bf9215d..b3bf9215d 100644
--- a/data/emoticons/noto-emoticons/png/u1f4bf.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f4bf.png
diff --git a/data/emoticons/noto-emoticons/png/u1f4c0.png b/gajim/data/emoticons/noto-emoticons/png/u1f4c0.png
index a9e0b3a2b..a9e0b3a2b 100644
--- a/data/emoticons/noto-emoticons/png/u1f4c0.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f4c0.png
diff --git a/data/emoticons/noto-emoticons/png/u1f4c1.png b/gajim/data/emoticons/noto-emoticons/png/u1f4c1.png
index 0a7cbe5d0..0a7cbe5d0 100644
--- a/data/emoticons/noto-emoticons/png/u1f4c1.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f4c1.png
diff --git a/data/emoticons/noto-emoticons/png/u1f4c2.png b/gajim/data/emoticons/noto-emoticons/png/u1f4c2.png
index 54b16f798..54b16f798 100644
--- a/data/emoticons/noto-emoticons/png/u1f4c2.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f4c2.png
diff --git a/data/emoticons/noto-emoticons/png/u1f4c3.png b/gajim/data/emoticons/noto-emoticons/png/u1f4c3.png
index f62f1181a..f62f1181a 100644
--- a/data/emoticons/noto-emoticons/png/u1f4c3.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f4c3.png
diff --git a/data/emoticons/noto-emoticons/png/u1f4c4.png b/gajim/data/emoticons/noto-emoticons/png/u1f4c4.png
index 45658a232..45658a232 100644
--- a/data/emoticons/noto-emoticons/png/u1f4c4.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f4c4.png
diff --git a/data/emoticons/noto-emoticons/png/u1f4c5.png b/gajim/data/emoticons/noto-emoticons/png/u1f4c5.png
index 9f3c243f9..9f3c243f9 100644
--- a/data/emoticons/noto-emoticons/png/u1f4c5.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f4c5.png
diff --git a/data/emoticons/noto-emoticons/png/u1f4c6.png b/gajim/data/emoticons/noto-emoticons/png/u1f4c6.png
index 4287896c4..4287896c4 100644
--- a/data/emoticons/noto-emoticons/png/u1f4c6.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f4c6.png
diff --git a/data/emoticons/noto-emoticons/png/u1f4c7.png b/gajim/data/emoticons/noto-emoticons/png/u1f4c7.png
index 43b28dc65..43b28dc65 100644
--- a/data/emoticons/noto-emoticons/png/u1f4c7.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f4c7.png
diff --git a/data/emoticons/noto-emoticons/png/u1f4c8.png b/gajim/data/emoticons/noto-emoticons/png/u1f4c8.png
index f9bf5d601..f9bf5d601 100644
--- a/data/emoticons/noto-emoticons/png/u1f4c8.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f4c8.png
diff --git a/data/emoticons/noto-emoticons/png/u1f4c9.png b/gajim/data/emoticons/noto-emoticons/png/u1f4c9.png
index 553391838..553391838 100644
--- a/data/emoticons/noto-emoticons/png/u1f4c9.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f4c9.png
diff --git a/data/emoticons/noto-emoticons/png/u1f4ca.png b/gajim/data/emoticons/noto-emoticons/png/u1f4ca.png
index d58af5ee5..d58af5ee5 100644
--- a/data/emoticons/noto-emoticons/png/u1f4ca.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f4ca.png
diff --git a/data/emoticons/noto-emoticons/png/u1f4cb.png b/gajim/data/emoticons/noto-emoticons/png/u1f4cb.png
index abd412a72..abd412a72 100644
--- a/data/emoticons/noto-emoticons/png/u1f4cb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f4cb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f4cc.png b/gajim/data/emoticons/noto-emoticons/png/u1f4cc.png
index c7fce421f..c7fce421f 100644
--- a/data/emoticons/noto-emoticons/png/u1f4cc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f4cc.png
diff --git a/data/emoticons/noto-emoticons/png/u1f4cd.png b/gajim/data/emoticons/noto-emoticons/png/u1f4cd.png
index 9911a5327..9911a5327 100644
--- a/data/emoticons/noto-emoticons/png/u1f4cd.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f4cd.png
diff --git a/data/emoticons/noto-emoticons/png/u1f4ce.png b/gajim/data/emoticons/noto-emoticons/png/u1f4ce.png
index fb7b37efb..fb7b37efb 100644
--- a/data/emoticons/noto-emoticons/png/u1f4ce.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f4ce.png
diff --git a/data/emoticons/noto-emoticons/png/u1f4cf.png b/gajim/data/emoticons/noto-emoticons/png/u1f4cf.png
index 33e1372cf..33e1372cf 100644
--- a/data/emoticons/noto-emoticons/png/u1f4cf.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f4cf.png
diff --git a/data/emoticons/noto-emoticons/png/u1f4d0.png b/gajim/data/emoticons/noto-emoticons/png/u1f4d0.png
index 384dc805d..384dc805d 100644
--- a/data/emoticons/noto-emoticons/png/u1f4d0.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f4d0.png
diff --git a/data/emoticons/noto-emoticons/png/u1f4d1.png b/gajim/data/emoticons/noto-emoticons/png/u1f4d1.png
index 9229c2bd1..9229c2bd1 100644
--- a/data/emoticons/noto-emoticons/png/u1f4d1.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f4d1.png
diff --git a/data/emoticons/noto-emoticons/png/u1f4d2.png b/gajim/data/emoticons/noto-emoticons/png/u1f4d2.png
index 3f6948434..3f6948434 100644
--- a/data/emoticons/noto-emoticons/png/u1f4d2.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f4d2.png
diff --git a/data/emoticons/noto-emoticons/png/u1f4d3.png b/gajim/data/emoticons/noto-emoticons/png/u1f4d3.png
index 89aebdbbf..89aebdbbf 100644
--- a/data/emoticons/noto-emoticons/png/u1f4d3.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f4d3.png
diff --git a/data/emoticons/noto-emoticons/png/u1f4d4.png b/gajim/data/emoticons/noto-emoticons/png/u1f4d4.png
index 2b7797011..2b7797011 100644
--- a/data/emoticons/noto-emoticons/png/u1f4d4.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f4d4.png
diff --git a/data/emoticons/noto-emoticons/png/u1f4d5.png b/gajim/data/emoticons/noto-emoticons/png/u1f4d5.png
index 7d021ceab..7d021ceab 100644
--- a/data/emoticons/noto-emoticons/png/u1f4d5.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f4d5.png
diff --git a/data/emoticons/noto-emoticons/png/u1f4d6.png b/gajim/data/emoticons/noto-emoticons/png/u1f4d6.png
index 2c8000e9c..2c8000e9c 100644
--- a/data/emoticons/noto-emoticons/png/u1f4d6.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f4d6.png
diff --git a/data/emoticons/noto-emoticons/png/u1f4d7.png b/gajim/data/emoticons/noto-emoticons/png/u1f4d7.png
index 8fd60b48c..8fd60b48c 100644
--- a/data/emoticons/noto-emoticons/png/u1f4d7.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f4d7.png
diff --git a/data/emoticons/noto-emoticons/png/u1f4d8.png b/gajim/data/emoticons/noto-emoticons/png/u1f4d8.png
index 4648664d2..4648664d2 100644
--- a/data/emoticons/noto-emoticons/png/u1f4d8.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f4d8.png
diff --git a/data/emoticons/noto-emoticons/png/u1f4d9.png b/gajim/data/emoticons/noto-emoticons/png/u1f4d9.png
index 09692c9cb..09692c9cb 100644
--- a/data/emoticons/noto-emoticons/png/u1f4d9.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f4d9.png
diff --git a/data/emoticons/noto-emoticons/png/u1f4da.png b/gajim/data/emoticons/noto-emoticons/png/u1f4da.png
index 53d50fbbf..53d50fbbf 100644
--- a/data/emoticons/noto-emoticons/png/u1f4da.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f4da.png
diff --git a/data/emoticons/noto-emoticons/png/u1f4db.png b/gajim/data/emoticons/noto-emoticons/png/u1f4db.png
index 1b7475454..1b7475454 100644
--- a/data/emoticons/noto-emoticons/png/u1f4db.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f4db.png
diff --git a/data/emoticons/noto-emoticons/png/u1f4dc.png b/gajim/data/emoticons/noto-emoticons/png/u1f4dc.png
index 455dde88a..455dde88a 100644
--- a/data/emoticons/noto-emoticons/png/u1f4dc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f4dc.png
diff --git a/data/emoticons/noto-emoticons/png/u1f4dd.png b/gajim/data/emoticons/noto-emoticons/png/u1f4dd.png
index 79f3fb075..79f3fb075 100644
--- a/data/emoticons/noto-emoticons/png/u1f4dd.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f4dd.png
diff --git a/data/emoticons/noto-emoticons/png/u1f4de.png b/gajim/data/emoticons/noto-emoticons/png/u1f4de.png
index 714002805..714002805 100644
--- a/data/emoticons/noto-emoticons/png/u1f4de.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f4de.png
diff --git a/data/emoticons/noto-emoticons/png/u1f4df.png b/gajim/data/emoticons/noto-emoticons/png/u1f4df.png
index c580759f2..c580759f2 100644
--- a/data/emoticons/noto-emoticons/png/u1f4df.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f4df.png
diff --git a/data/emoticons/noto-emoticons/png/u1f4e0.png b/gajim/data/emoticons/noto-emoticons/png/u1f4e0.png
index 389429151..389429151 100644
--- a/data/emoticons/noto-emoticons/png/u1f4e0.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f4e0.png
diff --git a/data/emoticons/noto-emoticons/png/u1f4e1.png b/gajim/data/emoticons/noto-emoticons/png/u1f4e1.png
index a93715dd1..a93715dd1 100644
--- a/data/emoticons/noto-emoticons/png/u1f4e1.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f4e1.png
diff --git a/data/emoticons/noto-emoticons/png/u1f4e2.png b/gajim/data/emoticons/noto-emoticons/png/u1f4e2.png
index 4aec72a4a..4aec72a4a 100644
--- a/data/emoticons/noto-emoticons/png/u1f4e2.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f4e2.png
diff --git a/data/emoticons/noto-emoticons/png/u1f4e3.png b/gajim/data/emoticons/noto-emoticons/png/u1f4e3.png
index 6cca9893e..6cca9893e 100644
--- a/data/emoticons/noto-emoticons/png/u1f4e3.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f4e3.png
diff --git a/data/emoticons/noto-emoticons/png/u1f4e4.png b/gajim/data/emoticons/noto-emoticons/png/u1f4e4.png
index 57a0f8295..57a0f8295 100644
--- a/data/emoticons/noto-emoticons/png/u1f4e4.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f4e4.png
diff --git a/data/emoticons/noto-emoticons/png/u1f4e5.png b/gajim/data/emoticons/noto-emoticons/png/u1f4e5.png
index 2d3521c64..2d3521c64 100644
--- a/data/emoticons/noto-emoticons/png/u1f4e5.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f4e5.png
diff --git a/data/emoticons/noto-emoticons/png/u1f4e6.png b/gajim/data/emoticons/noto-emoticons/png/u1f4e6.png
index dc4a5b905..dc4a5b905 100644
--- a/data/emoticons/noto-emoticons/png/u1f4e6.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f4e6.png
diff --git a/data/emoticons/noto-emoticons/png/u1f4e7.png b/gajim/data/emoticons/noto-emoticons/png/u1f4e7.png
index 2d5d43f37..2d5d43f37 100644
--- a/data/emoticons/noto-emoticons/png/u1f4e7.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f4e7.png
diff --git a/data/emoticons/noto-emoticons/png/u1f4e8.png b/gajim/data/emoticons/noto-emoticons/png/u1f4e8.png
index 0456c30fa..0456c30fa 100644
--- a/data/emoticons/noto-emoticons/png/u1f4e8.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f4e8.png
diff --git a/data/emoticons/noto-emoticons/png/u1f4e9.png b/gajim/data/emoticons/noto-emoticons/png/u1f4e9.png
index 621fb95bd..621fb95bd 100644
--- a/data/emoticons/noto-emoticons/png/u1f4e9.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f4e9.png
diff --git a/data/emoticons/noto-emoticons/png/u1f4ea.png b/gajim/data/emoticons/noto-emoticons/png/u1f4ea.png
index e9a5f92dc..e9a5f92dc 100644
--- a/data/emoticons/noto-emoticons/png/u1f4ea.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f4ea.png
diff --git a/data/emoticons/noto-emoticons/png/u1f4eb.png b/gajim/data/emoticons/noto-emoticons/png/u1f4eb.png
index 497a73b88..497a73b88 100644
--- a/data/emoticons/noto-emoticons/png/u1f4eb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f4eb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f4ec.png b/gajim/data/emoticons/noto-emoticons/png/u1f4ec.png
index 047cf3935..047cf3935 100644
--- a/data/emoticons/noto-emoticons/png/u1f4ec.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f4ec.png
diff --git a/data/emoticons/noto-emoticons/png/u1f4ed.png b/gajim/data/emoticons/noto-emoticons/png/u1f4ed.png
index 39a2b15c9..39a2b15c9 100644
--- a/data/emoticons/noto-emoticons/png/u1f4ed.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f4ed.png
diff --git a/data/emoticons/noto-emoticons/png/u1f4ee.png b/gajim/data/emoticons/noto-emoticons/png/u1f4ee.png
index f56f46bc0..f56f46bc0 100644
--- a/data/emoticons/noto-emoticons/png/u1f4ee.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f4ee.png
diff --git a/data/emoticons/noto-emoticons/png/u1f4ef.png b/gajim/data/emoticons/noto-emoticons/png/u1f4ef.png
index 0f15544eb..0f15544eb 100644
--- a/data/emoticons/noto-emoticons/png/u1f4ef.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f4ef.png
diff --git a/data/emoticons/noto-emoticons/png/u1f4f0.png b/gajim/data/emoticons/noto-emoticons/png/u1f4f0.png
index 9214cf6e7..9214cf6e7 100644
--- a/data/emoticons/noto-emoticons/png/u1f4f0.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f4f0.png
diff --git a/data/emoticons/noto-emoticons/png/u1f4f1.png b/gajim/data/emoticons/noto-emoticons/png/u1f4f1.png
index e91cb2af5..e91cb2af5 100644
--- a/data/emoticons/noto-emoticons/png/u1f4f1.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f4f1.png
diff --git a/data/emoticons/noto-emoticons/png/u1f4f2.png b/gajim/data/emoticons/noto-emoticons/png/u1f4f2.png
index 6c9db2ba7..6c9db2ba7 100644
--- a/data/emoticons/noto-emoticons/png/u1f4f2.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f4f2.png
diff --git a/data/emoticons/noto-emoticons/png/u1f4f3.png b/gajim/data/emoticons/noto-emoticons/png/u1f4f3.png
index 6f1af495a..6f1af495a 100644
--- a/data/emoticons/noto-emoticons/png/u1f4f3.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f4f3.png
diff --git a/data/emoticons/noto-emoticons/png/u1f4f4.png b/gajim/data/emoticons/noto-emoticons/png/u1f4f4.png
index c9e7f9feb..c9e7f9feb 100644
--- a/data/emoticons/noto-emoticons/png/u1f4f4.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f4f4.png
diff --git a/data/emoticons/noto-emoticons/png/u1f4f5.png b/gajim/data/emoticons/noto-emoticons/png/u1f4f5.png
index 9475086c8..9475086c8 100644
--- a/data/emoticons/noto-emoticons/png/u1f4f5.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f4f5.png
diff --git a/data/emoticons/noto-emoticons/png/u1f4f6.png b/gajim/data/emoticons/noto-emoticons/png/u1f4f6.png
index e47e4252b..e47e4252b 100644
--- a/data/emoticons/noto-emoticons/png/u1f4f6.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f4f6.png
diff --git a/data/emoticons/noto-emoticons/png/u1f4f7.png b/gajim/data/emoticons/noto-emoticons/png/u1f4f7.png
index d88a9c8c5..d88a9c8c5 100644
--- a/data/emoticons/noto-emoticons/png/u1f4f7.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f4f7.png
diff --git a/data/emoticons/noto-emoticons/png/u1f4f8.png b/gajim/data/emoticons/noto-emoticons/png/u1f4f8.png
index 3a2585b31..3a2585b31 100644
--- a/data/emoticons/noto-emoticons/png/u1f4f8.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f4f8.png
diff --git a/data/emoticons/noto-emoticons/png/u1f4f9.png b/gajim/data/emoticons/noto-emoticons/png/u1f4f9.png
index 34b8422b7..34b8422b7 100644
--- a/data/emoticons/noto-emoticons/png/u1f4f9.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f4f9.png
diff --git a/data/emoticons/noto-emoticons/png/u1f4fa.png b/gajim/data/emoticons/noto-emoticons/png/u1f4fa.png
index 599754909..599754909 100644
--- a/data/emoticons/noto-emoticons/png/u1f4fa.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f4fa.png
diff --git a/data/emoticons/noto-emoticons/png/u1f4fb.png b/gajim/data/emoticons/noto-emoticons/png/u1f4fb.png
index 207f9a8e8..207f9a8e8 100644
--- a/data/emoticons/noto-emoticons/png/u1f4fb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f4fb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f4fc.png b/gajim/data/emoticons/noto-emoticons/png/u1f4fc.png
index df23e7848..df23e7848 100644
--- a/data/emoticons/noto-emoticons/png/u1f4fc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f4fc.png
diff --git a/data/emoticons/noto-emoticons/png/u1f4fd.png b/gajim/data/emoticons/noto-emoticons/png/u1f4fd.png
index 3f44d48c4..3f44d48c4 100644
--- a/data/emoticons/noto-emoticons/png/u1f4fd.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f4fd.png
diff --git a/data/emoticons/noto-emoticons/png/u1f4ff.png b/gajim/data/emoticons/noto-emoticons/png/u1f4ff.png
index 3ee69f7ed..3ee69f7ed 100644
--- a/data/emoticons/noto-emoticons/png/u1f4ff.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f4ff.png
diff --git a/data/emoticons/noto-emoticons/png/u1f500.png b/gajim/data/emoticons/noto-emoticons/png/u1f500.png
index a67ab898d..a67ab898d 100644
--- a/data/emoticons/noto-emoticons/png/u1f500.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f500.png
diff --git a/data/emoticons/noto-emoticons/png/u1f501.png b/gajim/data/emoticons/noto-emoticons/png/u1f501.png
index ac93ae544..ac93ae544 100644
--- a/data/emoticons/noto-emoticons/png/u1f501.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f501.png
diff --git a/data/emoticons/noto-emoticons/png/u1f502.png b/gajim/data/emoticons/noto-emoticons/png/u1f502.png
index c8c157066..c8c157066 100644
--- a/data/emoticons/noto-emoticons/png/u1f502.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f502.png
diff --git a/data/emoticons/noto-emoticons/png/u1f503.png b/gajim/data/emoticons/noto-emoticons/png/u1f503.png
index d9443caa5..d9443caa5 100644
--- a/data/emoticons/noto-emoticons/png/u1f503.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f503.png
diff --git a/data/emoticons/noto-emoticons/png/u1f504.png b/gajim/data/emoticons/noto-emoticons/png/u1f504.png
index aa3771c22..aa3771c22 100644
--- a/data/emoticons/noto-emoticons/png/u1f504.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f504.png
diff --git a/data/emoticons/noto-emoticons/png/u1f505.png b/gajim/data/emoticons/noto-emoticons/png/u1f505.png
index ec1d627fe..ec1d627fe 100644
--- a/data/emoticons/noto-emoticons/png/u1f505.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f505.png
diff --git a/data/emoticons/noto-emoticons/png/u1f506.png b/gajim/data/emoticons/noto-emoticons/png/u1f506.png
index ffc681f3d..ffc681f3d 100644
--- a/data/emoticons/noto-emoticons/png/u1f506.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f506.png
diff --git a/data/emoticons/noto-emoticons/png/u1f507.png b/gajim/data/emoticons/noto-emoticons/png/u1f507.png
index 94814a2cb..94814a2cb 100644
--- a/data/emoticons/noto-emoticons/png/u1f507.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f507.png
diff --git a/data/emoticons/noto-emoticons/png/u1f508.png b/gajim/data/emoticons/noto-emoticons/png/u1f508.png
index a12c91a87..a12c91a87 100644
--- a/data/emoticons/noto-emoticons/png/u1f508.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f508.png
diff --git a/data/emoticons/noto-emoticons/png/u1f509.png b/gajim/data/emoticons/noto-emoticons/png/u1f509.png
index 5dde76584..5dde76584 100644
--- a/data/emoticons/noto-emoticons/png/u1f509.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f509.png
diff --git a/data/emoticons/noto-emoticons/png/u1f50a.png b/gajim/data/emoticons/noto-emoticons/png/u1f50a.png
index 2b48ce315..2b48ce315 100644
--- a/data/emoticons/noto-emoticons/png/u1f50a.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f50a.png
diff --git a/data/emoticons/noto-emoticons/png/u1f50b.png b/gajim/data/emoticons/noto-emoticons/png/u1f50b.png
index 899b365c6..899b365c6 100644
--- a/data/emoticons/noto-emoticons/png/u1f50b.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f50b.png
diff --git a/data/emoticons/noto-emoticons/png/u1f50c.png b/gajim/data/emoticons/noto-emoticons/png/u1f50c.png
index c8d56a57f..c8d56a57f 100644
--- a/data/emoticons/noto-emoticons/png/u1f50c.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f50c.png
diff --git a/data/emoticons/noto-emoticons/png/u1f50d.png b/gajim/data/emoticons/noto-emoticons/png/u1f50d.png
index 5d68a6e81..5d68a6e81 100644
--- a/data/emoticons/noto-emoticons/png/u1f50d.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f50d.png
diff --git a/data/emoticons/noto-emoticons/png/u1f50e.png b/gajim/data/emoticons/noto-emoticons/png/u1f50e.png
index e605cba89..e605cba89 100644
--- a/data/emoticons/noto-emoticons/png/u1f50e.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f50e.png
diff --git a/data/emoticons/noto-emoticons/png/u1f50f.png b/gajim/data/emoticons/noto-emoticons/png/u1f50f.png
index 556bc1df1..556bc1df1 100644
--- a/data/emoticons/noto-emoticons/png/u1f50f.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f50f.png
diff --git a/data/emoticons/noto-emoticons/png/u1f510.png b/gajim/data/emoticons/noto-emoticons/png/u1f510.png
index a95b7ce6a..a95b7ce6a 100644
--- a/data/emoticons/noto-emoticons/png/u1f510.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f510.png
diff --git a/data/emoticons/noto-emoticons/png/u1f511.png b/gajim/data/emoticons/noto-emoticons/png/u1f511.png
index 95b4b93df..95b4b93df 100644
--- a/data/emoticons/noto-emoticons/png/u1f511.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f511.png
diff --git a/data/emoticons/noto-emoticons/png/u1f512.png b/gajim/data/emoticons/noto-emoticons/png/u1f512.png
index 35f3af899..35f3af899 100644
--- a/data/emoticons/noto-emoticons/png/u1f512.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f512.png
diff --git a/data/emoticons/noto-emoticons/png/u1f513.png b/gajim/data/emoticons/noto-emoticons/png/u1f513.png
index 28d5e664b..28d5e664b 100644
--- a/data/emoticons/noto-emoticons/png/u1f513.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f513.png
diff --git a/data/emoticons/noto-emoticons/png/u1f514.png b/gajim/data/emoticons/noto-emoticons/png/u1f514.png
index ab9b29df2..ab9b29df2 100644
--- a/data/emoticons/noto-emoticons/png/u1f514.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f514.png
diff --git a/data/emoticons/noto-emoticons/png/u1f515.png b/gajim/data/emoticons/noto-emoticons/png/u1f515.png
index bdc5959d3..bdc5959d3 100644
--- a/data/emoticons/noto-emoticons/png/u1f515.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f515.png
diff --git a/data/emoticons/noto-emoticons/png/u1f516.png b/gajim/data/emoticons/noto-emoticons/png/u1f516.png
index a75a00db4..a75a00db4 100644
--- a/data/emoticons/noto-emoticons/png/u1f516.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f516.png
diff --git a/data/emoticons/noto-emoticons/png/u1f517.png b/gajim/data/emoticons/noto-emoticons/png/u1f517.png
index b6acaf41e..b6acaf41e 100644
--- a/data/emoticons/noto-emoticons/png/u1f517.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f517.png
diff --git a/data/emoticons/noto-emoticons/png/u1f518.png b/gajim/data/emoticons/noto-emoticons/png/u1f518.png
index 07e36b0f7..07e36b0f7 100644
--- a/data/emoticons/noto-emoticons/png/u1f518.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f518.png
diff --git a/data/emoticons/noto-emoticons/png/u1f519.png b/gajim/data/emoticons/noto-emoticons/png/u1f519.png
index 484f146d3..484f146d3 100644
--- a/data/emoticons/noto-emoticons/png/u1f519.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f519.png
diff --git a/data/emoticons/noto-emoticons/png/u1f51a.png b/gajim/data/emoticons/noto-emoticons/png/u1f51a.png
index d970acdba..d970acdba 100644
--- a/data/emoticons/noto-emoticons/png/u1f51a.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f51a.png
diff --git a/data/emoticons/noto-emoticons/png/u1f51b.png b/gajim/data/emoticons/noto-emoticons/png/u1f51b.png
index a9fdf8296..a9fdf8296 100644
--- a/data/emoticons/noto-emoticons/png/u1f51b.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f51b.png
diff --git a/data/emoticons/noto-emoticons/png/u1f51c.png b/gajim/data/emoticons/noto-emoticons/png/u1f51c.png
index 01d64afa0..01d64afa0 100644
--- a/data/emoticons/noto-emoticons/png/u1f51c.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f51c.png
diff --git a/data/emoticons/noto-emoticons/png/u1f51d.png b/gajim/data/emoticons/noto-emoticons/png/u1f51d.png
index 885d5b739..885d5b739 100644
--- a/data/emoticons/noto-emoticons/png/u1f51d.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f51d.png
diff --git a/data/emoticons/noto-emoticons/png/u1f51e.png b/gajim/data/emoticons/noto-emoticons/png/u1f51e.png
index 7d5a43f34..7d5a43f34 100644
--- a/data/emoticons/noto-emoticons/png/u1f51e.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f51e.png
diff --git a/data/emoticons/noto-emoticons/png/u1f51f.png b/gajim/data/emoticons/noto-emoticons/png/u1f51f.png
index 5162abda0..5162abda0 100644
--- a/data/emoticons/noto-emoticons/png/u1f51f.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f51f.png
diff --git a/data/emoticons/noto-emoticons/png/u1f520.png b/gajim/data/emoticons/noto-emoticons/png/u1f520.png
index 39e275b48..39e275b48 100644
--- a/data/emoticons/noto-emoticons/png/u1f520.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f520.png
diff --git a/data/emoticons/noto-emoticons/png/u1f521.png b/gajim/data/emoticons/noto-emoticons/png/u1f521.png
index 1a97653a6..1a97653a6 100644
--- a/data/emoticons/noto-emoticons/png/u1f521.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f521.png
diff --git a/data/emoticons/noto-emoticons/png/u1f522.png b/gajim/data/emoticons/noto-emoticons/png/u1f522.png
index f934e1c88..f934e1c88 100644
--- a/data/emoticons/noto-emoticons/png/u1f522.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f522.png
diff --git a/data/emoticons/noto-emoticons/png/u1f523.png b/gajim/data/emoticons/noto-emoticons/png/u1f523.png
index 5b474ce30..5b474ce30 100644
--- a/data/emoticons/noto-emoticons/png/u1f523.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f523.png
diff --git a/data/emoticons/noto-emoticons/png/u1f524.png b/gajim/data/emoticons/noto-emoticons/png/u1f524.png
index 5c8f628c6..5c8f628c6 100644
--- a/data/emoticons/noto-emoticons/png/u1f524.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f524.png
diff --git a/data/emoticons/noto-emoticons/png/u1f525.png b/gajim/data/emoticons/noto-emoticons/png/u1f525.png
index 7f14bd3be..7f14bd3be 100644
--- a/data/emoticons/noto-emoticons/png/u1f525.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f525.png
diff --git a/data/emoticons/noto-emoticons/png/u1f526.png b/gajim/data/emoticons/noto-emoticons/png/u1f526.png
index 4c0e65180..4c0e65180 100644
--- a/data/emoticons/noto-emoticons/png/u1f526.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f526.png
diff --git a/data/emoticons/noto-emoticons/png/u1f527.png b/gajim/data/emoticons/noto-emoticons/png/u1f527.png
index 4afab92c6..4afab92c6 100644
--- a/data/emoticons/noto-emoticons/png/u1f527.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f527.png
diff --git a/data/emoticons/noto-emoticons/png/u1f528.png b/gajim/data/emoticons/noto-emoticons/png/u1f528.png
index 655b7288a..655b7288a 100644
--- a/data/emoticons/noto-emoticons/png/u1f528.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f528.png
diff --git a/data/emoticons/noto-emoticons/png/u1f529.png b/gajim/data/emoticons/noto-emoticons/png/u1f529.png
index 91d655382..91d655382 100644
--- a/data/emoticons/noto-emoticons/png/u1f529.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f529.png
diff --git a/data/emoticons/noto-emoticons/png/u1f52a.png b/gajim/data/emoticons/noto-emoticons/png/u1f52a.png
index fbe550b84..fbe550b84 100644
--- a/data/emoticons/noto-emoticons/png/u1f52a.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f52a.png
diff --git a/data/emoticons/noto-emoticons/png/u1f52b.png b/gajim/data/emoticons/noto-emoticons/png/u1f52b.png
index b1fffcacb..b1fffcacb 100644
--- a/data/emoticons/noto-emoticons/png/u1f52b.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f52b.png
diff --git a/data/emoticons/noto-emoticons/png/u1f52c.png b/gajim/data/emoticons/noto-emoticons/png/u1f52c.png
index aba87f625..aba87f625 100644
--- a/data/emoticons/noto-emoticons/png/u1f52c.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f52c.png
diff --git a/data/emoticons/noto-emoticons/png/u1f52d.png b/gajim/data/emoticons/noto-emoticons/png/u1f52d.png
index bc1365f57..bc1365f57 100644
--- a/data/emoticons/noto-emoticons/png/u1f52d.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f52d.png
diff --git a/data/emoticons/noto-emoticons/png/u1f52e.png b/gajim/data/emoticons/noto-emoticons/png/u1f52e.png
index 6923ffca8..6923ffca8 100644
--- a/data/emoticons/noto-emoticons/png/u1f52e.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f52e.png
diff --git a/data/emoticons/noto-emoticons/png/u1f52f.png b/gajim/data/emoticons/noto-emoticons/png/u1f52f.png
index 7dd30bc90..7dd30bc90 100644
--- a/data/emoticons/noto-emoticons/png/u1f52f.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f52f.png
diff --git a/data/emoticons/noto-emoticons/png/u1f530.png b/gajim/data/emoticons/noto-emoticons/png/u1f530.png
index e1f6acd19..e1f6acd19 100644
--- a/data/emoticons/noto-emoticons/png/u1f530.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f530.png
diff --git a/data/emoticons/noto-emoticons/png/u1f531.png b/gajim/data/emoticons/noto-emoticons/png/u1f531.png
index 169f4e00d..169f4e00d 100644
--- a/data/emoticons/noto-emoticons/png/u1f531.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f531.png
diff --git a/data/emoticons/noto-emoticons/png/u1f532.png b/gajim/data/emoticons/noto-emoticons/png/u1f532.png
index 10595e826..10595e826 100644
--- a/data/emoticons/noto-emoticons/png/u1f532.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f532.png
diff --git a/data/emoticons/noto-emoticons/png/u1f533.png b/gajim/data/emoticons/noto-emoticons/png/u1f533.png
index d028ae40d..d028ae40d 100644
--- a/data/emoticons/noto-emoticons/png/u1f533.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f533.png
diff --git a/data/emoticons/noto-emoticons/png/u1f534.png b/gajim/data/emoticons/noto-emoticons/png/u1f534.png
index 96928dfeb..96928dfeb 100644
--- a/data/emoticons/noto-emoticons/png/u1f534.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f534.png
diff --git a/data/emoticons/noto-emoticons/png/u1f535.png b/gajim/data/emoticons/noto-emoticons/png/u1f535.png
index edb887cfa..edb887cfa 100644
--- a/data/emoticons/noto-emoticons/png/u1f535.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f535.png
diff --git a/data/emoticons/noto-emoticons/png/u1f536.png b/gajim/data/emoticons/noto-emoticons/png/u1f536.png
index 24821a306..24821a306 100644
--- a/data/emoticons/noto-emoticons/png/u1f536.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f536.png
diff --git a/data/emoticons/noto-emoticons/png/u1f537.png b/gajim/data/emoticons/noto-emoticons/png/u1f537.png
index be549c5b1..be549c5b1 100644
--- a/data/emoticons/noto-emoticons/png/u1f537.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f537.png
diff --git a/data/emoticons/noto-emoticons/png/u1f538.png b/gajim/data/emoticons/noto-emoticons/png/u1f538.png
index f2d5b1632..f2d5b1632 100644
--- a/data/emoticons/noto-emoticons/png/u1f538.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f538.png
diff --git a/data/emoticons/noto-emoticons/png/u1f539.png b/gajim/data/emoticons/noto-emoticons/png/u1f539.png
index 33576980f..33576980f 100644
--- a/data/emoticons/noto-emoticons/png/u1f539.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f539.png
diff --git a/data/emoticons/noto-emoticons/png/u1f53a.png b/gajim/data/emoticons/noto-emoticons/png/u1f53a.png
index bed03497e..bed03497e 100644
--- a/data/emoticons/noto-emoticons/png/u1f53a.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f53a.png
diff --git a/data/emoticons/noto-emoticons/png/u1f53b.png b/gajim/data/emoticons/noto-emoticons/png/u1f53b.png
index 16fb73fdf..16fb73fdf 100644
--- a/data/emoticons/noto-emoticons/png/u1f53b.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f53b.png
diff --git a/data/emoticons/noto-emoticons/png/u1f53c.png b/gajim/data/emoticons/noto-emoticons/png/u1f53c.png
index 29aece64f..29aece64f 100644
--- a/data/emoticons/noto-emoticons/png/u1f53c.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f53c.png
diff --git a/data/emoticons/noto-emoticons/png/u1f53d.png b/gajim/data/emoticons/noto-emoticons/png/u1f53d.png
index e2108872b..e2108872b 100644
--- a/data/emoticons/noto-emoticons/png/u1f53d.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f53d.png
diff --git a/data/emoticons/noto-emoticons/png/u1f549.png b/gajim/data/emoticons/noto-emoticons/png/u1f549.png
index 03dc49f2f..03dc49f2f 100644
--- a/data/emoticons/noto-emoticons/png/u1f549.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f549.png
diff --git a/data/emoticons/noto-emoticons/png/u1f54a.png b/gajim/data/emoticons/noto-emoticons/png/u1f54a.png
index 8e76b1048..8e76b1048 100644
--- a/data/emoticons/noto-emoticons/png/u1f54a.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f54a.png
diff --git a/data/emoticons/noto-emoticons/png/u1f54b.png b/gajim/data/emoticons/noto-emoticons/png/u1f54b.png
index 26adb8eac..26adb8eac 100644
--- a/data/emoticons/noto-emoticons/png/u1f54b.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f54b.png
diff --git a/data/emoticons/noto-emoticons/png/u1f54c.png b/gajim/data/emoticons/noto-emoticons/png/u1f54c.png
index 86c489053..86c489053 100644
--- a/data/emoticons/noto-emoticons/png/u1f54c.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f54c.png
diff --git a/data/emoticons/noto-emoticons/png/u1f54d.png b/gajim/data/emoticons/noto-emoticons/png/u1f54d.png
index 040b35a67..040b35a67 100644
--- a/data/emoticons/noto-emoticons/png/u1f54d.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f54d.png
diff --git a/data/emoticons/noto-emoticons/png/u1f54e.png b/gajim/data/emoticons/noto-emoticons/png/u1f54e.png
index 27b860526..27b860526 100644
--- a/data/emoticons/noto-emoticons/png/u1f54e.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f54e.png
diff --git a/data/emoticons/noto-emoticons/png/u1f550.png b/gajim/data/emoticons/noto-emoticons/png/u1f550.png
index 48bbf0cf3..48bbf0cf3 100644
--- a/data/emoticons/noto-emoticons/png/u1f550.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f550.png
diff --git a/data/emoticons/noto-emoticons/png/u1f551.png b/gajim/data/emoticons/noto-emoticons/png/u1f551.png
index 18616fdf6..18616fdf6 100644
--- a/data/emoticons/noto-emoticons/png/u1f551.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f551.png
diff --git a/data/emoticons/noto-emoticons/png/u1f552.png b/gajim/data/emoticons/noto-emoticons/png/u1f552.png
index 68b0d0da1..68b0d0da1 100644
--- a/data/emoticons/noto-emoticons/png/u1f552.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f552.png
diff --git a/data/emoticons/noto-emoticons/png/u1f553.png b/gajim/data/emoticons/noto-emoticons/png/u1f553.png
index d3e361b71..d3e361b71 100644
--- a/data/emoticons/noto-emoticons/png/u1f553.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f553.png
diff --git a/data/emoticons/noto-emoticons/png/u1f554.png b/gajim/data/emoticons/noto-emoticons/png/u1f554.png
index 2669a67ce..2669a67ce 100644
--- a/data/emoticons/noto-emoticons/png/u1f554.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f554.png
diff --git a/data/emoticons/noto-emoticons/png/u1f555.png b/gajim/data/emoticons/noto-emoticons/png/u1f555.png
index 372953324..372953324 100644
--- a/data/emoticons/noto-emoticons/png/u1f555.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f555.png
diff --git a/data/emoticons/noto-emoticons/png/u1f556.png b/gajim/data/emoticons/noto-emoticons/png/u1f556.png
index 6764270f6..6764270f6 100644
--- a/data/emoticons/noto-emoticons/png/u1f556.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f556.png
diff --git a/data/emoticons/noto-emoticons/png/u1f557.png b/gajim/data/emoticons/noto-emoticons/png/u1f557.png
index 1d5111c00..1d5111c00 100644
--- a/data/emoticons/noto-emoticons/png/u1f557.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f557.png
diff --git a/data/emoticons/noto-emoticons/png/u1f558.png b/gajim/data/emoticons/noto-emoticons/png/u1f558.png
index c6847a6f5..c6847a6f5 100644
--- a/data/emoticons/noto-emoticons/png/u1f558.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f558.png
diff --git a/data/emoticons/noto-emoticons/png/u1f559.png b/gajim/data/emoticons/noto-emoticons/png/u1f559.png
index 7b0ba9194..7b0ba9194 100644
--- a/data/emoticons/noto-emoticons/png/u1f559.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f559.png
diff --git a/data/emoticons/noto-emoticons/png/u1f55a.png b/gajim/data/emoticons/noto-emoticons/png/u1f55a.png
index 75ed030c9..75ed030c9 100644
--- a/data/emoticons/noto-emoticons/png/u1f55a.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f55a.png
diff --git a/data/emoticons/noto-emoticons/png/u1f55b.png b/gajim/data/emoticons/noto-emoticons/png/u1f55b.png
index 0a152021b..0a152021b 100644
--- a/data/emoticons/noto-emoticons/png/u1f55b.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f55b.png
diff --git a/data/emoticons/noto-emoticons/png/u1f55c.png b/gajim/data/emoticons/noto-emoticons/png/u1f55c.png
index 19b7ebc4f..19b7ebc4f 100644
--- a/data/emoticons/noto-emoticons/png/u1f55c.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f55c.png
diff --git a/data/emoticons/noto-emoticons/png/u1f55d.png b/gajim/data/emoticons/noto-emoticons/png/u1f55d.png
index 80d96368d..80d96368d 100644
--- a/data/emoticons/noto-emoticons/png/u1f55d.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f55d.png
diff --git a/data/emoticons/noto-emoticons/png/u1f55e.png b/gajim/data/emoticons/noto-emoticons/png/u1f55e.png
index 69e0283a6..69e0283a6 100644
--- a/data/emoticons/noto-emoticons/png/u1f55e.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f55e.png
diff --git a/data/emoticons/noto-emoticons/png/u1f55f.png b/gajim/data/emoticons/noto-emoticons/png/u1f55f.png
index f9ecf3838..f9ecf3838 100644
--- a/data/emoticons/noto-emoticons/png/u1f55f.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f55f.png
diff --git a/data/emoticons/noto-emoticons/png/u1f560.png b/gajim/data/emoticons/noto-emoticons/png/u1f560.png
index deebe00f1..deebe00f1 100644
--- a/data/emoticons/noto-emoticons/png/u1f560.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f560.png
diff --git a/data/emoticons/noto-emoticons/png/u1f561.png b/gajim/data/emoticons/noto-emoticons/png/u1f561.png
index f9cb24b65..f9cb24b65 100644
--- a/data/emoticons/noto-emoticons/png/u1f561.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f561.png
diff --git a/data/emoticons/noto-emoticons/png/u1f562.png b/gajim/data/emoticons/noto-emoticons/png/u1f562.png
index 0e7760c21..0e7760c21 100644
--- a/data/emoticons/noto-emoticons/png/u1f562.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f562.png
diff --git a/data/emoticons/noto-emoticons/png/u1f563.png b/gajim/data/emoticons/noto-emoticons/png/u1f563.png
index 0d4cff9a1..0d4cff9a1 100644
--- a/data/emoticons/noto-emoticons/png/u1f563.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f563.png
diff --git a/data/emoticons/noto-emoticons/png/u1f564.png b/gajim/data/emoticons/noto-emoticons/png/u1f564.png
index c573c0f27..c573c0f27 100644
--- a/data/emoticons/noto-emoticons/png/u1f564.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f564.png
diff --git a/data/emoticons/noto-emoticons/png/u1f565.png b/gajim/data/emoticons/noto-emoticons/png/u1f565.png
index 1697da0f5..1697da0f5 100644
--- a/data/emoticons/noto-emoticons/png/u1f565.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f565.png
diff --git a/data/emoticons/noto-emoticons/png/u1f566.png b/gajim/data/emoticons/noto-emoticons/png/u1f566.png
index 0499c57a6..0499c57a6 100644
--- a/data/emoticons/noto-emoticons/png/u1f566.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f566.png
diff --git a/data/emoticons/noto-emoticons/png/u1f567.png b/gajim/data/emoticons/noto-emoticons/png/u1f567.png
index ef0ac21b7..ef0ac21b7 100644
--- a/data/emoticons/noto-emoticons/png/u1f567.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f567.png
diff --git a/data/emoticons/noto-emoticons/png/u1f56f.png b/gajim/data/emoticons/noto-emoticons/png/u1f56f.png
index ee6440290..ee6440290 100644
--- a/data/emoticons/noto-emoticons/png/u1f56f.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f56f.png
diff --git a/data/emoticons/noto-emoticons/png/u1f570.png b/gajim/data/emoticons/noto-emoticons/png/u1f570.png
index c514b926f..c514b926f 100644
--- a/data/emoticons/noto-emoticons/png/u1f570.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f570.png
diff --git a/data/emoticons/noto-emoticons/png/u1f573.png b/gajim/data/emoticons/noto-emoticons/png/u1f573.png
index f6efd3a61..f6efd3a61 100644
--- a/data/emoticons/noto-emoticons/png/u1f573.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f573.png
diff --git a/data/emoticons/noto-emoticons/png/u1f574.png b/gajim/data/emoticons/noto-emoticons/png/u1f574.png
index 36e7145d0..36e7145d0 100644
--- a/data/emoticons/noto-emoticons/png/u1f574.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f574.png
diff --git a/data/emoticons/noto-emoticons/png/u1f575.png b/gajim/data/emoticons/noto-emoticons/png/u1f575.png
index 30d32a80d..30d32a80d 100644
--- a/data/emoticons/noto-emoticons/png/u1f575.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f575.png
diff --git a/data/emoticons/noto-emoticons/png/u1f575_1f3fb.png b/gajim/data/emoticons/noto-emoticons/png/u1f575_1f3fb.png
index 365dd4a9b..365dd4a9b 100644
--- a/data/emoticons/noto-emoticons/png/u1f575_1f3fb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f575_1f3fb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f575_1f3fb_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f575_1f3fb_200d_2640.png
index 5ad301fa7..5ad301fa7 100644
--- a/data/emoticons/noto-emoticons/png/u1f575_1f3fb_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f575_1f3fb_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f575_1f3fb_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f575_1f3fb_200d_2642.png
index 365dd4a9b..365dd4a9b 100644
--- a/data/emoticons/noto-emoticons/png/u1f575_1f3fb_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f575_1f3fb_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f575_1f3fc.png b/gajim/data/emoticons/noto-emoticons/png/u1f575_1f3fc.png
index 7e313709c..7e313709c 100644
--- a/data/emoticons/noto-emoticons/png/u1f575_1f3fc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f575_1f3fc.png
diff --git a/data/emoticons/noto-emoticons/png/u1f575_1f3fc_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f575_1f3fc_200d_2640.png
index 6bc391405..6bc391405 100644
--- a/data/emoticons/noto-emoticons/png/u1f575_1f3fc_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f575_1f3fc_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f575_1f3fc_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f575_1f3fc_200d_2642.png
index 7e313709c..7e313709c 100644
--- a/data/emoticons/noto-emoticons/png/u1f575_1f3fc_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f575_1f3fc_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f575_1f3fd.png b/gajim/data/emoticons/noto-emoticons/png/u1f575_1f3fd.png
index ca6a546a5..ca6a546a5 100644
--- a/data/emoticons/noto-emoticons/png/u1f575_1f3fd.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f575_1f3fd.png
diff --git a/data/emoticons/noto-emoticons/png/u1f575_1f3fd_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f575_1f3fd_200d_2640.png
index 140d2b1dd..140d2b1dd 100644
--- a/data/emoticons/noto-emoticons/png/u1f575_1f3fd_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f575_1f3fd_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f575_1f3fd_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f575_1f3fd_200d_2642.png
index ca6a546a5..ca6a546a5 100644
--- a/data/emoticons/noto-emoticons/png/u1f575_1f3fd_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f575_1f3fd_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f575_1f3fe.png b/gajim/data/emoticons/noto-emoticons/png/u1f575_1f3fe.png
index 10d904e76..10d904e76 100644
--- a/data/emoticons/noto-emoticons/png/u1f575_1f3fe.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f575_1f3fe.png
diff --git a/data/emoticons/noto-emoticons/png/u1f575_1f3fe_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f575_1f3fe_200d_2640.png
index 00df7be11..00df7be11 100644
--- a/data/emoticons/noto-emoticons/png/u1f575_1f3fe_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f575_1f3fe_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f575_1f3fe_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f575_1f3fe_200d_2642.png
index 10d904e76..10d904e76 100644
--- a/data/emoticons/noto-emoticons/png/u1f575_1f3fe_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f575_1f3fe_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f575_1f3ff.png b/gajim/data/emoticons/noto-emoticons/png/u1f575_1f3ff.png
index 3420bdea6..3420bdea6 100644
--- a/data/emoticons/noto-emoticons/png/u1f575_1f3ff.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f575_1f3ff.png
diff --git a/data/emoticons/noto-emoticons/png/u1f575_1f3ff_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f575_1f3ff_200d_2640.png
index bd028d93a..bd028d93a 100644
--- a/data/emoticons/noto-emoticons/png/u1f575_1f3ff_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f575_1f3ff_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f575_1f3ff_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f575_1f3ff_200d_2642.png
index 3420bdea6..3420bdea6 100644
--- a/data/emoticons/noto-emoticons/png/u1f575_1f3ff_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f575_1f3ff_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f575_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f575_200d_2640.png
index e7969d850..e7969d850 100644
--- a/data/emoticons/noto-emoticons/png/u1f575_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f575_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f575_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f575_200d_2642.png
index 30d32a80d..30d32a80d 100644
--- a/data/emoticons/noto-emoticons/png/u1f575_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f575_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f576.png b/gajim/data/emoticons/noto-emoticons/png/u1f576.png
index 5fae8fdcd..5fae8fdcd 100644
--- a/data/emoticons/noto-emoticons/png/u1f576.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f576.png
diff --git a/data/emoticons/noto-emoticons/png/u1f577.png b/gajim/data/emoticons/noto-emoticons/png/u1f577.png
index 0e7ea31d6..0e7ea31d6 100644
--- a/data/emoticons/noto-emoticons/png/u1f577.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f577.png
diff --git a/data/emoticons/noto-emoticons/png/u1f578.png b/gajim/data/emoticons/noto-emoticons/png/u1f578.png
index 2afdb290d..2afdb290d 100644
--- a/data/emoticons/noto-emoticons/png/u1f578.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f578.png
diff --git a/data/emoticons/noto-emoticons/png/u1f579.png b/gajim/data/emoticons/noto-emoticons/png/u1f579.png
index 55c2b4739..55c2b4739 100644
--- a/data/emoticons/noto-emoticons/png/u1f579.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f579.png
diff --git a/data/emoticons/noto-emoticons/png/u1f57a.png b/gajim/data/emoticons/noto-emoticons/png/u1f57a.png
index 78799c50c..78799c50c 100644
--- a/data/emoticons/noto-emoticons/png/u1f57a.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f57a.png
diff --git a/data/emoticons/noto-emoticons/png/u1f57a_1f3fb.png b/gajim/data/emoticons/noto-emoticons/png/u1f57a_1f3fb.png
index 78b7862b3..78b7862b3 100644
--- a/data/emoticons/noto-emoticons/png/u1f57a_1f3fb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f57a_1f3fb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f57a_1f3fc.png b/gajim/data/emoticons/noto-emoticons/png/u1f57a_1f3fc.png
index 31b010f8e..31b010f8e 100644
--- a/data/emoticons/noto-emoticons/png/u1f57a_1f3fc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f57a_1f3fc.png
diff --git a/data/emoticons/noto-emoticons/png/u1f57a_1f3fd.png b/gajim/data/emoticons/noto-emoticons/png/u1f57a_1f3fd.png
index ef33410e0..ef33410e0 100644
--- a/data/emoticons/noto-emoticons/png/u1f57a_1f3fd.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f57a_1f3fd.png
diff --git a/data/emoticons/noto-emoticons/png/u1f57a_1f3fe.png b/gajim/data/emoticons/noto-emoticons/png/u1f57a_1f3fe.png
index 16008fa2b..16008fa2b 100644
--- a/data/emoticons/noto-emoticons/png/u1f57a_1f3fe.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f57a_1f3fe.png
diff --git a/data/emoticons/noto-emoticons/png/u1f57a_1f3ff.png b/gajim/data/emoticons/noto-emoticons/png/u1f57a_1f3ff.png
index 9dd9c0210..9dd9c0210 100644
--- a/data/emoticons/noto-emoticons/png/u1f57a_1f3ff.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f57a_1f3ff.png
diff --git a/data/emoticons/noto-emoticons/png/u1f587.png b/gajim/data/emoticons/noto-emoticons/png/u1f587.png
index 5062c6e6d..5062c6e6d 100644
--- a/data/emoticons/noto-emoticons/png/u1f587.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f587.png
diff --git a/data/emoticons/noto-emoticons/png/u1f58a.png b/gajim/data/emoticons/noto-emoticons/png/u1f58a.png
index 74d49bc69..74d49bc69 100644
--- a/data/emoticons/noto-emoticons/png/u1f58a.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f58a.png
diff --git a/data/emoticons/noto-emoticons/png/u1f58b.png b/gajim/data/emoticons/noto-emoticons/png/u1f58b.png
index a2d47be9e..a2d47be9e 100644
--- a/data/emoticons/noto-emoticons/png/u1f58b.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f58b.png
diff --git a/data/emoticons/noto-emoticons/png/u1f58c.png b/gajim/data/emoticons/noto-emoticons/png/u1f58c.png
index 68764928a..68764928a 100644
--- a/data/emoticons/noto-emoticons/png/u1f58c.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f58c.png
diff --git a/data/emoticons/noto-emoticons/png/u1f58d.png b/gajim/data/emoticons/noto-emoticons/png/u1f58d.png
index 53e4c0acc..53e4c0acc 100644
--- a/data/emoticons/noto-emoticons/png/u1f58d.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f58d.png
diff --git a/data/emoticons/noto-emoticons/png/u1f590.png b/gajim/data/emoticons/noto-emoticons/png/u1f590.png
index 5882bf56e..5882bf56e 100644
--- a/data/emoticons/noto-emoticons/png/u1f590.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f590.png
diff --git a/data/emoticons/noto-emoticons/png/u1f590_1f3fb.png b/gajim/data/emoticons/noto-emoticons/png/u1f590_1f3fb.png
index 8856ac4db..8856ac4db 100644
--- a/data/emoticons/noto-emoticons/png/u1f590_1f3fb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f590_1f3fb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f590_1f3fc.png b/gajim/data/emoticons/noto-emoticons/png/u1f590_1f3fc.png
index dcc17be39..dcc17be39 100644
--- a/data/emoticons/noto-emoticons/png/u1f590_1f3fc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f590_1f3fc.png
diff --git a/data/emoticons/noto-emoticons/png/u1f590_1f3fd.png b/gajim/data/emoticons/noto-emoticons/png/u1f590_1f3fd.png
index 7f51a2f1b..7f51a2f1b 100644
--- a/data/emoticons/noto-emoticons/png/u1f590_1f3fd.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f590_1f3fd.png
diff --git a/data/emoticons/noto-emoticons/png/u1f590_1f3fe.png b/gajim/data/emoticons/noto-emoticons/png/u1f590_1f3fe.png
index 1643ac758..1643ac758 100644
--- a/data/emoticons/noto-emoticons/png/u1f590_1f3fe.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f590_1f3fe.png
diff --git a/data/emoticons/noto-emoticons/png/u1f590_1f3ff.png b/gajim/data/emoticons/noto-emoticons/png/u1f590_1f3ff.png
index b2168bb9c..b2168bb9c 100644
--- a/data/emoticons/noto-emoticons/png/u1f590_1f3ff.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f590_1f3ff.png
diff --git a/data/emoticons/noto-emoticons/png/u1f595.png b/gajim/data/emoticons/noto-emoticons/png/u1f595.png
index ce36f774e..ce36f774e 100644
--- a/data/emoticons/noto-emoticons/png/u1f595.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f595.png
diff --git a/data/emoticons/noto-emoticons/png/u1f595_1f3fb.png b/gajim/data/emoticons/noto-emoticons/png/u1f595_1f3fb.png
index a3535c76e..a3535c76e 100644
--- a/data/emoticons/noto-emoticons/png/u1f595_1f3fb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f595_1f3fb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f595_1f3fc.png b/gajim/data/emoticons/noto-emoticons/png/u1f595_1f3fc.png
index 247fa8e4b..247fa8e4b 100644
--- a/data/emoticons/noto-emoticons/png/u1f595_1f3fc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f595_1f3fc.png
diff --git a/data/emoticons/noto-emoticons/png/u1f595_1f3fd.png b/gajim/data/emoticons/noto-emoticons/png/u1f595_1f3fd.png
index 01d7d8128..01d7d8128 100644
--- a/data/emoticons/noto-emoticons/png/u1f595_1f3fd.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f595_1f3fd.png
diff --git a/data/emoticons/noto-emoticons/png/u1f595_1f3fe.png b/gajim/data/emoticons/noto-emoticons/png/u1f595_1f3fe.png
index e52d08844..e52d08844 100644
--- a/data/emoticons/noto-emoticons/png/u1f595_1f3fe.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f595_1f3fe.png
diff --git a/data/emoticons/noto-emoticons/png/u1f595_1f3ff.png b/gajim/data/emoticons/noto-emoticons/png/u1f595_1f3ff.png
index c25a597eb..c25a597eb 100644
--- a/data/emoticons/noto-emoticons/png/u1f595_1f3ff.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f595_1f3ff.png
diff --git a/data/emoticons/noto-emoticons/png/u1f596.png b/gajim/data/emoticons/noto-emoticons/png/u1f596.png
index 595ca517d..595ca517d 100644
--- a/data/emoticons/noto-emoticons/png/u1f596.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f596.png
diff --git a/data/emoticons/noto-emoticons/png/u1f596_1f3fb.png b/gajim/data/emoticons/noto-emoticons/png/u1f596_1f3fb.png
index 9cfbf02b4..9cfbf02b4 100644
--- a/data/emoticons/noto-emoticons/png/u1f596_1f3fb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f596_1f3fb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f596_1f3fc.png b/gajim/data/emoticons/noto-emoticons/png/u1f596_1f3fc.png
index 6827782c3..6827782c3 100644
--- a/data/emoticons/noto-emoticons/png/u1f596_1f3fc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f596_1f3fc.png
diff --git a/data/emoticons/noto-emoticons/png/u1f596_1f3fd.png b/gajim/data/emoticons/noto-emoticons/png/u1f596_1f3fd.png
index 5ad7b0bde..5ad7b0bde 100644
--- a/data/emoticons/noto-emoticons/png/u1f596_1f3fd.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f596_1f3fd.png
diff --git a/data/emoticons/noto-emoticons/png/u1f596_1f3fe.png b/gajim/data/emoticons/noto-emoticons/png/u1f596_1f3fe.png
index 75b74e6ee..75b74e6ee 100644
--- a/data/emoticons/noto-emoticons/png/u1f596_1f3fe.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f596_1f3fe.png
diff --git a/data/emoticons/noto-emoticons/png/u1f596_1f3ff.png b/gajim/data/emoticons/noto-emoticons/png/u1f596_1f3ff.png
index 86ab330c2..86ab330c2 100644
--- a/data/emoticons/noto-emoticons/png/u1f596_1f3ff.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f596_1f3ff.png
diff --git a/data/emoticons/noto-emoticons/png/u1f5a4.png b/gajim/data/emoticons/noto-emoticons/png/u1f5a4.png
index 53f51525a..53f51525a 100644
--- a/data/emoticons/noto-emoticons/png/u1f5a4.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f5a4.png
diff --git a/data/emoticons/noto-emoticons/png/u1f5a5.png b/gajim/data/emoticons/noto-emoticons/png/u1f5a5.png
index 5b165321a..5b165321a 100644
--- a/data/emoticons/noto-emoticons/png/u1f5a5.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f5a5.png
diff --git a/data/emoticons/noto-emoticons/png/u1f5a8.png b/gajim/data/emoticons/noto-emoticons/png/u1f5a8.png
index 78ad85b09..78ad85b09 100644
--- a/data/emoticons/noto-emoticons/png/u1f5a8.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f5a8.png
diff --git a/data/emoticons/noto-emoticons/png/u1f5b1.png b/gajim/data/emoticons/noto-emoticons/png/u1f5b1.png
index 4abbb459f..4abbb459f 100644
--- a/data/emoticons/noto-emoticons/png/u1f5b1.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f5b1.png
diff --git a/data/emoticons/noto-emoticons/png/u1f5b2.png b/gajim/data/emoticons/noto-emoticons/png/u1f5b2.png
index 09976a1fd..09976a1fd 100644
--- a/data/emoticons/noto-emoticons/png/u1f5b2.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f5b2.png
diff --git a/data/emoticons/noto-emoticons/png/u1f5bc.png b/gajim/data/emoticons/noto-emoticons/png/u1f5bc.png
index 82618bd51..82618bd51 100644
--- a/data/emoticons/noto-emoticons/png/u1f5bc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f5bc.png
diff --git a/data/emoticons/noto-emoticons/png/u1f5c2.png b/gajim/data/emoticons/noto-emoticons/png/u1f5c2.png
index 4e14e4ae9..4e14e4ae9 100644
--- a/data/emoticons/noto-emoticons/png/u1f5c2.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f5c2.png
diff --git a/data/emoticons/noto-emoticons/png/u1f5c3.png b/gajim/data/emoticons/noto-emoticons/png/u1f5c3.png
index f7049a6e5..f7049a6e5 100644
--- a/data/emoticons/noto-emoticons/png/u1f5c3.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f5c3.png
diff --git a/data/emoticons/noto-emoticons/png/u1f5c4.png b/gajim/data/emoticons/noto-emoticons/png/u1f5c4.png
index 75da6add3..75da6add3 100644
--- a/data/emoticons/noto-emoticons/png/u1f5c4.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f5c4.png
diff --git a/data/emoticons/noto-emoticons/png/u1f5d1.png b/gajim/data/emoticons/noto-emoticons/png/u1f5d1.png
index 10508a881..10508a881 100644
--- a/data/emoticons/noto-emoticons/png/u1f5d1.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f5d1.png
diff --git a/data/emoticons/noto-emoticons/png/u1f5d2.png b/gajim/data/emoticons/noto-emoticons/png/u1f5d2.png
index 0d165888e..0d165888e 100644
--- a/data/emoticons/noto-emoticons/png/u1f5d2.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f5d2.png
diff --git a/data/emoticons/noto-emoticons/png/u1f5d3.png b/gajim/data/emoticons/noto-emoticons/png/u1f5d3.png
index 472b191f7..472b191f7 100644
--- a/data/emoticons/noto-emoticons/png/u1f5d3.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f5d3.png
diff --git a/data/emoticons/noto-emoticons/png/u1f5dc.png b/gajim/data/emoticons/noto-emoticons/png/u1f5dc.png
index 26b628864..26b628864 100644
--- a/data/emoticons/noto-emoticons/png/u1f5dc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f5dc.png
diff --git a/data/emoticons/noto-emoticons/png/u1f5dd.png b/gajim/data/emoticons/noto-emoticons/png/u1f5dd.png
index 87a047a0c..87a047a0c 100644
--- a/data/emoticons/noto-emoticons/png/u1f5dd.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f5dd.png
diff --git a/data/emoticons/noto-emoticons/png/u1f5de.png b/gajim/data/emoticons/noto-emoticons/png/u1f5de.png
index 65ff658ab..65ff658ab 100644
--- a/data/emoticons/noto-emoticons/png/u1f5de.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f5de.png
diff --git a/data/emoticons/noto-emoticons/png/u1f5e1.png b/gajim/data/emoticons/noto-emoticons/png/u1f5e1.png
index 6895b26a9..6895b26a9 100644
--- a/data/emoticons/noto-emoticons/png/u1f5e1.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f5e1.png
diff --git a/data/emoticons/noto-emoticons/png/u1f5e3.png b/gajim/data/emoticons/noto-emoticons/png/u1f5e3.png
index 570337b56..570337b56 100644
--- a/data/emoticons/noto-emoticons/png/u1f5e3.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f5e3.png
diff --git a/data/emoticons/noto-emoticons/png/u1f5e8.png b/gajim/data/emoticons/noto-emoticons/png/u1f5e8.png
index c3e5e5f80..c3e5e5f80 100644
--- a/data/emoticons/noto-emoticons/png/u1f5e8.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f5e8.png
diff --git a/data/emoticons/noto-emoticons/png/u1f5ef.png b/gajim/data/emoticons/noto-emoticons/png/u1f5ef.png
index 1e1f49f12..1e1f49f12 100644
--- a/data/emoticons/noto-emoticons/png/u1f5ef.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f5ef.png
diff --git a/data/emoticons/noto-emoticons/png/u1f5f3.png b/gajim/data/emoticons/noto-emoticons/png/u1f5f3.png
index 1bea65844..1bea65844 100644
--- a/data/emoticons/noto-emoticons/png/u1f5f3.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f5f3.png
diff --git a/data/emoticons/noto-emoticons/png/u1f5fa.png b/gajim/data/emoticons/noto-emoticons/png/u1f5fa.png
index 54051982c..54051982c 100644
--- a/data/emoticons/noto-emoticons/png/u1f5fa.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f5fa.png
diff --git a/data/emoticons/noto-emoticons/png/u1f5fb.png b/gajim/data/emoticons/noto-emoticons/png/u1f5fb.png
index 7e6d80b7e..7e6d80b7e 100644
--- a/data/emoticons/noto-emoticons/png/u1f5fb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f5fb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f5fc.png b/gajim/data/emoticons/noto-emoticons/png/u1f5fc.png
index 3d3d9cabb..3d3d9cabb 100644
--- a/data/emoticons/noto-emoticons/png/u1f5fc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f5fc.png
diff --git a/data/emoticons/noto-emoticons/png/u1f5fd.png b/gajim/data/emoticons/noto-emoticons/png/u1f5fd.png
index f72726bb5..f72726bb5 100644
--- a/data/emoticons/noto-emoticons/png/u1f5fd.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f5fd.png
diff --git a/data/emoticons/noto-emoticons/png/u1f5fe.png b/gajim/data/emoticons/noto-emoticons/png/u1f5fe.png
index 8a2fbac6c..8a2fbac6c 100644
--- a/data/emoticons/noto-emoticons/png/u1f5fe.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f5fe.png
diff --git a/data/emoticons/noto-emoticons/png/u1f5ff.png b/gajim/data/emoticons/noto-emoticons/png/u1f5ff.png
index 873f1e7ba..873f1e7ba 100644
--- a/data/emoticons/noto-emoticons/png/u1f5ff.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f5ff.png
diff --git a/data/emoticons/noto-emoticons/png/u1f600.png b/gajim/data/emoticons/noto-emoticons/png/u1f600.png
index f651911fa..f651911fa 100644
--- a/data/emoticons/noto-emoticons/png/u1f600.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f600.png
diff --git a/data/emoticons/noto-emoticons/png/u1f601.png b/gajim/data/emoticons/noto-emoticons/png/u1f601.png
index 27fc69094..27fc69094 100644
--- a/data/emoticons/noto-emoticons/png/u1f601.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f601.png
diff --git a/data/emoticons/noto-emoticons/png/u1f602.png b/gajim/data/emoticons/noto-emoticons/png/u1f602.png
index 73e3c71bd..73e3c71bd 100644
--- a/data/emoticons/noto-emoticons/png/u1f602.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f602.png
diff --git a/data/emoticons/noto-emoticons/png/u1f603.png b/gajim/data/emoticons/noto-emoticons/png/u1f603.png
index de3a09c83..de3a09c83 100644
--- a/data/emoticons/noto-emoticons/png/u1f603.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f603.png
diff --git a/data/emoticons/noto-emoticons/png/u1f604.png b/gajim/data/emoticons/noto-emoticons/png/u1f604.png
index ee054878b..ee054878b 100644
--- a/data/emoticons/noto-emoticons/png/u1f604.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f604.png
diff --git a/data/emoticons/noto-emoticons/png/u1f605.png b/gajim/data/emoticons/noto-emoticons/png/u1f605.png
index 9aa718b3b..9aa718b3b 100644
--- a/data/emoticons/noto-emoticons/png/u1f605.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f605.png
diff --git a/data/emoticons/noto-emoticons/png/u1f606.png b/gajim/data/emoticons/noto-emoticons/png/u1f606.png
index 2f4943581..2f4943581 100644
--- a/data/emoticons/noto-emoticons/png/u1f606.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f606.png
diff --git a/data/emoticons/noto-emoticons/png/u1f607.png b/gajim/data/emoticons/noto-emoticons/png/u1f607.png
index 59c6dac1e..59c6dac1e 100644
--- a/data/emoticons/noto-emoticons/png/u1f607.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f607.png
diff --git a/data/emoticons/noto-emoticons/png/u1f608.png b/gajim/data/emoticons/noto-emoticons/png/u1f608.png
index 4a3ccfc47..4a3ccfc47 100644
--- a/data/emoticons/noto-emoticons/png/u1f608.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f608.png
diff --git a/data/emoticons/noto-emoticons/png/u1f609.png b/gajim/data/emoticons/noto-emoticons/png/u1f609.png
index 552264f2c..552264f2c 100644
--- a/data/emoticons/noto-emoticons/png/u1f609.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f609.png
diff --git a/data/emoticons/noto-emoticons/png/u1f60a.png b/gajim/data/emoticons/noto-emoticons/png/u1f60a.png
index 7e89526fa..7e89526fa 100644
--- a/data/emoticons/noto-emoticons/png/u1f60a.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f60a.png
diff --git a/data/emoticons/noto-emoticons/png/u1f60b.png b/gajim/data/emoticons/noto-emoticons/png/u1f60b.png
index 5b7a71579..5b7a71579 100644
--- a/data/emoticons/noto-emoticons/png/u1f60b.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f60b.png
diff --git a/data/emoticons/noto-emoticons/png/u1f60c.png b/gajim/data/emoticons/noto-emoticons/png/u1f60c.png
index b5b6a69c5..b5b6a69c5 100644
--- a/data/emoticons/noto-emoticons/png/u1f60c.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f60c.png
diff --git a/data/emoticons/noto-emoticons/png/u1f60d.png b/gajim/data/emoticons/noto-emoticons/png/u1f60d.png
index 29326865b..29326865b 100644
--- a/data/emoticons/noto-emoticons/png/u1f60d.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f60d.png
diff --git a/data/emoticons/noto-emoticons/png/u1f60e.png b/gajim/data/emoticons/noto-emoticons/png/u1f60e.png
index ebb948bc0..ebb948bc0 100644
--- a/data/emoticons/noto-emoticons/png/u1f60e.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f60e.png
diff --git a/data/emoticons/noto-emoticons/png/u1f60f.png b/gajim/data/emoticons/noto-emoticons/png/u1f60f.png
index 5ab0a95de..5ab0a95de 100644
--- a/data/emoticons/noto-emoticons/png/u1f60f.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f60f.png
diff --git a/data/emoticons/noto-emoticons/png/u1f610.png b/gajim/data/emoticons/noto-emoticons/png/u1f610.png
index abb057c4a..abb057c4a 100644
--- a/data/emoticons/noto-emoticons/png/u1f610.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f610.png
diff --git a/data/emoticons/noto-emoticons/png/u1f611.png b/gajim/data/emoticons/noto-emoticons/png/u1f611.png
index e6ae76e42..e6ae76e42 100644
--- a/data/emoticons/noto-emoticons/png/u1f611.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f611.png
diff --git a/data/emoticons/noto-emoticons/png/u1f612.png b/gajim/data/emoticons/noto-emoticons/png/u1f612.png
index 5ea38a542..5ea38a542 100644
--- a/data/emoticons/noto-emoticons/png/u1f612.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f612.png
diff --git a/data/emoticons/noto-emoticons/png/u1f613.png b/gajim/data/emoticons/noto-emoticons/png/u1f613.png
index d25b81bd9..d25b81bd9 100644
--- a/data/emoticons/noto-emoticons/png/u1f613.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f613.png
diff --git a/data/emoticons/noto-emoticons/png/u1f614.png b/gajim/data/emoticons/noto-emoticons/png/u1f614.png
index 90d82e8a7..90d82e8a7 100644
--- a/data/emoticons/noto-emoticons/png/u1f614.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f614.png
diff --git a/data/emoticons/noto-emoticons/png/u1f615.png b/gajim/data/emoticons/noto-emoticons/png/u1f615.png
index 91c901ea5..91c901ea5 100644
--- a/data/emoticons/noto-emoticons/png/u1f615.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f615.png
diff --git a/data/emoticons/noto-emoticons/png/u1f616.png b/gajim/data/emoticons/noto-emoticons/png/u1f616.png
index 2f2c916b3..2f2c916b3 100644
--- a/data/emoticons/noto-emoticons/png/u1f616.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f616.png
diff --git a/data/emoticons/noto-emoticons/png/u1f617.png b/gajim/data/emoticons/noto-emoticons/png/u1f617.png
index 205497aea..205497aea 100644
--- a/data/emoticons/noto-emoticons/png/u1f617.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f617.png
diff --git a/data/emoticons/noto-emoticons/png/u1f618.png b/gajim/data/emoticons/noto-emoticons/png/u1f618.png
index 8d66f606b..8d66f606b 100644
--- a/data/emoticons/noto-emoticons/png/u1f618.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f618.png
diff --git a/data/emoticons/noto-emoticons/png/u1f619.png b/gajim/data/emoticons/noto-emoticons/png/u1f619.png
index f5060ec9c..f5060ec9c 100644
--- a/data/emoticons/noto-emoticons/png/u1f619.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f619.png
diff --git a/data/emoticons/noto-emoticons/png/u1f61a.png b/gajim/data/emoticons/noto-emoticons/png/u1f61a.png
index 09e7a3dfc..09e7a3dfc 100644
--- a/data/emoticons/noto-emoticons/png/u1f61a.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f61a.png
diff --git a/data/emoticons/noto-emoticons/png/u1f61b.png b/gajim/data/emoticons/noto-emoticons/png/u1f61b.png
index 193b10160..193b10160 100644
--- a/data/emoticons/noto-emoticons/png/u1f61b.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f61b.png
diff --git a/data/emoticons/noto-emoticons/png/u1f61c.png b/gajim/data/emoticons/noto-emoticons/png/u1f61c.png
index 899daa885..899daa885 100644
--- a/data/emoticons/noto-emoticons/png/u1f61c.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f61c.png
diff --git a/data/emoticons/noto-emoticons/png/u1f61d.png b/gajim/data/emoticons/noto-emoticons/png/u1f61d.png
index ef3a01b80..ef3a01b80 100644
--- a/data/emoticons/noto-emoticons/png/u1f61d.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f61d.png
diff --git a/data/emoticons/noto-emoticons/png/u1f61e.png b/gajim/data/emoticons/noto-emoticons/png/u1f61e.png
index 830079cd4..830079cd4 100644
--- a/data/emoticons/noto-emoticons/png/u1f61e.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f61e.png
diff --git a/data/emoticons/noto-emoticons/png/u1f61f.png b/gajim/data/emoticons/noto-emoticons/png/u1f61f.png
index d78ac51b7..d78ac51b7 100644
--- a/data/emoticons/noto-emoticons/png/u1f61f.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f61f.png
diff --git a/data/emoticons/noto-emoticons/png/u1f620.png b/gajim/data/emoticons/noto-emoticons/png/u1f620.png
index f737625d3..f737625d3 100644
--- a/data/emoticons/noto-emoticons/png/u1f620.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f620.png
diff --git a/data/emoticons/noto-emoticons/png/u1f621.png b/gajim/data/emoticons/noto-emoticons/png/u1f621.png
index cba36254e..cba36254e 100644
--- a/data/emoticons/noto-emoticons/png/u1f621.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f621.png
diff --git a/data/emoticons/noto-emoticons/png/u1f622.png b/gajim/data/emoticons/noto-emoticons/png/u1f622.png
index ca6a0ee62..ca6a0ee62 100644
--- a/data/emoticons/noto-emoticons/png/u1f622.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f622.png
diff --git a/data/emoticons/noto-emoticons/png/u1f623.png b/gajim/data/emoticons/noto-emoticons/png/u1f623.png
index a542624b4..a542624b4 100644
--- a/data/emoticons/noto-emoticons/png/u1f623.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f623.png
diff --git a/data/emoticons/noto-emoticons/png/u1f624.png b/gajim/data/emoticons/noto-emoticons/png/u1f624.png
index 049c0770a..049c0770a 100644
--- a/data/emoticons/noto-emoticons/png/u1f624.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f624.png
diff --git a/data/emoticons/noto-emoticons/png/u1f625.png b/gajim/data/emoticons/noto-emoticons/png/u1f625.png
index 5769d3b9f..5769d3b9f 100644
--- a/data/emoticons/noto-emoticons/png/u1f625.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f625.png
diff --git a/data/emoticons/noto-emoticons/png/u1f626.png b/gajim/data/emoticons/noto-emoticons/png/u1f626.png
index d9445253d..d9445253d 100644
--- a/data/emoticons/noto-emoticons/png/u1f626.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f626.png
diff --git a/data/emoticons/noto-emoticons/png/u1f627.png b/gajim/data/emoticons/noto-emoticons/png/u1f627.png
index 4cd8b9704..4cd8b9704 100644
--- a/data/emoticons/noto-emoticons/png/u1f627.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f627.png
diff --git a/data/emoticons/noto-emoticons/png/u1f628.png b/gajim/data/emoticons/noto-emoticons/png/u1f628.png
index 81293aec2..81293aec2 100644
--- a/data/emoticons/noto-emoticons/png/u1f628.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f628.png
diff --git a/data/emoticons/noto-emoticons/png/u1f629.png b/gajim/data/emoticons/noto-emoticons/png/u1f629.png
index 1d40c8e42..1d40c8e42 100644
--- a/data/emoticons/noto-emoticons/png/u1f629.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f629.png
diff --git a/data/emoticons/noto-emoticons/png/u1f62a.png b/gajim/data/emoticons/noto-emoticons/png/u1f62a.png
index 50aea7f6c..50aea7f6c 100644
--- a/data/emoticons/noto-emoticons/png/u1f62a.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f62a.png
diff --git a/data/emoticons/noto-emoticons/png/u1f62b.png b/gajim/data/emoticons/noto-emoticons/png/u1f62b.png
index 2326966a7..2326966a7 100644
--- a/data/emoticons/noto-emoticons/png/u1f62b.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f62b.png
diff --git a/data/emoticons/noto-emoticons/png/u1f62c.png b/gajim/data/emoticons/noto-emoticons/png/u1f62c.png
index 457162dd3..457162dd3 100644
--- a/data/emoticons/noto-emoticons/png/u1f62c.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f62c.png
diff --git a/data/emoticons/noto-emoticons/png/u1f62d.png b/gajim/data/emoticons/noto-emoticons/png/u1f62d.png
index 8f493a0f6..8f493a0f6 100644
--- a/data/emoticons/noto-emoticons/png/u1f62d.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f62d.png
diff --git a/data/emoticons/noto-emoticons/png/u1f62e.png b/gajim/data/emoticons/noto-emoticons/png/u1f62e.png
index 44d438199..44d438199 100644
--- a/data/emoticons/noto-emoticons/png/u1f62e.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f62e.png
diff --git a/data/emoticons/noto-emoticons/png/u1f62f.png b/gajim/data/emoticons/noto-emoticons/png/u1f62f.png
index bfda25b7f..bfda25b7f 100644
--- a/data/emoticons/noto-emoticons/png/u1f62f.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f62f.png
diff --git a/data/emoticons/noto-emoticons/png/u1f630.png b/gajim/data/emoticons/noto-emoticons/png/u1f630.png
index c38c4bee6..c38c4bee6 100644
--- a/data/emoticons/noto-emoticons/png/u1f630.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f630.png
diff --git a/data/emoticons/noto-emoticons/png/u1f631.png b/gajim/data/emoticons/noto-emoticons/png/u1f631.png
index 03473e219..03473e219 100644
--- a/data/emoticons/noto-emoticons/png/u1f631.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f631.png
diff --git a/data/emoticons/noto-emoticons/png/u1f632.png b/gajim/data/emoticons/noto-emoticons/png/u1f632.png
index 6d2e178c0..6d2e178c0 100644
--- a/data/emoticons/noto-emoticons/png/u1f632.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f632.png
diff --git a/data/emoticons/noto-emoticons/png/u1f633.png b/gajim/data/emoticons/noto-emoticons/png/u1f633.png
index d55efff07..d55efff07 100644
--- a/data/emoticons/noto-emoticons/png/u1f633.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f633.png
diff --git a/data/emoticons/noto-emoticons/png/u1f634.png b/gajim/data/emoticons/noto-emoticons/png/u1f634.png
index 803599a9b..803599a9b 100644
--- a/data/emoticons/noto-emoticons/png/u1f634.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f634.png
diff --git a/data/emoticons/noto-emoticons/png/u1f635.png b/gajim/data/emoticons/noto-emoticons/png/u1f635.png
index db969d7da..db969d7da 100644
--- a/data/emoticons/noto-emoticons/png/u1f635.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f635.png
diff --git a/data/emoticons/noto-emoticons/png/u1f636.png b/gajim/data/emoticons/noto-emoticons/png/u1f636.png
index 8afa1ce9d..8afa1ce9d 100644
--- a/data/emoticons/noto-emoticons/png/u1f636.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f636.png
diff --git a/data/emoticons/noto-emoticons/png/u1f637.png b/gajim/data/emoticons/noto-emoticons/png/u1f637.png
index f33511c3d..f33511c3d 100644
--- a/data/emoticons/noto-emoticons/png/u1f637.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f637.png
diff --git a/data/emoticons/noto-emoticons/png/u1f638.png b/gajim/data/emoticons/noto-emoticons/png/u1f638.png
index 85350607a..85350607a 100644
--- a/data/emoticons/noto-emoticons/png/u1f638.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f638.png
diff --git a/data/emoticons/noto-emoticons/png/u1f639.png b/gajim/data/emoticons/noto-emoticons/png/u1f639.png
index a0cd1eddb..a0cd1eddb 100644
--- a/data/emoticons/noto-emoticons/png/u1f639.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f639.png
diff --git a/data/emoticons/noto-emoticons/png/u1f63a.png b/gajim/data/emoticons/noto-emoticons/png/u1f63a.png
index e73e88f19..e73e88f19 100644
--- a/data/emoticons/noto-emoticons/png/u1f63a.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f63a.png
diff --git a/data/emoticons/noto-emoticons/png/u1f63b.png b/gajim/data/emoticons/noto-emoticons/png/u1f63b.png
index 5c018974d..5c018974d 100644
--- a/data/emoticons/noto-emoticons/png/u1f63b.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f63b.png
diff --git a/data/emoticons/noto-emoticons/png/u1f63c.png b/gajim/data/emoticons/noto-emoticons/png/u1f63c.png
index 8caa71755..8caa71755 100644
--- a/data/emoticons/noto-emoticons/png/u1f63c.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f63c.png
diff --git a/data/emoticons/noto-emoticons/png/u1f63d.png b/gajim/data/emoticons/noto-emoticons/png/u1f63d.png
index ccf1fbf91..ccf1fbf91 100644
--- a/data/emoticons/noto-emoticons/png/u1f63d.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f63d.png
diff --git a/data/emoticons/noto-emoticons/png/u1f63e.png b/gajim/data/emoticons/noto-emoticons/png/u1f63e.png
index b57a7923b..b57a7923b 100644
--- a/data/emoticons/noto-emoticons/png/u1f63e.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f63e.png
diff --git a/data/emoticons/noto-emoticons/png/u1f63f.png b/gajim/data/emoticons/noto-emoticons/png/u1f63f.png
index fabeab9be..fabeab9be 100644
--- a/data/emoticons/noto-emoticons/png/u1f63f.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f63f.png
diff --git a/data/emoticons/noto-emoticons/png/u1f640.png b/gajim/data/emoticons/noto-emoticons/png/u1f640.png
index 7d775cc71..7d775cc71 100644
--- a/data/emoticons/noto-emoticons/png/u1f640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f641.png b/gajim/data/emoticons/noto-emoticons/png/u1f641.png
index 49b920de8..49b920de8 100644
--- a/data/emoticons/noto-emoticons/png/u1f641.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f641.png
diff --git a/data/emoticons/noto-emoticons/png/u1f642.png b/gajim/data/emoticons/noto-emoticons/png/u1f642.png
index 0508aa01a..0508aa01a 100644
--- a/data/emoticons/noto-emoticons/png/u1f642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f643.png b/gajim/data/emoticons/noto-emoticons/png/u1f643.png
index 98364a6a9..98364a6a9 100644
--- a/data/emoticons/noto-emoticons/png/u1f643.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f643.png
diff --git a/data/emoticons/noto-emoticons/png/u1f644.png b/gajim/data/emoticons/noto-emoticons/png/u1f644.png
index 54ea3f042..54ea3f042 100644
--- a/data/emoticons/noto-emoticons/png/u1f644.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f644.png
diff --git a/data/emoticons/noto-emoticons/png/u1f645.png b/gajim/data/emoticons/noto-emoticons/png/u1f645.png
index fbd359ea1..fbd359ea1 100644
--- a/data/emoticons/noto-emoticons/png/u1f645.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f645.png
diff --git a/data/emoticons/noto-emoticons/png/u1f645_1f3fb.png b/gajim/data/emoticons/noto-emoticons/png/u1f645_1f3fb.png
index 163bef307..163bef307 100644
--- a/data/emoticons/noto-emoticons/png/u1f645_1f3fb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f645_1f3fb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f645_1f3fb_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f645_1f3fb_200d_2640.png
index 163bef307..163bef307 100644
--- a/data/emoticons/noto-emoticons/png/u1f645_1f3fb_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f645_1f3fb_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f645_1f3fb_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f645_1f3fb_200d_2642.png
index 71033e5c9..71033e5c9 100644
--- a/data/emoticons/noto-emoticons/png/u1f645_1f3fb_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f645_1f3fb_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f645_1f3fc.png b/gajim/data/emoticons/noto-emoticons/png/u1f645_1f3fc.png
index ac88008d2..ac88008d2 100644
--- a/data/emoticons/noto-emoticons/png/u1f645_1f3fc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f645_1f3fc.png
diff --git a/data/emoticons/noto-emoticons/png/u1f645_1f3fc_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f645_1f3fc_200d_2640.png
index ac88008d2..ac88008d2 100644
--- a/data/emoticons/noto-emoticons/png/u1f645_1f3fc_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f645_1f3fc_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f645_1f3fc_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f645_1f3fc_200d_2642.png
index 7e507c387..7e507c387 100644
--- a/data/emoticons/noto-emoticons/png/u1f645_1f3fc_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f645_1f3fc_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f645_1f3fd.png b/gajim/data/emoticons/noto-emoticons/png/u1f645_1f3fd.png
index e4f9f25aa..e4f9f25aa 100644
--- a/data/emoticons/noto-emoticons/png/u1f645_1f3fd.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f645_1f3fd.png
diff --git a/data/emoticons/noto-emoticons/png/u1f645_1f3fd_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f645_1f3fd_200d_2640.png
index e4f9f25aa..e4f9f25aa 100644
--- a/data/emoticons/noto-emoticons/png/u1f645_1f3fd_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f645_1f3fd_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f645_1f3fd_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f645_1f3fd_200d_2642.png
index 0d0e4ae2a..0d0e4ae2a 100644
--- a/data/emoticons/noto-emoticons/png/u1f645_1f3fd_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f645_1f3fd_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f645_1f3fe.png b/gajim/data/emoticons/noto-emoticons/png/u1f645_1f3fe.png
index 1157b6ac5..1157b6ac5 100644
--- a/data/emoticons/noto-emoticons/png/u1f645_1f3fe.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f645_1f3fe.png
diff --git a/data/emoticons/noto-emoticons/png/u1f645_1f3fe_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f645_1f3fe_200d_2640.png
index 1157b6ac5..1157b6ac5 100644
--- a/data/emoticons/noto-emoticons/png/u1f645_1f3fe_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f645_1f3fe_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f645_1f3fe_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f645_1f3fe_200d_2642.png
index c4e9e2750..c4e9e2750 100644
--- a/data/emoticons/noto-emoticons/png/u1f645_1f3fe_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f645_1f3fe_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f645_1f3ff.png b/gajim/data/emoticons/noto-emoticons/png/u1f645_1f3ff.png
index df49fd4b8..df49fd4b8 100644
--- a/data/emoticons/noto-emoticons/png/u1f645_1f3ff.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f645_1f3ff.png
diff --git a/data/emoticons/noto-emoticons/png/u1f645_1f3ff_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f645_1f3ff_200d_2640.png
index df49fd4b8..df49fd4b8 100644
--- a/data/emoticons/noto-emoticons/png/u1f645_1f3ff_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f645_1f3ff_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f645_1f3ff_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f645_1f3ff_200d_2642.png
index 5ecb28a1b..5ecb28a1b 100644
--- a/data/emoticons/noto-emoticons/png/u1f645_1f3ff_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f645_1f3ff_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f645_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f645_200d_2640.png
index fbd359ea1..fbd359ea1 100644
--- a/data/emoticons/noto-emoticons/png/u1f645_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f645_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f645_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f645_200d_2642.png
index d37a660f5..d37a660f5 100644
--- a/data/emoticons/noto-emoticons/png/u1f645_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f645_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f646.png b/gajim/data/emoticons/noto-emoticons/png/u1f646.png
index a8dad495f..a8dad495f 100644
--- a/data/emoticons/noto-emoticons/png/u1f646.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f646.png
diff --git a/data/emoticons/noto-emoticons/png/u1f646_1f3fb.png b/gajim/data/emoticons/noto-emoticons/png/u1f646_1f3fb.png
index eeb879b7a..eeb879b7a 100644
--- a/data/emoticons/noto-emoticons/png/u1f646_1f3fb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f646_1f3fb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f646_1f3fb_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f646_1f3fb_200d_2640.png
index eeb879b7a..eeb879b7a 100644
--- a/data/emoticons/noto-emoticons/png/u1f646_1f3fb_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f646_1f3fb_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f646_1f3fb_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f646_1f3fb_200d_2642.png
index c6118fcc1..c6118fcc1 100644
--- a/data/emoticons/noto-emoticons/png/u1f646_1f3fb_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f646_1f3fb_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f646_1f3fc.png b/gajim/data/emoticons/noto-emoticons/png/u1f646_1f3fc.png
index c0b7d6036..c0b7d6036 100644
--- a/data/emoticons/noto-emoticons/png/u1f646_1f3fc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f646_1f3fc.png
diff --git a/data/emoticons/noto-emoticons/png/u1f646_1f3fc_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f646_1f3fc_200d_2640.png
index c0b7d6036..c0b7d6036 100644
--- a/data/emoticons/noto-emoticons/png/u1f646_1f3fc_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f646_1f3fc_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f646_1f3fc_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f646_1f3fc_200d_2642.png
index 95dcc996d..95dcc996d 100644
--- a/data/emoticons/noto-emoticons/png/u1f646_1f3fc_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f646_1f3fc_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f646_1f3fd.png b/gajim/data/emoticons/noto-emoticons/png/u1f646_1f3fd.png
index 190141d50..190141d50 100644
--- a/data/emoticons/noto-emoticons/png/u1f646_1f3fd.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f646_1f3fd.png
diff --git a/data/emoticons/noto-emoticons/png/u1f646_1f3fd_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f646_1f3fd_200d_2640.png
index 190141d50..190141d50 100644
--- a/data/emoticons/noto-emoticons/png/u1f646_1f3fd_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f646_1f3fd_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f646_1f3fd_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f646_1f3fd_200d_2642.png
index fe806a15d2..fe806a15d2 100644
--- a/data/emoticons/noto-emoticons/png/u1f646_1f3fd_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f646_1f3fd_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f646_1f3fe.png b/gajim/data/emoticons/noto-emoticons/png/u1f646_1f3fe.png
index d94fd6b46..d94fd6b46 100644
--- a/data/emoticons/noto-emoticons/png/u1f646_1f3fe.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f646_1f3fe.png
diff --git a/data/emoticons/noto-emoticons/png/u1f646_1f3fe_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f646_1f3fe_200d_2640.png
index d94fd6b46..d94fd6b46 100644
--- a/data/emoticons/noto-emoticons/png/u1f646_1f3fe_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f646_1f3fe_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f646_1f3fe_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f646_1f3fe_200d_2642.png
index 2334ef449..2334ef449 100644
--- a/data/emoticons/noto-emoticons/png/u1f646_1f3fe_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f646_1f3fe_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f646_1f3ff.png b/gajim/data/emoticons/noto-emoticons/png/u1f646_1f3ff.png
index b8ed8f316..b8ed8f316 100644
--- a/data/emoticons/noto-emoticons/png/u1f646_1f3ff.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f646_1f3ff.png
diff --git a/data/emoticons/noto-emoticons/png/u1f646_1f3ff_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f646_1f3ff_200d_2640.png
index b8ed8f316..b8ed8f316 100644
--- a/data/emoticons/noto-emoticons/png/u1f646_1f3ff_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f646_1f3ff_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f646_1f3ff_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f646_1f3ff_200d_2642.png
index 4d6c831cb..4d6c831cb 100644
--- a/data/emoticons/noto-emoticons/png/u1f646_1f3ff_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f646_1f3ff_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f646_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f646_200d_2640.png
index a8dad495f..a8dad495f 100644
--- a/data/emoticons/noto-emoticons/png/u1f646_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f646_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f646_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f646_200d_2642.png
index 9eb567368..9eb567368 100644
--- a/data/emoticons/noto-emoticons/png/u1f646_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f646_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f647.png b/gajim/data/emoticons/noto-emoticons/png/u1f647.png
index b297b8727..b297b8727 100644
--- a/data/emoticons/noto-emoticons/png/u1f647.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f647.png
diff --git a/data/emoticons/noto-emoticons/png/u1f647_1f3fb.png b/gajim/data/emoticons/noto-emoticons/png/u1f647_1f3fb.png
index 8d21941dc..8d21941dc 100644
--- a/data/emoticons/noto-emoticons/png/u1f647_1f3fb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f647_1f3fb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f647_1f3fb_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f647_1f3fb_200d_2640.png
index 6eceda7f4..6eceda7f4 100644
--- a/data/emoticons/noto-emoticons/png/u1f647_1f3fb_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f647_1f3fb_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f647_1f3fb_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f647_1f3fb_200d_2642.png
index 8d21941dc..8d21941dc 100644
--- a/data/emoticons/noto-emoticons/png/u1f647_1f3fb_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f647_1f3fb_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f647_1f3fc.png b/gajim/data/emoticons/noto-emoticons/png/u1f647_1f3fc.png
index bb27e03a9..bb27e03a9 100644
--- a/data/emoticons/noto-emoticons/png/u1f647_1f3fc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f647_1f3fc.png
diff --git a/data/emoticons/noto-emoticons/png/u1f647_1f3fc_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f647_1f3fc_200d_2640.png
index 38e452c56..38e452c56 100644
--- a/data/emoticons/noto-emoticons/png/u1f647_1f3fc_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f647_1f3fc_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f647_1f3fc_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f647_1f3fc_200d_2642.png
index bb27e03a9..bb27e03a9 100644
--- a/data/emoticons/noto-emoticons/png/u1f647_1f3fc_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f647_1f3fc_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f647_1f3fd.png b/gajim/data/emoticons/noto-emoticons/png/u1f647_1f3fd.png
index 15efbec4e..15efbec4e 100644
--- a/data/emoticons/noto-emoticons/png/u1f647_1f3fd.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f647_1f3fd.png
diff --git a/data/emoticons/noto-emoticons/png/u1f647_1f3fd_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f647_1f3fd_200d_2640.png
index d83e74835..d83e74835 100644
--- a/data/emoticons/noto-emoticons/png/u1f647_1f3fd_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f647_1f3fd_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f647_1f3fd_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f647_1f3fd_200d_2642.png
index 15efbec4e..15efbec4e 100644
--- a/data/emoticons/noto-emoticons/png/u1f647_1f3fd_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f647_1f3fd_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f647_1f3fe.png b/gajim/data/emoticons/noto-emoticons/png/u1f647_1f3fe.png
index 2abf2894e..2abf2894e 100644
--- a/data/emoticons/noto-emoticons/png/u1f647_1f3fe.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f647_1f3fe.png
diff --git a/data/emoticons/noto-emoticons/png/u1f647_1f3fe_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f647_1f3fe_200d_2640.png
index ce4bee34e..ce4bee34e 100644
--- a/data/emoticons/noto-emoticons/png/u1f647_1f3fe_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f647_1f3fe_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f647_1f3fe_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f647_1f3fe_200d_2642.png
index 2abf2894e..2abf2894e 100644
--- a/data/emoticons/noto-emoticons/png/u1f647_1f3fe_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f647_1f3fe_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f647_1f3ff.png b/gajim/data/emoticons/noto-emoticons/png/u1f647_1f3ff.png
index 0b5560b52..0b5560b52 100644
--- a/data/emoticons/noto-emoticons/png/u1f647_1f3ff.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f647_1f3ff.png
diff --git a/data/emoticons/noto-emoticons/png/u1f647_1f3ff_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f647_1f3ff_200d_2640.png
index 8e473e933..8e473e933 100644
--- a/data/emoticons/noto-emoticons/png/u1f647_1f3ff_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f647_1f3ff_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f647_1f3ff_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f647_1f3ff_200d_2642.png
index 0b5560b52..0b5560b52 100644
--- a/data/emoticons/noto-emoticons/png/u1f647_1f3ff_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f647_1f3ff_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f647_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f647_200d_2640.png
index 365dce9d6..365dce9d6 100644
--- a/data/emoticons/noto-emoticons/png/u1f647_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f647_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f647_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f647_200d_2642.png
index b297b8727..b297b8727 100644
--- a/data/emoticons/noto-emoticons/png/u1f647_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f647_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f648.png b/gajim/data/emoticons/noto-emoticons/png/u1f648.png
index ec9518d2a..ec9518d2a 100644
--- a/data/emoticons/noto-emoticons/png/u1f648.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f648.png
diff --git a/data/emoticons/noto-emoticons/png/u1f649.png b/gajim/data/emoticons/noto-emoticons/png/u1f649.png
index f6d6de3c9..f6d6de3c9 100644
--- a/data/emoticons/noto-emoticons/png/u1f649.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f649.png
diff --git a/data/emoticons/noto-emoticons/png/u1f64a.png b/gajim/data/emoticons/noto-emoticons/png/u1f64a.png
index 1c21bd335..1c21bd335 100644
--- a/data/emoticons/noto-emoticons/png/u1f64a.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f64a.png
diff --git a/data/emoticons/noto-emoticons/png/u1f64b.png b/gajim/data/emoticons/noto-emoticons/png/u1f64b.png
index a991e02e5..a991e02e5 100644
--- a/data/emoticons/noto-emoticons/png/u1f64b.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f64b.png
diff --git a/data/emoticons/noto-emoticons/png/u1f64b_1f3fb.png b/gajim/data/emoticons/noto-emoticons/png/u1f64b_1f3fb.png
index 40d0a83ce..40d0a83ce 100644
--- a/data/emoticons/noto-emoticons/png/u1f64b_1f3fb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f64b_1f3fb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f64b_1f3fb_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f64b_1f3fb_200d_2640.png
index 40d0a83ce..40d0a83ce 100644
--- a/data/emoticons/noto-emoticons/png/u1f64b_1f3fb_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f64b_1f3fb_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f64b_1f3fb_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f64b_1f3fb_200d_2642.png
index 462c5269f..462c5269f 100644
--- a/data/emoticons/noto-emoticons/png/u1f64b_1f3fb_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f64b_1f3fb_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f64b_1f3fc.png b/gajim/data/emoticons/noto-emoticons/png/u1f64b_1f3fc.png
index 51c9c80cf..51c9c80cf 100644
--- a/data/emoticons/noto-emoticons/png/u1f64b_1f3fc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f64b_1f3fc.png
diff --git a/data/emoticons/noto-emoticons/png/u1f64b_1f3fc_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f64b_1f3fc_200d_2640.png
index 51c9c80cf..51c9c80cf 100644
--- a/data/emoticons/noto-emoticons/png/u1f64b_1f3fc_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f64b_1f3fc_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f64b_1f3fc_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f64b_1f3fc_200d_2642.png
index 981df3ba6..981df3ba6 100644
--- a/data/emoticons/noto-emoticons/png/u1f64b_1f3fc_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f64b_1f3fc_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f64b_1f3fd.png b/gajim/data/emoticons/noto-emoticons/png/u1f64b_1f3fd.png
index 279352c34..279352c34 100644
--- a/data/emoticons/noto-emoticons/png/u1f64b_1f3fd.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f64b_1f3fd.png
diff --git a/data/emoticons/noto-emoticons/png/u1f64b_1f3fd_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f64b_1f3fd_200d_2640.png
index 279352c34..279352c34 100644
--- a/data/emoticons/noto-emoticons/png/u1f64b_1f3fd_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f64b_1f3fd_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f64b_1f3fd_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f64b_1f3fd_200d_2642.png
index a82584f63..a82584f63 100644
--- a/data/emoticons/noto-emoticons/png/u1f64b_1f3fd_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f64b_1f3fd_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f64b_1f3fe.png b/gajim/data/emoticons/noto-emoticons/png/u1f64b_1f3fe.png
index 51dff58e7..51dff58e7 100644
--- a/data/emoticons/noto-emoticons/png/u1f64b_1f3fe.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f64b_1f3fe.png
diff --git a/data/emoticons/noto-emoticons/png/u1f64b_1f3fe_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f64b_1f3fe_200d_2640.png
index 51dff58e7..51dff58e7 100644
--- a/data/emoticons/noto-emoticons/png/u1f64b_1f3fe_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f64b_1f3fe_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f64b_1f3fe_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f64b_1f3fe_200d_2642.png
index 742145b62..742145b62 100644
--- a/data/emoticons/noto-emoticons/png/u1f64b_1f3fe_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f64b_1f3fe_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f64b_1f3ff.png b/gajim/data/emoticons/noto-emoticons/png/u1f64b_1f3ff.png
index f0ed0e32d..f0ed0e32d 100644
--- a/data/emoticons/noto-emoticons/png/u1f64b_1f3ff.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f64b_1f3ff.png
diff --git a/data/emoticons/noto-emoticons/png/u1f64b_1f3ff_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f64b_1f3ff_200d_2640.png
index f0ed0e32d..f0ed0e32d 100644
--- a/data/emoticons/noto-emoticons/png/u1f64b_1f3ff_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f64b_1f3ff_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f64b_1f3ff_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f64b_1f3ff_200d_2642.png
index e6de83d5e..e6de83d5e 100644
--- a/data/emoticons/noto-emoticons/png/u1f64b_1f3ff_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f64b_1f3ff_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f64b_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f64b_200d_2640.png
index a991e02e5..a991e02e5 100644
--- a/data/emoticons/noto-emoticons/png/u1f64b_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f64b_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f64b_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f64b_200d_2642.png
index f515b417f..f515b417f 100644
--- a/data/emoticons/noto-emoticons/png/u1f64b_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f64b_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f64c.png b/gajim/data/emoticons/noto-emoticons/png/u1f64c.png
index d53b9771d..d53b9771d 100644
--- a/data/emoticons/noto-emoticons/png/u1f64c.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f64c.png
diff --git a/data/emoticons/noto-emoticons/png/u1f64c_1f3fb.png b/gajim/data/emoticons/noto-emoticons/png/u1f64c_1f3fb.png
index 40625efa1..40625efa1 100644
--- a/data/emoticons/noto-emoticons/png/u1f64c_1f3fb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f64c_1f3fb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f64c_1f3fc.png b/gajim/data/emoticons/noto-emoticons/png/u1f64c_1f3fc.png
index 0202c33f9..0202c33f9 100644
--- a/data/emoticons/noto-emoticons/png/u1f64c_1f3fc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f64c_1f3fc.png
diff --git a/data/emoticons/noto-emoticons/png/u1f64c_1f3fd.png b/gajim/data/emoticons/noto-emoticons/png/u1f64c_1f3fd.png
index e7dc7858d..e7dc7858d 100644
--- a/data/emoticons/noto-emoticons/png/u1f64c_1f3fd.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f64c_1f3fd.png
diff --git a/data/emoticons/noto-emoticons/png/u1f64c_1f3fe.png b/gajim/data/emoticons/noto-emoticons/png/u1f64c_1f3fe.png
index 3e6317446..3e6317446 100644
--- a/data/emoticons/noto-emoticons/png/u1f64c_1f3fe.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f64c_1f3fe.png
diff --git a/data/emoticons/noto-emoticons/png/u1f64c_1f3ff.png b/gajim/data/emoticons/noto-emoticons/png/u1f64c_1f3ff.png
index f0a878e80..f0a878e80 100644
--- a/data/emoticons/noto-emoticons/png/u1f64c_1f3ff.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f64c_1f3ff.png
diff --git a/data/emoticons/noto-emoticons/png/u1f64d.png b/gajim/data/emoticons/noto-emoticons/png/u1f64d.png
index e3d00e00a..e3d00e00a 100644
--- a/data/emoticons/noto-emoticons/png/u1f64d.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f64d.png
diff --git a/data/emoticons/noto-emoticons/png/u1f64d_1f3fb.png b/gajim/data/emoticons/noto-emoticons/png/u1f64d_1f3fb.png
index b8ae337ba..b8ae337ba 100644
--- a/data/emoticons/noto-emoticons/png/u1f64d_1f3fb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f64d_1f3fb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f64d_1f3fb_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f64d_1f3fb_200d_2640.png
index b8ae337ba..b8ae337ba 100644
--- a/data/emoticons/noto-emoticons/png/u1f64d_1f3fb_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f64d_1f3fb_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f64d_1f3fb_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f64d_1f3fb_200d_2642.png
index cda47302f..cda47302f 100644
--- a/data/emoticons/noto-emoticons/png/u1f64d_1f3fb_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f64d_1f3fb_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f64d_1f3fc.png b/gajim/data/emoticons/noto-emoticons/png/u1f64d_1f3fc.png
index 431804076..431804076 100644
--- a/data/emoticons/noto-emoticons/png/u1f64d_1f3fc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f64d_1f3fc.png
diff --git a/data/emoticons/noto-emoticons/png/u1f64d_1f3fc_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f64d_1f3fc_200d_2640.png
index 431804076..431804076 100644
--- a/data/emoticons/noto-emoticons/png/u1f64d_1f3fc_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f64d_1f3fc_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f64d_1f3fc_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f64d_1f3fc_200d_2642.png
index a969127d3..a969127d3 100644
--- a/data/emoticons/noto-emoticons/png/u1f64d_1f3fc_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f64d_1f3fc_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f64d_1f3fd.png b/gajim/data/emoticons/noto-emoticons/png/u1f64d_1f3fd.png
index 92ef7f3b6..92ef7f3b6 100644
--- a/data/emoticons/noto-emoticons/png/u1f64d_1f3fd.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f64d_1f3fd.png
diff --git a/data/emoticons/noto-emoticons/png/u1f64d_1f3fd_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f64d_1f3fd_200d_2640.png
index 92ef7f3b6..92ef7f3b6 100644
--- a/data/emoticons/noto-emoticons/png/u1f64d_1f3fd_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f64d_1f3fd_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f64d_1f3fd_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f64d_1f3fd_200d_2642.png
index 47ac838ea..47ac838ea 100644
--- a/data/emoticons/noto-emoticons/png/u1f64d_1f3fd_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f64d_1f3fd_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f64d_1f3fe.png b/gajim/data/emoticons/noto-emoticons/png/u1f64d_1f3fe.png
index b7635dba7..b7635dba7 100644
--- a/data/emoticons/noto-emoticons/png/u1f64d_1f3fe.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f64d_1f3fe.png
diff --git a/data/emoticons/noto-emoticons/png/u1f64d_1f3fe_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f64d_1f3fe_200d_2640.png
index b7635dba7..b7635dba7 100644
--- a/data/emoticons/noto-emoticons/png/u1f64d_1f3fe_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f64d_1f3fe_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f64d_1f3fe_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f64d_1f3fe_200d_2642.png
index 2fddf3be8..2fddf3be8 100644
--- a/data/emoticons/noto-emoticons/png/u1f64d_1f3fe_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f64d_1f3fe_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f64d_1f3ff.png b/gajim/data/emoticons/noto-emoticons/png/u1f64d_1f3ff.png
index 22367d328..22367d328 100644
--- a/data/emoticons/noto-emoticons/png/u1f64d_1f3ff.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f64d_1f3ff.png
diff --git a/data/emoticons/noto-emoticons/png/u1f64d_1f3ff_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f64d_1f3ff_200d_2640.png
index 22367d328..22367d328 100644
--- a/data/emoticons/noto-emoticons/png/u1f64d_1f3ff_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f64d_1f3ff_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f64d_1f3ff_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f64d_1f3ff_200d_2642.png
index 617cd695a..617cd695a 100644
--- a/data/emoticons/noto-emoticons/png/u1f64d_1f3ff_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f64d_1f3ff_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f64d_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f64d_200d_2640.png
index e3d00e00a..e3d00e00a 100644
--- a/data/emoticons/noto-emoticons/png/u1f64d_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f64d_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f64d_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f64d_200d_2642.png
index 0d41bae61..0d41bae61 100644
--- a/data/emoticons/noto-emoticons/png/u1f64d_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f64d_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f64e.png b/gajim/data/emoticons/noto-emoticons/png/u1f64e.png
index 43570ef9f..43570ef9f 100644
--- a/data/emoticons/noto-emoticons/png/u1f64e.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f64e.png
diff --git a/data/emoticons/noto-emoticons/png/u1f64e_1f3fb.png b/gajim/data/emoticons/noto-emoticons/png/u1f64e_1f3fb.png
index 1d0ba9680..1d0ba9680 100644
--- a/data/emoticons/noto-emoticons/png/u1f64e_1f3fb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f64e_1f3fb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f64e_1f3fb_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f64e_1f3fb_200d_2640.png
index 1d0ba9680..1d0ba9680 100644
--- a/data/emoticons/noto-emoticons/png/u1f64e_1f3fb_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f64e_1f3fb_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f64e_1f3fb_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f64e_1f3fb_200d_2642.png
index 7ce3a273a..7ce3a273a 100644
--- a/data/emoticons/noto-emoticons/png/u1f64e_1f3fb_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f64e_1f3fb_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f64e_1f3fc.png b/gajim/data/emoticons/noto-emoticons/png/u1f64e_1f3fc.png
index 8babadc47..8babadc47 100644
--- a/data/emoticons/noto-emoticons/png/u1f64e_1f3fc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f64e_1f3fc.png
diff --git a/data/emoticons/noto-emoticons/png/u1f64e_1f3fc_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f64e_1f3fc_200d_2640.png
index 8babadc47..8babadc47 100644
--- a/data/emoticons/noto-emoticons/png/u1f64e_1f3fc_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f64e_1f3fc_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f64e_1f3fc_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f64e_1f3fc_200d_2642.png
index fff741a11..fff741a11 100644
--- a/data/emoticons/noto-emoticons/png/u1f64e_1f3fc_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f64e_1f3fc_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f64e_1f3fd.png b/gajim/data/emoticons/noto-emoticons/png/u1f64e_1f3fd.png
index 15dd14551..15dd14551 100644
--- a/data/emoticons/noto-emoticons/png/u1f64e_1f3fd.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f64e_1f3fd.png
diff --git a/data/emoticons/noto-emoticons/png/u1f64e_1f3fd_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f64e_1f3fd_200d_2640.png
index 15dd14551..15dd14551 100644
--- a/data/emoticons/noto-emoticons/png/u1f64e_1f3fd_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f64e_1f3fd_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f64e_1f3fd_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f64e_1f3fd_200d_2642.png
index fa54f3aed..fa54f3aed 100644
--- a/data/emoticons/noto-emoticons/png/u1f64e_1f3fd_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f64e_1f3fd_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f64e_1f3fe.png b/gajim/data/emoticons/noto-emoticons/png/u1f64e_1f3fe.png
index 5c8bd4fb0..5c8bd4fb0 100644
--- a/data/emoticons/noto-emoticons/png/u1f64e_1f3fe.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f64e_1f3fe.png
diff --git a/data/emoticons/noto-emoticons/png/u1f64e_1f3fe_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f64e_1f3fe_200d_2640.png
index 5c8bd4fb0..5c8bd4fb0 100644
--- a/data/emoticons/noto-emoticons/png/u1f64e_1f3fe_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f64e_1f3fe_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f64e_1f3fe_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f64e_1f3fe_200d_2642.png
index 287ad93d1..287ad93d1 100644
--- a/data/emoticons/noto-emoticons/png/u1f64e_1f3fe_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f64e_1f3fe_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f64e_1f3ff.png b/gajim/data/emoticons/noto-emoticons/png/u1f64e_1f3ff.png
index 524677b74..524677b74 100644
--- a/data/emoticons/noto-emoticons/png/u1f64e_1f3ff.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f64e_1f3ff.png
diff --git a/data/emoticons/noto-emoticons/png/u1f64e_1f3ff_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f64e_1f3ff_200d_2640.png
index 524677b74..524677b74 100644
--- a/data/emoticons/noto-emoticons/png/u1f64e_1f3ff_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f64e_1f3ff_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f64e_1f3ff_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f64e_1f3ff_200d_2642.png
index 535f9aed6..535f9aed6 100644
--- a/data/emoticons/noto-emoticons/png/u1f64e_1f3ff_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f64e_1f3ff_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f64e_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f64e_200d_2640.png
index 43570ef9f..43570ef9f 100644
--- a/data/emoticons/noto-emoticons/png/u1f64e_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f64e_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f64e_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f64e_200d_2642.png
index 5423e4f39..5423e4f39 100644
--- a/data/emoticons/noto-emoticons/png/u1f64e_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f64e_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f64f.png b/gajim/data/emoticons/noto-emoticons/png/u1f64f.png
index 4b6b83c40..4b6b83c40 100644
--- a/data/emoticons/noto-emoticons/png/u1f64f.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f64f.png
diff --git a/data/emoticons/noto-emoticons/png/u1f64f_1f3fb.png b/gajim/data/emoticons/noto-emoticons/png/u1f64f_1f3fb.png
index b3800cb16..b3800cb16 100644
--- a/data/emoticons/noto-emoticons/png/u1f64f_1f3fb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f64f_1f3fb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f64f_1f3fc.png b/gajim/data/emoticons/noto-emoticons/png/u1f64f_1f3fc.png
index febdbec0a..febdbec0a 100644
--- a/data/emoticons/noto-emoticons/png/u1f64f_1f3fc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f64f_1f3fc.png
diff --git a/data/emoticons/noto-emoticons/png/u1f64f_1f3fd.png b/gajim/data/emoticons/noto-emoticons/png/u1f64f_1f3fd.png
index 7e94cf404..7e94cf404 100644
--- a/data/emoticons/noto-emoticons/png/u1f64f_1f3fd.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f64f_1f3fd.png
diff --git a/data/emoticons/noto-emoticons/png/u1f64f_1f3fe.png b/gajim/data/emoticons/noto-emoticons/png/u1f64f_1f3fe.png
index 7e413fd90..7e413fd90 100644
--- a/data/emoticons/noto-emoticons/png/u1f64f_1f3fe.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f64f_1f3fe.png
diff --git a/data/emoticons/noto-emoticons/png/u1f64f_1f3ff.png b/gajim/data/emoticons/noto-emoticons/png/u1f64f_1f3ff.png
index 28fc26da8..28fc26da8 100644
--- a/data/emoticons/noto-emoticons/png/u1f64f_1f3ff.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f64f_1f3ff.png
diff --git a/data/emoticons/noto-emoticons/png/u1f680.png b/gajim/data/emoticons/noto-emoticons/png/u1f680.png
index d46526a9f..d46526a9f 100644
--- a/data/emoticons/noto-emoticons/png/u1f680.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f680.png
diff --git a/data/emoticons/noto-emoticons/png/u1f681.png b/gajim/data/emoticons/noto-emoticons/png/u1f681.png
index 519e7eb43..519e7eb43 100644
--- a/data/emoticons/noto-emoticons/png/u1f681.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f681.png
diff --git a/data/emoticons/noto-emoticons/png/u1f682.png b/gajim/data/emoticons/noto-emoticons/png/u1f682.png
index 4b322310a..4b322310a 100644
--- a/data/emoticons/noto-emoticons/png/u1f682.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f682.png
diff --git a/data/emoticons/noto-emoticons/png/u1f683.png b/gajim/data/emoticons/noto-emoticons/png/u1f683.png
index 289fcaa45..289fcaa45 100644
--- a/data/emoticons/noto-emoticons/png/u1f683.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f683.png
diff --git a/data/emoticons/noto-emoticons/png/u1f684.png b/gajim/data/emoticons/noto-emoticons/png/u1f684.png
index 3200cbd50..3200cbd50 100644
--- a/data/emoticons/noto-emoticons/png/u1f684.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f684.png
diff --git a/data/emoticons/noto-emoticons/png/u1f685.png b/gajim/data/emoticons/noto-emoticons/png/u1f685.png
index c3676ede1..c3676ede1 100644
--- a/data/emoticons/noto-emoticons/png/u1f685.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f685.png
diff --git a/data/emoticons/noto-emoticons/png/u1f686.png b/gajim/data/emoticons/noto-emoticons/png/u1f686.png
index 14c67551a..14c67551a 100644
--- a/data/emoticons/noto-emoticons/png/u1f686.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f686.png
diff --git a/data/emoticons/noto-emoticons/png/u1f687.png b/gajim/data/emoticons/noto-emoticons/png/u1f687.png
index 141d2066a..141d2066a 100644
--- a/data/emoticons/noto-emoticons/png/u1f687.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f687.png
diff --git a/data/emoticons/noto-emoticons/png/u1f688.png b/gajim/data/emoticons/noto-emoticons/png/u1f688.png
index 65ece3760..65ece3760 100644
--- a/data/emoticons/noto-emoticons/png/u1f688.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f688.png
diff --git a/data/emoticons/noto-emoticons/png/u1f689.png b/gajim/data/emoticons/noto-emoticons/png/u1f689.png
index a4289fc26..a4289fc26 100644
--- a/data/emoticons/noto-emoticons/png/u1f689.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f689.png
diff --git a/data/emoticons/noto-emoticons/png/u1f68a.png b/gajim/data/emoticons/noto-emoticons/png/u1f68a.png
index eb93ccf61..eb93ccf61 100644
--- a/data/emoticons/noto-emoticons/png/u1f68a.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f68a.png
diff --git a/data/emoticons/noto-emoticons/png/u1f68b.png b/gajim/data/emoticons/noto-emoticons/png/u1f68b.png
index 5d1378eef..5d1378eef 100644
--- a/data/emoticons/noto-emoticons/png/u1f68b.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f68b.png
diff --git a/data/emoticons/noto-emoticons/png/u1f68c.png b/gajim/data/emoticons/noto-emoticons/png/u1f68c.png
index 2875557ed..2875557ed 100644
--- a/data/emoticons/noto-emoticons/png/u1f68c.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f68c.png
diff --git a/data/emoticons/noto-emoticons/png/u1f68d.png b/gajim/data/emoticons/noto-emoticons/png/u1f68d.png
index af3fcfd84..af3fcfd84 100644
--- a/data/emoticons/noto-emoticons/png/u1f68d.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f68d.png
diff --git a/data/emoticons/noto-emoticons/png/u1f68e.png b/gajim/data/emoticons/noto-emoticons/png/u1f68e.png
index 4b054774d..4b054774d 100644
--- a/data/emoticons/noto-emoticons/png/u1f68e.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f68e.png
diff --git a/data/emoticons/noto-emoticons/png/u1f68f.png b/gajim/data/emoticons/noto-emoticons/png/u1f68f.png
index 8bd1b9a39..8bd1b9a39 100644
--- a/data/emoticons/noto-emoticons/png/u1f68f.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f68f.png
diff --git a/data/emoticons/noto-emoticons/png/u1f690.png b/gajim/data/emoticons/noto-emoticons/png/u1f690.png
index 5e3df390d..5e3df390d 100644
--- a/data/emoticons/noto-emoticons/png/u1f690.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f690.png
diff --git a/data/emoticons/noto-emoticons/png/u1f691.png b/gajim/data/emoticons/noto-emoticons/png/u1f691.png
index aa9c81924..aa9c81924 100644
--- a/data/emoticons/noto-emoticons/png/u1f691.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f691.png
diff --git a/data/emoticons/noto-emoticons/png/u1f692.png b/gajim/data/emoticons/noto-emoticons/png/u1f692.png
index ec7a14265..ec7a14265 100644
--- a/data/emoticons/noto-emoticons/png/u1f692.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f692.png
diff --git a/data/emoticons/noto-emoticons/png/u1f693.png b/gajim/data/emoticons/noto-emoticons/png/u1f693.png
index b3f9031f3..b3f9031f3 100644
--- a/data/emoticons/noto-emoticons/png/u1f693.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f693.png
diff --git a/data/emoticons/noto-emoticons/png/u1f694.png b/gajim/data/emoticons/noto-emoticons/png/u1f694.png
index 95bcf3c15..95bcf3c15 100644
--- a/data/emoticons/noto-emoticons/png/u1f694.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f694.png
diff --git a/data/emoticons/noto-emoticons/png/u1f695.png b/gajim/data/emoticons/noto-emoticons/png/u1f695.png
index 004df44e1..004df44e1 100644
--- a/data/emoticons/noto-emoticons/png/u1f695.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f695.png
diff --git a/data/emoticons/noto-emoticons/png/u1f696.png b/gajim/data/emoticons/noto-emoticons/png/u1f696.png
index f322c1df5..f322c1df5 100644
--- a/data/emoticons/noto-emoticons/png/u1f696.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f696.png
diff --git a/data/emoticons/noto-emoticons/png/u1f697.png b/gajim/data/emoticons/noto-emoticons/png/u1f697.png
index 817d609af..817d609af 100644
--- a/data/emoticons/noto-emoticons/png/u1f697.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f697.png
diff --git a/data/emoticons/noto-emoticons/png/u1f698.png b/gajim/data/emoticons/noto-emoticons/png/u1f698.png
index 6d7706fa3..6d7706fa3 100644
--- a/data/emoticons/noto-emoticons/png/u1f698.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f698.png
diff --git a/data/emoticons/noto-emoticons/png/u1f699.png b/gajim/data/emoticons/noto-emoticons/png/u1f699.png
index a24b0273b..a24b0273b 100644
--- a/data/emoticons/noto-emoticons/png/u1f699.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f699.png
diff --git a/data/emoticons/noto-emoticons/png/u1f69a.png b/gajim/data/emoticons/noto-emoticons/png/u1f69a.png
index a053dc21f..a053dc21f 100644
--- a/data/emoticons/noto-emoticons/png/u1f69a.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f69a.png
diff --git a/data/emoticons/noto-emoticons/png/u1f69b.png b/gajim/data/emoticons/noto-emoticons/png/u1f69b.png
index 7e29a2376..7e29a2376 100644
--- a/data/emoticons/noto-emoticons/png/u1f69b.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f69b.png
diff --git a/data/emoticons/noto-emoticons/png/u1f69c.png b/gajim/data/emoticons/noto-emoticons/png/u1f69c.png
index 7df32e815..7df32e815 100644
--- a/data/emoticons/noto-emoticons/png/u1f69c.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f69c.png
diff --git a/data/emoticons/noto-emoticons/png/u1f69d.png b/gajim/data/emoticons/noto-emoticons/png/u1f69d.png
index 0002a86c3..0002a86c3 100644
--- a/data/emoticons/noto-emoticons/png/u1f69d.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f69d.png
diff --git a/data/emoticons/noto-emoticons/png/u1f69e.png b/gajim/data/emoticons/noto-emoticons/png/u1f69e.png
index 40c08e2a3..40c08e2a3 100644
--- a/data/emoticons/noto-emoticons/png/u1f69e.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f69e.png
diff --git a/data/emoticons/noto-emoticons/png/u1f69f.png b/gajim/data/emoticons/noto-emoticons/png/u1f69f.png
index a639055bf..a639055bf 100644
--- a/data/emoticons/noto-emoticons/png/u1f69f.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f69f.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6a0.png b/gajim/data/emoticons/noto-emoticons/png/u1f6a0.png
index 46e0b3b54..46e0b3b54 100644
--- a/data/emoticons/noto-emoticons/png/u1f6a0.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6a0.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6a1.png b/gajim/data/emoticons/noto-emoticons/png/u1f6a1.png
index 39b2c0d8f..39b2c0d8f 100644
--- a/data/emoticons/noto-emoticons/png/u1f6a1.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6a1.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6a2.png b/gajim/data/emoticons/noto-emoticons/png/u1f6a2.png
index 3dea2ced3..3dea2ced3 100644
--- a/data/emoticons/noto-emoticons/png/u1f6a2.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6a2.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6a3.png b/gajim/data/emoticons/noto-emoticons/png/u1f6a3.png
index 52debe519..52debe519 100644
--- a/data/emoticons/noto-emoticons/png/u1f6a3.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6a3.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6a3_1f3fb.png b/gajim/data/emoticons/noto-emoticons/png/u1f6a3_1f3fb.png
index 4b7057c76..4b7057c76 100644
--- a/data/emoticons/noto-emoticons/png/u1f6a3_1f3fb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6a3_1f3fb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6a3_1f3fb_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f6a3_1f3fb_200d_2640.png
index 67ad8786b..67ad8786b 100644
--- a/data/emoticons/noto-emoticons/png/u1f6a3_1f3fb_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6a3_1f3fb_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6a3_1f3fb_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f6a3_1f3fb_200d_2642.png
index 4b7057c76..4b7057c76 100644
--- a/data/emoticons/noto-emoticons/png/u1f6a3_1f3fb_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6a3_1f3fb_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6a3_1f3fc.png b/gajim/data/emoticons/noto-emoticons/png/u1f6a3_1f3fc.png
index 99e54d707..99e54d707 100644
--- a/data/emoticons/noto-emoticons/png/u1f6a3_1f3fc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6a3_1f3fc.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6a3_1f3fc_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f6a3_1f3fc_200d_2640.png
index 80688eb6e..80688eb6e 100644
--- a/data/emoticons/noto-emoticons/png/u1f6a3_1f3fc_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6a3_1f3fc_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6a3_1f3fc_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f6a3_1f3fc_200d_2642.png
index 99e54d707..99e54d707 100644
--- a/data/emoticons/noto-emoticons/png/u1f6a3_1f3fc_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6a3_1f3fc_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6a3_1f3fd.png b/gajim/data/emoticons/noto-emoticons/png/u1f6a3_1f3fd.png
index 008708bae..008708bae 100644
--- a/data/emoticons/noto-emoticons/png/u1f6a3_1f3fd.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6a3_1f3fd.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6a3_1f3fd_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f6a3_1f3fd_200d_2640.png
index 8963ce961..8963ce961 100644
--- a/data/emoticons/noto-emoticons/png/u1f6a3_1f3fd_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6a3_1f3fd_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6a3_1f3fd_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f6a3_1f3fd_200d_2642.png
index 008708bae..008708bae 100644
--- a/data/emoticons/noto-emoticons/png/u1f6a3_1f3fd_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6a3_1f3fd_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6a3_1f3fe.png b/gajim/data/emoticons/noto-emoticons/png/u1f6a3_1f3fe.png
index 85d8de09a..85d8de09a 100644
--- a/data/emoticons/noto-emoticons/png/u1f6a3_1f3fe.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6a3_1f3fe.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6a3_1f3fe_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f6a3_1f3fe_200d_2640.png
index 94fb76330..94fb76330 100644
--- a/data/emoticons/noto-emoticons/png/u1f6a3_1f3fe_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6a3_1f3fe_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6a3_1f3fe_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f6a3_1f3fe_200d_2642.png
index 85d8de09a..85d8de09a 100644
--- a/data/emoticons/noto-emoticons/png/u1f6a3_1f3fe_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6a3_1f3fe_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6a3_1f3ff.png b/gajim/data/emoticons/noto-emoticons/png/u1f6a3_1f3ff.png
index 171831ab6..171831ab6 100644
--- a/data/emoticons/noto-emoticons/png/u1f6a3_1f3ff.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6a3_1f3ff.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6a3_1f3ff_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f6a3_1f3ff_200d_2640.png
index 1bc5f17cd..1bc5f17cd 100644
--- a/data/emoticons/noto-emoticons/png/u1f6a3_1f3ff_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6a3_1f3ff_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6a3_1f3ff_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f6a3_1f3ff_200d_2642.png
index 171831ab6..171831ab6 100644
--- a/data/emoticons/noto-emoticons/png/u1f6a3_1f3ff_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6a3_1f3ff_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6a3_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f6a3_200d_2640.png
index 1e26ada8e..1e26ada8e 100644
--- a/data/emoticons/noto-emoticons/png/u1f6a3_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6a3_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6a3_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f6a3_200d_2642.png
index 52debe519..52debe519 100644
--- a/data/emoticons/noto-emoticons/png/u1f6a3_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6a3_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6a4.png b/gajim/data/emoticons/noto-emoticons/png/u1f6a4.png
index 30cd8f6d0..30cd8f6d0 100644
--- a/data/emoticons/noto-emoticons/png/u1f6a4.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6a4.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6a5.png b/gajim/data/emoticons/noto-emoticons/png/u1f6a5.png
index a68a7ffbf..a68a7ffbf 100644
--- a/data/emoticons/noto-emoticons/png/u1f6a5.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6a5.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6a6.png b/gajim/data/emoticons/noto-emoticons/png/u1f6a6.png
index 479dc6129..479dc6129 100644
--- a/data/emoticons/noto-emoticons/png/u1f6a6.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6a6.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6a7.png b/gajim/data/emoticons/noto-emoticons/png/u1f6a7.png
index d7376d228..d7376d228 100644
--- a/data/emoticons/noto-emoticons/png/u1f6a7.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6a7.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6a8.png b/gajim/data/emoticons/noto-emoticons/png/u1f6a8.png
index 5e8167e63..5e8167e63 100644
--- a/data/emoticons/noto-emoticons/png/u1f6a8.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6a8.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6a9.png b/gajim/data/emoticons/noto-emoticons/png/u1f6a9.png
index 69a120396..69a120396 100644
--- a/data/emoticons/noto-emoticons/png/u1f6a9.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6a9.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6aa.png b/gajim/data/emoticons/noto-emoticons/png/u1f6aa.png
index 92b5712bb..92b5712bb 100644
--- a/data/emoticons/noto-emoticons/png/u1f6aa.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6aa.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6ab.png b/gajim/data/emoticons/noto-emoticons/png/u1f6ab.png
index 191ebd368..191ebd368 100644
--- a/data/emoticons/noto-emoticons/png/u1f6ab.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6ab.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6ac.png b/gajim/data/emoticons/noto-emoticons/png/u1f6ac.png
index 7705f808f..7705f808f 100644
--- a/data/emoticons/noto-emoticons/png/u1f6ac.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6ac.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6ad.png b/gajim/data/emoticons/noto-emoticons/png/u1f6ad.png
index 7891bcfc3..7891bcfc3 100644
--- a/data/emoticons/noto-emoticons/png/u1f6ad.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6ad.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6ae.png b/gajim/data/emoticons/noto-emoticons/png/u1f6ae.png
index fbabf6b85..fbabf6b85 100644
--- a/data/emoticons/noto-emoticons/png/u1f6ae.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6ae.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6af.png b/gajim/data/emoticons/noto-emoticons/png/u1f6af.png
index 480e46f31..480e46f31 100644
--- a/data/emoticons/noto-emoticons/png/u1f6af.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6af.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6b0.png b/gajim/data/emoticons/noto-emoticons/png/u1f6b0.png
index 4cbf2dfab..4cbf2dfab 100644
--- a/data/emoticons/noto-emoticons/png/u1f6b0.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6b0.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6b1.png b/gajim/data/emoticons/noto-emoticons/png/u1f6b1.png
index b917291ec..b917291ec 100644
--- a/data/emoticons/noto-emoticons/png/u1f6b1.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6b1.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6b2.png b/gajim/data/emoticons/noto-emoticons/png/u1f6b2.png
index 6c8465f33..6c8465f33 100644
--- a/data/emoticons/noto-emoticons/png/u1f6b2.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6b2.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6b3.png b/gajim/data/emoticons/noto-emoticons/png/u1f6b3.png
index 0c10f37cc..0c10f37cc 100644
--- a/data/emoticons/noto-emoticons/png/u1f6b3.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6b3.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6b4.png b/gajim/data/emoticons/noto-emoticons/png/u1f6b4.png
index 99e512e38..99e512e38 100644
--- a/data/emoticons/noto-emoticons/png/u1f6b4.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6b4.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6b4_1f3fb.png b/gajim/data/emoticons/noto-emoticons/png/u1f6b4_1f3fb.png
index 8cb6311cb..8cb6311cb 100644
--- a/data/emoticons/noto-emoticons/png/u1f6b4_1f3fb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6b4_1f3fb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6b4_1f3fb_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f6b4_1f3fb_200d_2640.png
index 4953c8240..4953c8240 100644
--- a/data/emoticons/noto-emoticons/png/u1f6b4_1f3fb_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6b4_1f3fb_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6b4_1f3fb_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f6b4_1f3fb_200d_2642.png
index 8cb6311cb..8cb6311cb 100644
--- a/data/emoticons/noto-emoticons/png/u1f6b4_1f3fb_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6b4_1f3fb_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6b4_1f3fc.png b/gajim/data/emoticons/noto-emoticons/png/u1f6b4_1f3fc.png
index 0e453e3b8..0e453e3b8 100644
--- a/data/emoticons/noto-emoticons/png/u1f6b4_1f3fc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6b4_1f3fc.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6b4_1f3fc_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f6b4_1f3fc_200d_2640.png
index d61fcc653..d61fcc653 100644
--- a/data/emoticons/noto-emoticons/png/u1f6b4_1f3fc_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6b4_1f3fc_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6b4_1f3fc_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f6b4_1f3fc_200d_2642.png
index 0e453e3b8..0e453e3b8 100644
--- a/data/emoticons/noto-emoticons/png/u1f6b4_1f3fc_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6b4_1f3fc_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6b4_1f3fd.png b/gajim/data/emoticons/noto-emoticons/png/u1f6b4_1f3fd.png
index ec325ff99..ec325ff99 100644
--- a/data/emoticons/noto-emoticons/png/u1f6b4_1f3fd.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6b4_1f3fd.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6b4_1f3fd_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f6b4_1f3fd_200d_2640.png
index 39b2fac5a..39b2fac5a 100644
--- a/data/emoticons/noto-emoticons/png/u1f6b4_1f3fd_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6b4_1f3fd_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6b4_1f3fd_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f6b4_1f3fd_200d_2642.png
index ec325ff99..ec325ff99 100644
--- a/data/emoticons/noto-emoticons/png/u1f6b4_1f3fd_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6b4_1f3fd_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6b4_1f3fe.png b/gajim/data/emoticons/noto-emoticons/png/u1f6b4_1f3fe.png
index a48ac4dea..a48ac4dea 100644
--- a/data/emoticons/noto-emoticons/png/u1f6b4_1f3fe.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6b4_1f3fe.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6b4_1f3fe_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f6b4_1f3fe_200d_2640.png
index b0a299bef..b0a299bef 100644
--- a/data/emoticons/noto-emoticons/png/u1f6b4_1f3fe_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6b4_1f3fe_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6b4_1f3fe_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f6b4_1f3fe_200d_2642.png
index a48ac4dea..a48ac4dea 100644
--- a/data/emoticons/noto-emoticons/png/u1f6b4_1f3fe_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6b4_1f3fe_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6b4_1f3ff.png b/gajim/data/emoticons/noto-emoticons/png/u1f6b4_1f3ff.png
index f60bce31d..f60bce31d 100644
--- a/data/emoticons/noto-emoticons/png/u1f6b4_1f3ff.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6b4_1f3ff.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6b4_1f3ff_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f6b4_1f3ff_200d_2640.png
index 2cc200809..2cc200809 100644
--- a/data/emoticons/noto-emoticons/png/u1f6b4_1f3ff_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6b4_1f3ff_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6b4_1f3ff_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f6b4_1f3ff_200d_2642.png
index f60bce31d..f60bce31d 100644
--- a/data/emoticons/noto-emoticons/png/u1f6b4_1f3ff_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6b4_1f3ff_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6b4_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f6b4_200d_2640.png
index d784b02cc..d784b02cc 100644
--- a/data/emoticons/noto-emoticons/png/u1f6b4_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6b4_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6b4_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f6b4_200d_2642.png
index 99e512e38..99e512e38 100644
--- a/data/emoticons/noto-emoticons/png/u1f6b4_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6b4_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6b5.png b/gajim/data/emoticons/noto-emoticons/png/u1f6b5.png
index ab4cfbe0f..ab4cfbe0f 100644
--- a/data/emoticons/noto-emoticons/png/u1f6b5.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6b5.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6b5_1f3fb.png b/gajim/data/emoticons/noto-emoticons/png/u1f6b5_1f3fb.png
index d5bf75d9d..d5bf75d9d 100644
--- a/data/emoticons/noto-emoticons/png/u1f6b5_1f3fb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6b5_1f3fb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6b5_1f3fb_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f6b5_1f3fb_200d_2640.png
index a1771fde8..a1771fde8 100644
--- a/data/emoticons/noto-emoticons/png/u1f6b5_1f3fb_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6b5_1f3fb_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6b5_1f3fb_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f6b5_1f3fb_200d_2642.png
index d5bf75d9d..d5bf75d9d 100644
--- a/data/emoticons/noto-emoticons/png/u1f6b5_1f3fb_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6b5_1f3fb_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6b5_1f3fc.png b/gajim/data/emoticons/noto-emoticons/png/u1f6b5_1f3fc.png
index e81c6a3c2..e81c6a3c2 100644
--- a/data/emoticons/noto-emoticons/png/u1f6b5_1f3fc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6b5_1f3fc.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6b5_1f3fc_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f6b5_1f3fc_200d_2640.png
index 1005c9be0..1005c9be0 100644
--- a/data/emoticons/noto-emoticons/png/u1f6b5_1f3fc_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6b5_1f3fc_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6b5_1f3fc_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f6b5_1f3fc_200d_2642.png
index e81c6a3c2..e81c6a3c2 100644
--- a/data/emoticons/noto-emoticons/png/u1f6b5_1f3fc_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6b5_1f3fc_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6b5_1f3fd.png b/gajim/data/emoticons/noto-emoticons/png/u1f6b5_1f3fd.png
index 60c94f723..60c94f723 100644
--- a/data/emoticons/noto-emoticons/png/u1f6b5_1f3fd.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6b5_1f3fd.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6b5_1f3fd_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f6b5_1f3fd_200d_2640.png
index e19cb9a9c..e19cb9a9c 100644
--- a/data/emoticons/noto-emoticons/png/u1f6b5_1f3fd_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6b5_1f3fd_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6b5_1f3fd_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f6b5_1f3fd_200d_2642.png
index 60c94f723..60c94f723 100644
--- a/data/emoticons/noto-emoticons/png/u1f6b5_1f3fd_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6b5_1f3fd_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6b5_1f3fe.png b/gajim/data/emoticons/noto-emoticons/png/u1f6b5_1f3fe.png
index d4b1c0258..d4b1c0258 100644
--- a/data/emoticons/noto-emoticons/png/u1f6b5_1f3fe.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6b5_1f3fe.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6b5_1f3fe_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f6b5_1f3fe_200d_2640.png
index c964676a4..c964676a4 100644
--- a/data/emoticons/noto-emoticons/png/u1f6b5_1f3fe_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6b5_1f3fe_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6b5_1f3fe_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f6b5_1f3fe_200d_2642.png
index d4b1c0258..d4b1c0258 100644
--- a/data/emoticons/noto-emoticons/png/u1f6b5_1f3fe_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6b5_1f3fe_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6b5_1f3ff.png b/gajim/data/emoticons/noto-emoticons/png/u1f6b5_1f3ff.png
index 5010c7d1f..5010c7d1f 100644
--- a/data/emoticons/noto-emoticons/png/u1f6b5_1f3ff.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6b5_1f3ff.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6b5_1f3ff_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f6b5_1f3ff_200d_2640.png
index a4d93e70a..a4d93e70a 100644
--- a/data/emoticons/noto-emoticons/png/u1f6b5_1f3ff_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6b5_1f3ff_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6b5_1f3ff_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f6b5_1f3ff_200d_2642.png
index 5010c7d1f..5010c7d1f 100644
--- a/data/emoticons/noto-emoticons/png/u1f6b5_1f3ff_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6b5_1f3ff_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6b5_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f6b5_200d_2640.png
index 2ed6b93cf..2ed6b93cf 100644
--- a/data/emoticons/noto-emoticons/png/u1f6b5_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6b5_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6b5_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f6b5_200d_2642.png
index ab4cfbe0f..ab4cfbe0f 100644
--- a/data/emoticons/noto-emoticons/png/u1f6b5_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6b5_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6b6.png b/gajim/data/emoticons/noto-emoticons/png/u1f6b6.png
index 198d2353b..198d2353b 100644
--- a/data/emoticons/noto-emoticons/png/u1f6b6.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6b6.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6b6_1f3fb.png b/gajim/data/emoticons/noto-emoticons/png/u1f6b6_1f3fb.png
index 21c67b408..21c67b408 100644
--- a/data/emoticons/noto-emoticons/png/u1f6b6_1f3fb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6b6_1f3fb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6b6_1f3fb_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f6b6_1f3fb_200d_2640.png
index d92f6ac06..d92f6ac06 100644
--- a/data/emoticons/noto-emoticons/png/u1f6b6_1f3fb_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6b6_1f3fb_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6b6_1f3fb_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f6b6_1f3fb_200d_2642.png
index 21c67b408..21c67b408 100644
--- a/data/emoticons/noto-emoticons/png/u1f6b6_1f3fb_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6b6_1f3fb_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6b6_1f3fc.png b/gajim/data/emoticons/noto-emoticons/png/u1f6b6_1f3fc.png
index 116e72e7c..116e72e7c 100644
--- a/data/emoticons/noto-emoticons/png/u1f6b6_1f3fc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6b6_1f3fc.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6b6_1f3fc_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f6b6_1f3fc_200d_2640.png
index 60c393949..60c393949 100644
--- a/data/emoticons/noto-emoticons/png/u1f6b6_1f3fc_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6b6_1f3fc_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6b6_1f3fc_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f6b6_1f3fc_200d_2642.png
index 116e72e7c..116e72e7c 100644
--- a/data/emoticons/noto-emoticons/png/u1f6b6_1f3fc_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6b6_1f3fc_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6b6_1f3fd.png b/gajim/data/emoticons/noto-emoticons/png/u1f6b6_1f3fd.png
index b20561ea5..b20561ea5 100644
--- a/data/emoticons/noto-emoticons/png/u1f6b6_1f3fd.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6b6_1f3fd.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6b6_1f3fd_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f6b6_1f3fd_200d_2640.png
index 77e42595b..77e42595b 100644
--- a/data/emoticons/noto-emoticons/png/u1f6b6_1f3fd_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6b6_1f3fd_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6b6_1f3fd_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f6b6_1f3fd_200d_2642.png
index b20561ea5..b20561ea5 100644
--- a/data/emoticons/noto-emoticons/png/u1f6b6_1f3fd_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6b6_1f3fd_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6b6_1f3fe.png b/gajim/data/emoticons/noto-emoticons/png/u1f6b6_1f3fe.png
index 5f26fa16b..5f26fa16b 100644
--- a/data/emoticons/noto-emoticons/png/u1f6b6_1f3fe.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6b6_1f3fe.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6b6_1f3fe_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f6b6_1f3fe_200d_2640.png
index 7913020b4..7913020b4 100644
--- a/data/emoticons/noto-emoticons/png/u1f6b6_1f3fe_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6b6_1f3fe_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6b6_1f3fe_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f6b6_1f3fe_200d_2642.png
index 5f26fa16b..5f26fa16b 100644
--- a/data/emoticons/noto-emoticons/png/u1f6b6_1f3fe_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6b6_1f3fe_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6b6_1f3ff.png b/gajim/data/emoticons/noto-emoticons/png/u1f6b6_1f3ff.png
index d0fe376d5..d0fe376d5 100644
--- a/data/emoticons/noto-emoticons/png/u1f6b6_1f3ff.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6b6_1f3ff.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6b6_1f3ff_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f6b6_1f3ff_200d_2640.png
index 01859bede..01859bede 100644
--- a/data/emoticons/noto-emoticons/png/u1f6b6_1f3ff_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6b6_1f3ff_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6b6_1f3ff_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f6b6_1f3ff_200d_2642.png
index d0fe376d5..d0fe376d5 100644
--- a/data/emoticons/noto-emoticons/png/u1f6b6_1f3ff_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6b6_1f3ff_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6b6_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f6b6_200d_2640.png
index 6ad3e9a4e..6ad3e9a4e 100644
--- a/data/emoticons/noto-emoticons/png/u1f6b6_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6b6_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6b6_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f6b6_200d_2642.png
index 198d2353b..198d2353b 100644
--- a/data/emoticons/noto-emoticons/png/u1f6b6_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6b6_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6b7.png b/gajim/data/emoticons/noto-emoticons/png/u1f6b7.png
index d26d0ef3a..d26d0ef3a 100644
--- a/data/emoticons/noto-emoticons/png/u1f6b7.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6b7.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6b8.png b/gajim/data/emoticons/noto-emoticons/png/u1f6b8.png
index c692cdcd5..c692cdcd5 100644
--- a/data/emoticons/noto-emoticons/png/u1f6b8.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6b8.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6b9.png b/gajim/data/emoticons/noto-emoticons/png/u1f6b9.png
index 1bd5d1d15..1bd5d1d15 100644
--- a/data/emoticons/noto-emoticons/png/u1f6b9.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6b9.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6ba.png b/gajim/data/emoticons/noto-emoticons/png/u1f6ba.png
index 488a4d155..488a4d155 100644
--- a/data/emoticons/noto-emoticons/png/u1f6ba.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6ba.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6bb.png b/gajim/data/emoticons/noto-emoticons/png/u1f6bb.png
index b3264408d..b3264408d 100644
--- a/data/emoticons/noto-emoticons/png/u1f6bb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6bb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6bc.png b/gajim/data/emoticons/noto-emoticons/png/u1f6bc.png
index 42eb90c51..42eb90c51 100644
--- a/data/emoticons/noto-emoticons/png/u1f6bc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6bc.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6bd.png b/gajim/data/emoticons/noto-emoticons/png/u1f6bd.png
index db9324390..db9324390 100644
--- a/data/emoticons/noto-emoticons/png/u1f6bd.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6bd.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6be.png b/gajim/data/emoticons/noto-emoticons/png/u1f6be.png
index 8a0800f60..8a0800f60 100644
--- a/data/emoticons/noto-emoticons/png/u1f6be.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6be.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6bf.png b/gajim/data/emoticons/noto-emoticons/png/u1f6bf.png
index e0f39c8e7..e0f39c8e7 100644
--- a/data/emoticons/noto-emoticons/png/u1f6bf.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6bf.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6c0.png b/gajim/data/emoticons/noto-emoticons/png/u1f6c0.png
index b385c121e..b385c121e 100644
--- a/data/emoticons/noto-emoticons/png/u1f6c0.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6c0.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6c0_1f3fb.png b/gajim/data/emoticons/noto-emoticons/png/u1f6c0_1f3fb.png
index 15bba1dbc..15bba1dbc 100644
--- a/data/emoticons/noto-emoticons/png/u1f6c0_1f3fb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6c0_1f3fb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6c0_1f3fc.png b/gajim/data/emoticons/noto-emoticons/png/u1f6c0_1f3fc.png
index d5fc7c703..d5fc7c703 100644
--- a/data/emoticons/noto-emoticons/png/u1f6c0_1f3fc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6c0_1f3fc.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6c0_1f3fd.png b/gajim/data/emoticons/noto-emoticons/png/u1f6c0_1f3fd.png
index 1574f5036..1574f5036 100644
--- a/data/emoticons/noto-emoticons/png/u1f6c0_1f3fd.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6c0_1f3fd.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6c0_1f3fe.png b/gajim/data/emoticons/noto-emoticons/png/u1f6c0_1f3fe.png
index 11d86c449..11d86c449 100644
--- a/data/emoticons/noto-emoticons/png/u1f6c0_1f3fe.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6c0_1f3fe.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6c0_1f3ff.png b/gajim/data/emoticons/noto-emoticons/png/u1f6c0_1f3ff.png
index e6c36735f..e6c36735f 100644
--- a/data/emoticons/noto-emoticons/png/u1f6c0_1f3ff.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6c0_1f3ff.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6c1.png b/gajim/data/emoticons/noto-emoticons/png/u1f6c1.png
index 89dace517..89dace517 100644
--- a/data/emoticons/noto-emoticons/png/u1f6c1.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6c1.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6c2.png b/gajim/data/emoticons/noto-emoticons/png/u1f6c2.png
index 9f0148b0c..9f0148b0c 100644
--- a/data/emoticons/noto-emoticons/png/u1f6c2.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6c2.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6c3.png b/gajim/data/emoticons/noto-emoticons/png/u1f6c3.png
index 4c1898f17..4c1898f17 100644
--- a/data/emoticons/noto-emoticons/png/u1f6c3.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6c3.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6c4.png b/gajim/data/emoticons/noto-emoticons/png/u1f6c4.png
index 9c8bbd9e1..9c8bbd9e1 100644
--- a/data/emoticons/noto-emoticons/png/u1f6c4.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6c4.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6c5.png b/gajim/data/emoticons/noto-emoticons/png/u1f6c5.png
index 7cc5b0bb0..7cc5b0bb0 100644
--- a/data/emoticons/noto-emoticons/png/u1f6c5.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6c5.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6cb.png b/gajim/data/emoticons/noto-emoticons/png/u1f6cb.png
index a62a9509c..a62a9509c 100644
--- a/data/emoticons/noto-emoticons/png/u1f6cb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6cb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6cc.png b/gajim/data/emoticons/noto-emoticons/png/u1f6cc.png
index a574536ec..a574536ec 100644
--- a/data/emoticons/noto-emoticons/png/u1f6cc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6cc.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6cd.png b/gajim/data/emoticons/noto-emoticons/png/u1f6cd.png
index 8117a1db1..8117a1db1 100644
--- a/data/emoticons/noto-emoticons/png/u1f6cd.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6cd.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6ce.png b/gajim/data/emoticons/noto-emoticons/png/u1f6ce.png
index 90c2eb36b..90c2eb36b 100644
--- a/data/emoticons/noto-emoticons/png/u1f6ce.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6ce.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6cf.png b/gajim/data/emoticons/noto-emoticons/png/u1f6cf.png
index ad1295241..ad1295241 100644
--- a/data/emoticons/noto-emoticons/png/u1f6cf.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6cf.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6d0.png b/gajim/data/emoticons/noto-emoticons/png/u1f6d0.png
index f6cd3fcc8..f6cd3fcc8 100644
--- a/data/emoticons/noto-emoticons/png/u1f6d0.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6d0.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6d1.png b/gajim/data/emoticons/noto-emoticons/png/u1f6d1.png
index 6430585fb..6430585fb 100644
--- a/data/emoticons/noto-emoticons/png/u1f6d1.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6d1.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6d2.png b/gajim/data/emoticons/noto-emoticons/png/u1f6d2.png
index 9c74f8e43..9c74f8e43 100644
--- a/data/emoticons/noto-emoticons/png/u1f6d2.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6d2.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6e0.png b/gajim/data/emoticons/noto-emoticons/png/u1f6e0.png
index d3e8f72df..d3e8f72df 100644
--- a/data/emoticons/noto-emoticons/png/u1f6e0.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6e0.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6e1.png b/gajim/data/emoticons/noto-emoticons/png/u1f6e1.png
index 3a52223fb..3a52223fb 100644
--- a/data/emoticons/noto-emoticons/png/u1f6e1.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6e1.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6e2.png b/gajim/data/emoticons/noto-emoticons/png/u1f6e2.png
index 29888441e..29888441e 100644
--- a/data/emoticons/noto-emoticons/png/u1f6e2.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6e2.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6e3.png b/gajim/data/emoticons/noto-emoticons/png/u1f6e3.png
index 6e9464f19..6e9464f19 100644
--- a/data/emoticons/noto-emoticons/png/u1f6e3.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6e3.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6e4.png b/gajim/data/emoticons/noto-emoticons/png/u1f6e4.png
index 4568312c8..4568312c8 100644
--- a/data/emoticons/noto-emoticons/png/u1f6e4.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6e4.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6e5.png b/gajim/data/emoticons/noto-emoticons/png/u1f6e5.png
index eada7c25e..eada7c25e 100644
--- a/data/emoticons/noto-emoticons/png/u1f6e5.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6e5.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6e9.png b/gajim/data/emoticons/noto-emoticons/png/u1f6e9.png
index 45c5b8dea..45c5b8dea 100644
--- a/data/emoticons/noto-emoticons/png/u1f6e9.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6e9.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6eb.png b/gajim/data/emoticons/noto-emoticons/png/u1f6eb.png
index b9743c1c9..b9743c1c9 100644
--- a/data/emoticons/noto-emoticons/png/u1f6eb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6eb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6ec.png b/gajim/data/emoticons/noto-emoticons/png/u1f6ec.png
index bb1f0e7f3..bb1f0e7f3 100644
--- a/data/emoticons/noto-emoticons/png/u1f6ec.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6ec.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6f0.png b/gajim/data/emoticons/noto-emoticons/png/u1f6f0.png
index 77cc88a9a..77cc88a9a 100644
--- a/data/emoticons/noto-emoticons/png/u1f6f0.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6f0.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6f3.png b/gajim/data/emoticons/noto-emoticons/png/u1f6f3.png
index 802d85558..802d85558 100644
--- a/data/emoticons/noto-emoticons/png/u1f6f3.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6f3.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6f4.png b/gajim/data/emoticons/noto-emoticons/png/u1f6f4.png
index 31056842d..31056842d 100644
--- a/data/emoticons/noto-emoticons/png/u1f6f4.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6f4.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6f5.png b/gajim/data/emoticons/noto-emoticons/png/u1f6f5.png
index 722f6791f..722f6791f 100644
--- a/data/emoticons/noto-emoticons/png/u1f6f5.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6f5.png
diff --git a/data/emoticons/noto-emoticons/png/u1f6f6.png b/gajim/data/emoticons/noto-emoticons/png/u1f6f6.png
index e17999508..e17999508 100644
--- a/data/emoticons/noto-emoticons/png/u1f6f6.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f6f6.png
diff --git a/data/emoticons/noto-emoticons/png/u1f910.png b/gajim/data/emoticons/noto-emoticons/png/u1f910.png
index f52f98587..f52f98587 100644
--- a/data/emoticons/noto-emoticons/png/u1f910.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f910.png
diff --git a/data/emoticons/noto-emoticons/png/u1f911.png b/gajim/data/emoticons/noto-emoticons/png/u1f911.png
index d20e6a425..d20e6a425 100644
--- a/data/emoticons/noto-emoticons/png/u1f911.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f911.png
diff --git a/data/emoticons/noto-emoticons/png/u1f912.png b/gajim/data/emoticons/noto-emoticons/png/u1f912.png
index b1f059a47..b1f059a47 100644
--- a/data/emoticons/noto-emoticons/png/u1f912.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f912.png
diff --git a/data/emoticons/noto-emoticons/png/u1f913.png b/gajim/data/emoticons/noto-emoticons/png/u1f913.png
index 90e61317e..90e61317e 100644
--- a/data/emoticons/noto-emoticons/png/u1f913.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f913.png
diff --git a/data/emoticons/noto-emoticons/png/u1f914.png b/gajim/data/emoticons/noto-emoticons/png/u1f914.png
index 698ed0a05..698ed0a05 100644
--- a/data/emoticons/noto-emoticons/png/u1f914.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f914.png
diff --git a/data/emoticons/noto-emoticons/png/u1f915.png b/gajim/data/emoticons/noto-emoticons/png/u1f915.png
index 9d1ba0923..9d1ba0923 100644
--- a/data/emoticons/noto-emoticons/png/u1f915.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f915.png
diff --git a/data/emoticons/noto-emoticons/png/u1f916.png b/gajim/data/emoticons/noto-emoticons/png/u1f916.png
index 20b77a39b..20b77a39b 100644
--- a/data/emoticons/noto-emoticons/png/u1f916.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f916.png
diff --git a/data/emoticons/noto-emoticons/png/u1f917.png b/gajim/data/emoticons/noto-emoticons/png/u1f917.png
index 8ed858192..8ed858192 100644
--- a/data/emoticons/noto-emoticons/png/u1f917.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f917.png
diff --git a/data/emoticons/noto-emoticons/png/u1f918.png b/gajim/data/emoticons/noto-emoticons/png/u1f918.png
index ed820d6cd..ed820d6cd 100644
--- a/data/emoticons/noto-emoticons/png/u1f918.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f918.png
diff --git a/data/emoticons/noto-emoticons/png/u1f918_1f3fb.png b/gajim/data/emoticons/noto-emoticons/png/u1f918_1f3fb.png
index 96fa48880..96fa48880 100644
--- a/data/emoticons/noto-emoticons/png/u1f918_1f3fb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f918_1f3fb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f918_1f3fc.png b/gajim/data/emoticons/noto-emoticons/png/u1f918_1f3fc.png
index 84dfef355..84dfef355 100644
--- a/data/emoticons/noto-emoticons/png/u1f918_1f3fc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f918_1f3fc.png
diff --git a/data/emoticons/noto-emoticons/png/u1f918_1f3fd.png b/gajim/data/emoticons/noto-emoticons/png/u1f918_1f3fd.png
index a414bfcbc..a414bfcbc 100644
--- a/data/emoticons/noto-emoticons/png/u1f918_1f3fd.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f918_1f3fd.png
diff --git a/data/emoticons/noto-emoticons/png/u1f918_1f3fe.png b/gajim/data/emoticons/noto-emoticons/png/u1f918_1f3fe.png
index e6c4488f8..e6c4488f8 100644
--- a/data/emoticons/noto-emoticons/png/u1f918_1f3fe.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f918_1f3fe.png
diff --git a/data/emoticons/noto-emoticons/png/u1f918_1f3ff.png b/gajim/data/emoticons/noto-emoticons/png/u1f918_1f3ff.png
index d36cb45bd..d36cb45bd 100644
--- a/data/emoticons/noto-emoticons/png/u1f918_1f3ff.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f918_1f3ff.png
diff --git a/data/emoticons/noto-emoticons/png/u1f919.png b/gajim/data/emoticons/noto-emoticons/png/u1f919.png
index 8c16bcda7..8c16bcda7 100644
--- a/data/emoticons/noto-emoticons/png/u1f919.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f919.png
diff --git a/data/emoticons/noto-emoticons/png/u1f919_1f3fb.png b/gajim/data/emoticons/noto-emoticons/png/u1f919_1f3fb.png
index b3268c9e2..b3268c9e2 100644
--- a/data/emoticons/noto-emoticons/png/u1f919_1f3fb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f919_1f3fb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f919_1f3fc.png b/gajim/data/emoticons/noto-emoticons/png/u1f919_1f3fc.png
index e91680cfc..e91680cfc 100644
--- a/data/emoticons/noto-emoticons/png/u1f919_1f3fc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f919_1f3fc.png
diff --git a/data/emoticons/noto-emoticons/png/u1f919_1f3fd.png b/gajim/data/emoticons/noto-emoticons/png/u1f919_1f3fd.png
index 4b77738dc..4b77738dc 100644
--- a/data/emoticons/noto-emoticons/png/u1f919_1f3fd.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f919_1f3fd.png
diff --git a/data/emoticons/noto-emoticons/png/u1f919_1f3fe.png b/gajim/data/emoticons/noto-emoticons/png/u1f919_1f3fe.png
index 87663cd2c..87663cd2c 100644
--- a/data/emoticons/noto-emoticons/png/u1f919_1f3fe.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f919_1f3fe.png
diff --git a/data/emoticons/noto-emoticons/png/u1f919_1f3ff.png b/gajim/data/emoticons/noto-emoticons/png/u1f919_1f3ff.png
index 9ecbcde50..9ecbcde50 100644
--- a/data/emoticons/noto-emoticons/png/u1f919_1f3ff.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f919_1f3ff.png
diff --git a/data/emoticons/noto-emoticons/png/u1f91a.png b/gajim/data/emoticons/noto-emoticons/png/u1f91a.png
index d51d2f225..d51d2f225 100644
--- a/data/emoticons/noto-emoticons/png/u1f91a.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f91a.png
diff --git a/data/emoticons/noto-emoticons/png/u1f91a_1f3fb.png b/gajim/data/emoticons/noto-emoticons/png/u1f91a_1f3fb.png
index 038958a8a..038958a8a 100644
--- a/data/emoticons/noto-emoticons/png/u1f91a_1f3fb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f91a_1f3fb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f91a_1f3fc.png b/gajim/data/emoticons/noto-emoticons/png/u1f91a_1f3fc.png
index 954a3923a..954a3923a 100644
--- a/data/emoticons/noto-emoticons/png/u1f91a_1f3fc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f91a_1f3fc.png
diff --git a/data/emoticons/noto-emoticons/png/u1f91a_1f3fd.png b/gajim/data/emoticons/noto-emoticons/png/u1f91a_1f3fd.png
index 865e28238..865e28238 100644
--- a/data/emoticons/noto-emoticons/png/u1f91a_1f3fd.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f91a_1f3fd.png
diff --git a/data/emoticons/noto-emoticons/png/u1f91a_1f3fe.png b/gajim/data/emoticons/noto-emoticons/png/u1f91a_1f3fe.png
index 4a1ee7c8e..4a1ee7c8e 100644
--- a/data/emoticons/noto-emoticons/png/u1f91a_1f3fe.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f91a_1f3fe.png
diff --git a/data/emoticons/noto-emoticons/png/u1f91a_1f3ff.png b/gajim/data/emoticons/noto-emoticons/png/u1f91a_1f3ff.png
index 8f469e57a..8f469e57a 100644
--- a/data/emoticons/noto-emoticons/png/u1f91a_1f3ff.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f91a_1f3ff.png
diff --git a/data/emoticons/noto-emoticons/png/u1f91b.png b/gajim/data/emoticons/noto-emoticons/png/u1f91b.png
index c2cf3baaf..c2cf3baaf 100644
--- a/data/emoticons/noto-emoticons/png/u1f91b.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f91b.png
diff --git a/data/emoticons/noto-emoticons/png/u1f91b_1f3fb.png b/gajim/data/emoticons/noto-emoticons/png/u1f91b_1f3fb.png
index 7396e7477..7396e7477 100644
--- a/data/emoticons/noto-emoticons/png/u1f91b_1f3fb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f91b_1f3fb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f91b_1f3fc.png b/gajim/data/emoticons/noto-emoticons/png/u1f91b_1f3fc.png
index ecbfb4197..ecbfb4197 100644
--- a/data/emoticons/noto-emoticons/png/u1f91b_1f3fc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f91b_1f3fc.png
diff --git a/data/emoticons/noto-emoticons/png/u1f91b_1f3fd.png b/gajim/data/emoticons/noto-emoticons/png/u1f91b_1f3fd.png
index e46de9863..e46de9863 100644
--- a/data/emoticons/noto-emoticons/png/u1f91b_1f3fd.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f91b_1f3fd.png
diff --git a/data/emoticons/noto-emoticons/png/u1f91b_1f3fe.png b/gajim/data/emoticons/noto-emoticons/png/u1f91b_1f3fe.png
index 1cafcf61a..1cafcf61a 100644
--- a/data/emoticons/noto-emoticons/png/u1f91b_1f3fe.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f91b_1f3fe.png
diff --git a/data/emoticons/noto-emoticons/png/u1f91b_1f3ff.png b/gajim/data/emoticons/noto-emoticons/png/u1f91b_1f3ff.png
index 4866a7f62..4866a7f62 100644
--- a/data/emoticons/noto-emoticons/png/u1f91b_1f3ff.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f91b_1f3ff.png
diff --git a/data/emoticons/noto-emoticons/png/u1f91c.png b/gajim/data/emoticons/noto-emoticons/png/u1f91c.png
index aac494026..aac494026 100644
--- a/data/emoticons/noto-emoticons/png/u1f91c.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f91c.png
diff --git a/data/emoticons/noto-emoticons/png/u1f91c_1f3fb.png b/gajim/data/emoticons/noto-emoticons/png/u1f91c_1f3fb.png
index 86573420d..86573420d 100644
--- a/data/emoticons/noto-emoticons/png/u1f91c_1f3fb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f91c_1f3fb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f91c_1f3fc.png b/gajim/data/emoticons/noto-emoticons/png/u1f91c_1f3fc.png
index 1612fe6b1..1612fe6b1 100644
--- a/data/emoticons/noto-emoticons/png/u1f91c_1f3fc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f91c_1f3fc.png
diff --git a/data/emoticons/noto-emoticons/png/u1f91c_1f3fd.png b/gajim/data/emoticons/noto-emoticons/png/u1f91c_1f3fd.png
index 72cc5faf2..72cc5faf2 100644
--- a/data/emoticons/noto-emoticons/png/u1f91c_1f3fd.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f91c_1f3fd.png
diff --git a/data/emoticons/noto-emoticons/png/u1f91c_1f3fe.png b/gajim/data/emoticons/noto-emoticons/png/u1f91c_1f3fe.png
index 6084a19f3..6084a19f3 100644
--- a/data/emoticons/noto-emoticons/png/u1f91c_1f3fe.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f91c_1f3fe.png
diff --git a/data/emoticons/noto-emoticons/png/u1f91c_1f3ff.png b/gajim/data/emoticons/noto-emoticons/png/u1f91c_1f3ff.png
index d9bbb8501..d9bbb8501 100644
--- a/data/emoticons/noto-emoticons/png/u1f91c_1f3ff.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f91c_1f3ff.png
diff --git a/data/emoticons/noto-emoticons/png/u1f91d.png b/gajim/data/emoticons/noto-emoticons/png/u1f91d.png
index d37e4d458..d37e4d458 100644
--- a/data/emoticons/noto-emoticons/png/u1f91d.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f91d.png
diff --git a/data/emoticons/noto-emoticons/png/u1f91d_1f3fb.png b/gajim/data/emoticons/noto-emoticons/png/u1f91d_1f3fb.png
index 2a8bed392..2a8bed392 100644
--- a/data/emoticons/noto-emoticons/png/u1f91d_1f3fb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f91d_1f3fb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f91d_1f3fc.png b/gajim/data/emoticons/noto-emoticons/png/u1f91d_1f3fc.png
index c17a3e932..c17a3e932 100644
--- a/data/emoticons/noto-emoticons/png/u1f91d_1f3fc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f91d_1f3fc.png
diff --git a/data/emoticons/noto-emoticons/png/u1f91d_1f3fd.png b/gajim/data/emoticons/noto-emoticons/png/u1f91d_1f3fd.png
index b3fef28f6..b3fef28f6 100644
--- a/data/emoticons/noto-emoticons/png/u1f91d_1f3fd.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f91d_1f3fd.png
diff --git a/data/emoticons/noto-emoticons/png/u1f91d_1f3fe.png b/gajim/data/emoticons/noto-emoticons/png/u1f91d_1f3fe.png
index 5f70de3f8..5f70de3f8 100644
--- a/data/emoticons/noto-emoticons/png/u1f91d_1f3fe.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f91d_1f3fe.png
diff --git a/data/emoticons/noto-emoticons/png/u1f91d_1f3ff.png b/gajim/data/emoticons/noto-emoticons/png/u1f91d_1f3ff.png
index 05f3c737c..05f3c737c 100644
--- a/data/emoticons/noto-emoticons/png/u1f91d_1f3ff.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f91d_1f3ff.png
diff --git a/data/emoticons/noto-emoticons/png/u1f91e.png b/gajim/data/emoticons/noto-emoticons/png/u1f91e.png
index b5e889c7c..b5e889c7c 100644
--- a/data/emoticons/noto-emoticons/png/u1f91e.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f91e.png
diff --git a/data/emoticons/noto-emoticons/png/u1f91e_1f3fb.png b/gajim/data/emoticons/noto-emoticons/png/u1f91e_1f3fb.png
index aab0fad66..aab0fad66 100644
--- a/data/emoticons/noto-emoticons/png/u1f91e_1f3fb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f91e_1f3fb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f91e_1f3fc.png b/gajim/data/emoticons/noto-emoticons/png/u1f91e_1f3fc.png
index 502581a8c..502581a8c 100644
--- a/data/emoticons/noto-emoticons/png/u1f91e_1f3fc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f91e_1f3fc.png
diff --git a/data/emoticons/noto-emoticons/png/u1f91e_1f3fd.png b/gajim/data/emoticons/noto-emoticons/png/u1f91e_1f3fd.png
index e8263e36f..e8263e36f 100644
--- a/data/emoticons/noto-emoticons/png/u1f91e_1f3fd.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f91e_1f3fd.png
diff --git a/data/emoticons/noto-emoticons/png/u1f91e_1f3fe.png b/gajim/data/emoticons/noto-emoticons/png/u1f91e_1f3fe.png
index 882d42abd..882d42abd 100644
--- a/data/emoticons/noto-emoticons/png/u1f91e_1f3fe.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f91e_1f3fe.png
diff --git a/data/emoticons/noto-emoticons/png/u1f91e_1f3ff.png b/gajim/data/emoticons/noto-emoticons/png/u1f91e_1f3ff.png
index 8a4753442..8a4753442 100644
--- a/data/emoticons/noto-emoticons/png/u1f91e_1f3ff.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f91e_1f3ff.png
diff --git a/data/emoticons/noto-emoticons/png/u1f920.png b/gajim/data/emoticons/noto-emoticons/png/u1f920.png
index b4fc693eb..b4fc693eb 100644
--- a/data/emoticons/noto-emoticons/png/u1f920.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f920.png
diff --git a/data/emoticons/noto-emoticons/png/u1f921.png b/gajim/data/emoticons/noto-emoticons/png/u1f921.png
index 24421e097..24421e097 100644
--- a/data/emoticons/noto-emoticons/png/u1f921.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f921.png
diff --git a/data/emoticons/noto-emoticons/png/u1f922.png b/gajim/data/emoticons/noto-emoticons/png/u1f922.png
index 116edb8a1..116edb8a1 100644
--- a/data/emoticons/noto-emoticons/png/u1f922.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f922.png
diff --git a/data/emoticons/noto-emoticons/png/u1f923.png b/gajim/data/emoticons/noto-emoticons/png/u1f923.png
index 33cb6841a..33cb6841a 100644
--- a/data/emoticons/noto-emoticons/png/u1f923.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f923.png
diff --git a/data/emoticons/noto-emoticons/png/u1f924.png b/gajim/data/emoticons/noto-emoticons/png/u1f924.png
index a0d339d56..a0d339d56 100644
--- a/data/emoticons/noto-emoticons/png/u1f924.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f924.png
diff --git a/data/emoticons/noto-emoticons/png/u1f925.png b/gajim/data/emoticons/noto-emoticons/png/u1f925.png
index 1f461f8a3..1f461f8a3 100644
--- a/data/emoticons/noto-emoticons/png/u1f925.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f925.png
diff --git a/data/emoticons/noto-emoticons/png/u1f926.png b/gajim/data/emoticons/noto-emoticons/png/u1f926.png
index 4634202cf..4634202cf 100644
--- a/data/emoticons/noto-emoticons/png/u1f926.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f926.png
diff --git a/data/emoticons/noto-emoticons/png/u1f926_1f3fb.png b/gajim/data/emoticons/noto-emoticons/png/u1f926_1f3fb.png
index e3c03288e..e3c03288e 100644
--- a/data/emoticons/noto-emoticons/png/u1f926_1f3fb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f926_1f3fb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f926_1f3fb_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f926_1f3fb_200d_2640.png
index e3c03288e..e3c03288e 100644
--- a/data/emoticons/noto-emoticons/png/u1f926_1f3fb_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f926_1f3fb_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f926_1f3fb_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f926_1f3fb_200d_2642.png
index 6c9d34b33..6c9d34b33 100644
--- a/data/emoticons/noto-emoticons/png/u1f926_1f3fb_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f926_1f3fb_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f926_1f3fc.png b/gajim/data/emoticons/noto-emoticons/png/u1f926_1f3fc.png
index 9750e079d..9750e079d 100644
--- a/data/emoticons/noto-emoticons/png/u1f926_1f3fc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f926_1f3fc.png
diff --git a/data/emoticons/noto-emoticons/png/u1f926_1f3fc_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f926_1f3fc_200d_2640.png
index 9750e079d..9750e079d 100644
--- a/data/emoticons/noto-emoticons/png/u1f926_1f3fc_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f926_1f3fc_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f926_1f3fc_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f926_1f3fc_200d_2642.png
index dd3121172..dd3121172 100644
--- a/data/emoticons/noto-emoticons/png/u1f926_1f3fc_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f926_1f3fc_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f926_1f3fd.png b/gajim/data/emoticons/noto-emoticons/png/u1f926_1f3fd.png
index ca339141f..ca339141f 100644
--- a/data/emoticons/noto-emoticons/png/u1f926_1f3fd.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f926_1f3fd.png
diff --git a/data/emoticons/noto-emoticons/png/u1f926_1f3fd_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f926_1f3fd_200d_2640.png
index ca339141f..ca339141f 100644
--- a/data/emoticons/noto-emoticons/png/u1f926_1f3fd_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f926_1f3fd_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f926_1f3fd_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f926_1f3fd_200d_2642.png
index 5a348532e..5a348532e 100644
--- a/data/emoticons/noto-emoticons/png/u1f926_1f3fd_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f926_1f3fd_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f926_1f3fe.png b/gajim/data/emoticons/noto-emoticons/png/u1f926_1f3fe.png
index 84230a300..84230a300 100644
--- a/data/emoticons/noto-emoticons/png/u1f926_1f3fe.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f926_1f3fe.png
diff --git a/data/emoticons/noto-emoticons/png/u1f926_1f3fe_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f926_1f3fe_200d_2640.png
index 84230a300..84230a300 100644
--- a/data/emoticons/noto-emoticons/png/u1f926_1f3fe_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f926_1f3fe_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f926_1f3fe_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f926_1f3fe_200d_2642.png
index 95cb2a4c8..95cb2a4c8 100644
--- a/data/emoticons/noto-emoticons/png/u1f926_1f3fe_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f926_1f3fe_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f926_1f3ff.png b/gajim/data/emoticons/noto-emoticons/png/u1f926_1f3ff.png
index 4ba6a3bbc..4ba6a3bbc 100644
--- a/data/emoticons/noto-emoticons/png/u1f926_1f3ff.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f926_1f3ff.png
diff --git a/data/emoticons/noto-emoticons/png/u1f926_1f3ff_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f926_1f3ff_200d_2640.png
index 4ba6a3bbc..4ba6a3bbc 100644
--- a/data/emoticons/noto-emoticons/png/u1f926_1f3ff_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f926_1f3ff_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f926_1f3ff_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f926_1f3ff_200d_2642.png
index b6a3f6910..b6a3f6910 100644
--- a/data/emoticons/noto-emoticons/png/u1f926_1f3ff_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f926_1f3ff_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f926_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f926_200d_2640.png
index 4634202cf..4634202cf 100644
--- a/data/emoticons/noto-emoticons/png/u1f926_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f926_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f926_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f926_200d_2642.png
index 075c289c6..075c289c6 100644
--- a/data/emoticons/noto-emoticons/png/u1f926_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f926_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f927.png b/gajim/data/emoticons/noto-emoticons/png/u1f927.png
index 19b3d96d3..19b3d96d3 100644
--- a/data/emoticons/noto-emoticons/png/u1f927.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f927.png
diff --git a/data/emoticons/noto-emoticons/png/u1f930.png b/gajim/data/emoticons/noto-emoticons/png/u1f930.png
index c1c5d3cd9..c1c5d3cd9 100644
--- a/data/emoticons/noto-emoticons/png/u1f930.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f930.png
diff --git a/data/emoticons/noto-emoticons/png/u1f930_1f3fb.png b/gajim/data/emoticons/noto-emoticons/png/u1f930_1f3fb.png
index eac1c0e7d..eac1c0e7d 100644
--- a/data/emoticons/noto-emoticons/png/u1f930_1f3fb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f930_1f3fb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f930_1f3fc.png b/gajim/data/emoticons/noto-emoticons/png/u1f930_1f3fc.png
index 5d1ce26f3..5d1ce26f3 100644
--- a/data/emoticons/noto-emoticons/png/u1f930_1f3fc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f930_1f3fc.png
diff --git a/data/emoticons/noto-emoticons/png/u1f930_1f3fd.png b/gajim/data/emoticons/noto-emoticons/png/u1f930_1f3fd.png
index fa3d4f514..fa3d4f514 100644
--- a/data/emoticons/noto-emoticons/png/u1f930_1f3fd.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f930_1f3fd.png
diff --git a/data/emoticons/noto-emoticons/png/u1f930_1f3fe.png b/gajim/data/emoticons/noto-emoticons/png/u1f930_1f3fe.png
index 04dde940a..04dde940a 100644
--- a/data/emoticons/noto-emoticons/png/u1f930_1f3fe.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f930_1f3fe.png
diff --git a/data/emoticons/noto-emoticons/png/u1f930_1f3ff.png b/gajim/data/emoticons/noto-emoticons/png/u1f930_1f3ff.png
index 00edcea49..00edcea49 100644
--- a/data/emoticons/noto-emoticons/png/u1f930_1f3ff.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f930_1f3ff.png
diff --git a/data/emoticons/noto-emoticons/png/u1f933.png b/gajim/data/emoticons/noto-emoticons/png/u1f933.png
index 8516991ac..8516991ac 100644
--- a/data/emoticons/noto-emoticons/png/u1f933.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f933.png
diff --git a/data/emoticons/noto-emoticons/png/u1f933_1f3fb.png b/gajim/data/emoticons/noto-emoticons/png/u1f933_1f3fb.png
index 32a8ae02e..32a8ae02e 100644
--- a/data/emoticons/noto-emoticons/png/u1f933_1f3fb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f933_1f3fb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f933_1f3fc.png b/gajim/data/emoticons/noto-emoticons/png/u1f933_1f3fc.png
index 0e2d1a68a..0e2d1a68a 100644
--- a/data/emoticons/noto-emoticons/png/u1f933_1f3fc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f933_1f3fc.png
diff --git a/data/emoticons/noto-emoticons/png/u1f933_1f3fd.png b/gajim/data/emoticons/noto-emoticons/png/u1f933_1f3fd.png
index 74034aabf..74034aabf 100644
--- a/data/emoticons/noto-emoticons/png/u1f933_1f3fd.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f933_1f3fd.png
diff --git a/data/emoticons/noto-emoticons/png/u1f933_1f3fe.png b/gajim/data/emoticons/noto-emoticons/png/u1f933_1f3fe.png
index 5ba10655b..5ba10655b 100644
--- a/data/emoticons/noto-emoticons/png/u1f933_1f3fe.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f933_1f3fe.png
diff --git a/data/emoticons/noto-emoticons/png/u1f933_1f3ff.png b/gajim/data/emoticons/noto-emoticons/png/u1f933_1f3ff.png
index 18f680634..18f680634 100644
--- a/data/emoticons/noto-emoticons/png/u1f933_1f3ff.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f933_1f3ff.png
diff --git a/data/emoticons/noto-emoticons/png/u1f934.png b/gajim/data/emoticons/noto-emoticons/png/u1f934.png
index 39807ca08..39807ca08 100644
--- a/data/emoticons/noto-emoticons/png/u1f934.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f934.png
diff --git a/data/emoticons/noto-emoticons/png/u1f934_1f3fb.png b/gajim/data/emoticons/noto-emoticons/png/u1f934_1f3fb.png
index ae3054995..ae3054995 100644
--- a/data/emoticons/noto-emoticons/png/u1f934_1f3fb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f934_1f3fb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f934_1f3fc.png b/gajim/data/emoticons/noto-emoticons/png/u1f934_1f3fc.png
index 72cb6ceb1..72cb6ceb1 100644
--- a/data/emoticons/noto-emoticons/png/u1f934_1f3fc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f934_1f3fc.png
diff --git a/data/emoticons/noto-emoticons/png/u1f934_1f3fd.png b/gajim/data/emoticons/noto-emoticons/png/u1f934_1f3fd.png
index 4acd99bb9..4acd99bb9 100644
--- a/data/emoticons/noto-emoticons/png/u1f934_1f3fd.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f934_1f3fd.png
diff --git a/data/emoticons/noto-emoticons/png/u1f934_1f3fe.png b/gajim/data/emoticons/noto-emoticons/png/u1f934_1f3fe.png
index fa61b583d..fa61b583d 100644
--- a/data/emoticons/noto-emoticons/png/u1f934_1f3fe.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f934_1f3fe.png
diff --git a/data/emoticons/noto-emoticons/png/u1f934_1f3ff.png b/gajim/data/emoticons/noto-emoticons/png/u1f934_1f3ff.png
index 336b30a26..336b30a26 100644
--- a/data/emoticons/noto-emoticons/png/u1f934_1f3ff.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f934_1f3ff.png
diff --git a/data/emoticons/noto-emoticons/png/u1f935.png b/gajim/data/emoticons/noto-emoticons/png/u1f935.png
index 2baba0bf5..2baba0bf5 100644
--- a/data/emoticons/noto-emoticons/png/u1f935.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f935.png
diff --git a/data/emoticons/noto-emoticons/png/u1f935_1f3fb.png b/gajim/data/emoticons/noto-emoticons/png/u1f935_1f3fb.png
index 5fb9eddca..5fb9eddca 100644
--- a/data/emoticons/noto-emoticons/png/u1f935_1f3fb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f935_1f3fb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f935_1f3fc.png b/gajim/data/emoticons/noto-emoticons/png/u1f935_1f3fc.png
index 3010d4869..3010d4869 100644
--- a/data/emoticons/noto-emoticons/png/u1f935_1f3fc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f935_1f3fc.png
diff --git a/data/emoticons/noto-emoticons/png/u1f935_1f3fd.png b/gajim/data/emoticons/noto-emoticons/png/u1f935_1f3fd.png
index 6cfd677e7..6cfd677e7 100644
--- a/data/emoticons/noto-emoticons/png/u1f935_1f3fd.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f935_1f3fd.png
diff --git a/data/emoticons/noto-emoticons/png/u1f935_1f3fe.png b/gajim/data/emoticons/noto-emoticons/png/u1f935_1f3fe.png
index 10e2d68ec..10e2d68ec 100644
--- a/data/emoticons/noto-emoticons/png/u1f935_1f3fe.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f935_1f3fe.png
diff --git a/data/emoticons/noto-emoticons/png/u1f935_1f3ff.png b/gajim/data/emoticons/noto-emoticons/png/u1f935_1f3ff.png
index 0b113e05a..0b113e05a 100644
--- a/data/emoticons/noto-emoticons/png/u1f935_1f3ff.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f935_1f3ff.png
diff --git a/data/emoticons/noto-emoticons/png/u1f936.png b/gajim/data/emoticons/noto-emoticons/png/u1f936.png
index 3e306107b..3e306107b 100644
--- a/data/emoticons/noto-emoticons/png/u1f936.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f936.png
diff --git a/data/emoticons/noto-emoticons/png/u1f936_1f3fb.png b/gajim/data/emoticons/noto-emoticons/png/u1f936_1f3fb.png
index 305058f87..305058f87 100644
--- a/data/emoticons/noto-emoticons/png/u1f936_1f3fb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f936_1f3fb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f936_1f3fc.png b/gajim/data/emoticons/noto-emoticons/png/u1f936_1f3fc.png
index fbda29e2c..fbda29e2c 100644
--- a/data/emoticons/noto-emoticons/png/u1f936_1f3fc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f936_1f3fc.png
diff --git a/data/emoticons/noto-emoticons/png/u1f936_1f3fd.png b/gajim/data/emoticons/noto-emoticons/png/u1f936_1f3fd.png
index f788115db..f788115db 100644
--- a/data/emoticons/noto-emoticons/png/u1f936_1f3fd.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f936_1f3fd.png
diff --git a/data/emoticons/noto-emoticons/png/u1f936_1f3fe.png b/gajim/data/emoticons/noto-emoticons/png/u1f936_1f3fe.png
index 86bd0ebc9..86bd0ebc9 100644
--- a/data/emoticons/noto-emoticons/png/u1f936_1f3fe.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f936_1f3fe.png
diff --git a/data/emoticons/noto-emoticons/png/u1f936_1f3ff.png b/gajim/data/emoticons/noto-emoticons/png/u1f936_1f3ff.png
index f0356c21c..f0356c21c 100644
--- a/data/emoticons/noto-emoticons/png/u1f936_1f3ff.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f936_1f3ff.png
diff --git a/data/emoticons/noto-emoticons/png/u1f937.png b/gajim/data/emoticons/noto-emoticons/png/u1f937.png
index bfbde2266..bfbde2266 100644
--- a/data/emoticons/noto-emoticons/png/u1f937.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f937.png
diff --git a/data/emoticons/noto-emoticons/png/u1f937_1f3fb.png b/gajim/data/emoticons/noto-emoticons/png/u1f937_1f3fb.png
index f95c21ddb..f95c21ddb 100644
--- a/data/emoticons/noto-emoticons/png/u1f937_1f3fb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f937_1f3fb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f937_1f3fb_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f937_1f3fb_200d_2640.png
index f95c21ddb..f95c21ddb 100644
--- a/data/emoticons/noto-emoticons/png/u1f937_1f3fb_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f937_1f3fb_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f937_1f3fb_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f937_1f3fb_200d_2642.png
index f2e6114f3..f2e6114f3 100644
--- a/data/emoticons/noto-emoticons/png/u1f937_1f3fb_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f937_1f3fb_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f937_1f3fc.png b/gajim/data/emoticons/noto-emoticons/png/u1f937_1f3fc.png
index dec49d399..dec49d399 100644
--- a/data/emoticons/noto-emoticons/png/u1f937_1f3fc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f937_1f3fc.png
diff --git a/data/emoticons/noto-emoticons/png/u1f937_1f3fc_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f937_1f3fc_200d_2640.png
index dec49d399..dec49d399 100644
--- a/data/emoticons/noto-emoticons/png/u1f937_1f3fc_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f937_1f3fc_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f937_1f3fc_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f937_1f3fc_200d_2642.png
index b37e6a693..b37e6a693 100644
--- a/data/emoticons/noto-emoticons/png/u1f937_1f3fc_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f937_1f3fc_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f937_1f3fd.png b/gajim/data/emoticons/noto-emoticons/png/u1f937_1f3fd.png
index 6ade9bc68..6ade9bc68 100644
--- a/data/emoticons/noto-emoticons/png/u1f937_1f3fd.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f937_1f3fd.png
diff --git a/data/emoticons/noto-emoticons/png/u1f937_1f3fd_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f937_1f3fd_200d_2640.png
index 6ade9bc68..6ade9bc68 100644
--- a/data/emoticons/noto-emoticons/png/u1f937_1f3fd_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f937_1f3fd_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f937_1f3fd_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f937_1f3fd_200d_2642.png
index a23e324c8..a23e324c8 100644
--- a/data/emoticons/noto-emoticons/png/u1f937_1f3fd_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f937_1f3fd_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f937_1f3fe.png b/gajim/data/emoticons/noto-emoticons/png/u1f937_1f3fe.png
index fb3872dd9..fb3872dd9 100644
--- a/data/emoticons/noto-emoticons/png/u1f937_1f3fe.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f937_1f3fe.png
diff --git a/data/emoticons/noto-emoticons/png/u1f937_1f3fe_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f937_1f3fe_200d_2640.png
index fb3872dd9..fb3872dd9 100644
--- a/data/emoticons/noto-emoticons/png/u1f937_1f3fe_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f937_1f3fe_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f937_1f3fe_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f937_1f3fe_200d_2642.png
index ee25e1bde..ee25e1bde 100644
--- a/data/emoticons/noto-emoticons/png/u1f937_1f3fe_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f937_1f3fe_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f937_1f3ff.png b/gajim/data/emoticons/noto-emoticons/png/u1f937_1f3ff.png
index c532ed02c..c532ed02c 100644
--- a/data/emoticons/noto-emoticons/png/u1f937_1f3ff.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f937_1f3ff.png
diff --git a/data/emoticons/noto-emoticons/png/u1f937_1f3ff_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f937_1f3ff_200d_2640.png
index c532ed02c..c532ed02c 100644
--- a/data/emoticons/noto-emoticons/png/u1f937_1f3ff_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f937_1f3ff_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f937_1f3ff_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f937_1f3ff_200d_2642.png
index 252f27f62..252f27f62 100644
--- a/data/emoticons/noto-emoticons/png/u1f937_1f3ff_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f937_1f3ff_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f937_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f937_200d_2640.png
index bfbde2266..bfbde2266 100644
--- a/data/emoticons/noto-emoticons/png/u1f937_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f937_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f937_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f937_200d_2642.png
index 5695a15fa..5695a15fa 100644
--- a/data/emoticons/noto-emoticons/png/u1f937_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f937_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f938.png b/gajim/data/emoticons/noto-emoticons/png/u1f938.png
index 052743885..052743885 100644
--- a/data/emoticons/noto-emoticons/png/u1f938.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f938.png
diff --git a/data/emoticons/noto-emoticons/png/u1f938_1f3fb.png b/gajim/data/emoticons/noto-emoticons/png/u1f938_1f3fb.png
index ada363c74..ada363c74 100644
--- a/data/emoticons/noto-emoticons/png/u1f938_1f3fb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f938_1f3fb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f938_1f3fb_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f938_1f3fb_200d_2640.png
index 89d6f47c4..89d6f47c4 100644
--- a/data/emoticons/noto-emoticons/png/u1f938_1f3fb_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f938_1f3fb_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f938_1f3fb_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f938_1f3fb_200d_2642.png
index ada363c74..ada363c74 100644
--- a/data/emoticons/noto-emoticons/png/u1f938_1f3fb_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f938_1f3fb_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f938_1f3fc.png b/gajim/data/emoticons/noto-emoticons/png/u1f938_1f3fc.png
index 88d785138..88d785138 100644
--- a/data/emoticons/noto-emoticons/png/u1f938_1f3fc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f938_1f3fc.png
diff --git a/data/emoticons/noto-emoticons/png/u1f938_1f3fc_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f938_1f3fc_200d_2640.png
index 46904fdb3..46904fdb3 100644
--- a/data/emoticons/noto-emoticons/png/u1f938_1f3fc_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f938_1f3fc_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f938_1f3fc_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f938_1f3fc_200d_2642.png
index 88d785138..88d785138 100644
--- a/data/emoticons/noto-emoticons/png/u1f938_1f3fc_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f938_1f3fc_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f938_1f3fd.png b/gajim/data/emoticons/noto-emoticons/png/u1f938_1f3fd.png
index db2063fab..db2063fab 100644
--- a/data/emoticons/noto-emoticons/png/u1f938_1f3fd.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f938_1f3fd.png
diff --git a/data/emoticons/noto-emoticons/png/u1f938_1f3fd_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f938_1f3fd_200d_2640.png
index 6c4341022..6c4341022 100644
--- a/data/emoticons/noto-emoticons/png/u1f938_1f3fd_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f938_1f3fd_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f938_1f3fd_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f938_1f3fd_200d_2642.png
index db2063fab..db2063fab 100644
--- a/data/emoticons/noto-emoticons/png/u1f938_1f3fd_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f938_1f3fd_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f938_1f3fe.png b/gajim/data/emoticons/noto-emoticons/png/u1f938_1f3fe.png
index 21af9dba5..21af9dba5 100644
--- a/data/emoticons/noto-emoticons/png/u1f938_1f3fe.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f938_1f3fe.png
diff --git a/data/emoticons/noto-emoticons/png/u1f938_1f3fe_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f938_1f3fe_200d_2640.png
index a8b9db414..a8b9db414 100644
--- a/data/emoticons/noto-emoticons/png/u1f938_1f3fe_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f938_1f3fe_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f938_1f3fe_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f938_1f3fe_200d_2642.png
index 21af9dba5..21af9dba5 100644
--- a/data/emoticons/noto-emoticons/png/u1f938_1f3fe_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f938_1f3fe_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f938_1f3ff.png b/gajim/data/emoticons/noto-emoticons/png/u1f938_1f3ff.png
index 2006881f1..2006881f1 100644
--- a/data/emoticons/noto-emoticons/png/u1f938_1f3ff.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f938_1f3ff.png
diff --git a/data/emoticons/noto-emoticons/png/u1f938_1f3ff_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f938_1f3ff_200d_2640.png
index aa70c6e49..aa70c6e49 100644
--- a/data/emoticons/noto-emoticons/png/u1f938_1f3ff_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f938_1f3ff_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f938_1f3ff_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f938_1f3ff_200d_2642.png
index 2006881f1..2006881f1 100644
--- a/data/emoticons/noto-emoticons/png/u1f938_1f3ff_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f938_1f3ff_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f938_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f938_200d_2640.png
index feb62cece..feb62cece 100644
--- a/data/emoticons/noto-emoticons/png/u1f938_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f938_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f938_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f938_200d_2642.png
index 052743885..052743885 100644
--- a/data/emoticons/noto-emoticons/png/u1f938_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f938_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f939.png b/gajim/data/emoticons/noto-emoticons/png/u1f939.png
index b08491d9c..b08491d9c 100644
--- a/data/emoticons/noto-emoticons/png/u1f939.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f939.png
diff --git a/data/emoticons/noto-emoticons/png/u1f939_1f3fb.png b/gajim/data/emoticons/noto-emoticons/png/u1f939_1f3fb.png
index f4632c330..f4632c330 100644
--- a/data/emoticons/noto-emoticons/png/u1f939_1f3fb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f939_1f3fb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f939_1f3fb_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f939_1f3fb_200d_2640.png
index 25ea971fc..25ea971fc 100644
--- a/data/emoticons/noto-emoticons/png/u1f939_1f3fb_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f939_1f3fb_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f939_1f3fb_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f939_1f3fb_200d_2642.png
index f4632c330..f4632c330 100644
--- a/data/emoticons/noto-emoticons/png/u1f939_1f3fb_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f939_1f3fb_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f939_1f3fc.png b/gajim/data/emoticons/noto-emoticons/png/u1f939_1f3fc.png
index 88b7a615d..88b7a615d 100644
--- a/data/emoticons/noto-emoticons/png/u1f939_1f3fc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f939_1f3fc.png
diff --git a/data/emoticons/noto-emoticons/png/u1f939_1f3fc_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f939_1f3fc_200d_2640.png
index a3f21cc7b..a3f21cc7b 100644
--- a/data/emoticons/noto-emoticons/png/u1f939_1f3fc_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f939_1f3fc_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f939_1f3fc_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f939_1f3fc_200d_2642.png
index 88b7a615d..88b7a615d 100644
--- a/data/emoticons/noto-emoticons/png/u1f939_1f3fc_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f939_1f3fc_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f939_1f3fd.png b/gajim/data/emoticons/noto-emoticons/png/u1f939_1f3fd.png
index 03b35e703..03b35e703 100644
--- a/data/emoticons/noto-emoticons/png/u1f939_1f3fd.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f939_1f3fd.png
diff --git a/data/emoticons/noto-emoticons/png/u1f939_1f3fd_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f939_1f3fd_200d_2640.png
index 76f3ddaa3..76f3ddaa3 100644
--- a/data/emoticons/noto-emoticons/png/u1f939_1f3fd_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f939_1f3fd_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f939_1f3fd_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f939_1f3fd_200d_2642.png
index 03b35e703..03b35e703 100644
--- a/data/emoticons/noto-emoticons/png/u1f939_1f3fd_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f939_1f3fd_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f939_1f3fe.png b/gajim/data/emoticons/noto-emoticons/png/u1f939_1f3fe.png
index 13fa5170b..13fa5170b 100644
--- a/data/emoticons/noto-emoticons/png/u1f939_1f3fe.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f939_1f3fe.png
diff --git a/data/emoticons/noto-emoticons/png/u1f939_1f3fe_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f939_1f3fe_200d_2640.png
index bbb7f6305..bbb7f6305 100644
--- a/data/emoticons/noto-emoticons/png/u1f939_1f3fe_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f939_1f3fe_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f939_1f3fe_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f939_1f3fe_200d_2642.png
index 13fa5170b..13fa5170b 100644
--- a/data/emoticons/noto-emoticons/png/u1f939_1f3fe_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f939_1f3fe_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f939_1f3ff.png b/gajim/data/emoticons/noto-emoticons/png/u1f939_1f3ff.png
index 04073829a..04073829a 100644
--- a/data/emoticons/noto-emoticons/png/u1f939_1f3ff.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f939_1f3ff.png
diff --git a/data/emoticons/noto-emoticons/png/u1f939_1f3ff_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f939_1f3ff_200d_2640.png
index 724db6cdd..724db6cdd 100644
--- a/data/emoticons/noto-emoticons/png/u1f939_1f3ff_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f939_1f3ff_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f939_1f3ff_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f939_1f3ff_200d_2642.png
index 04073829a..04073829a 100644
--- a/data/emoticons/noto-emoticons/png/u1f939_1f3ff_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f939_1f3ff_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f939_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f939_200d_2640.png
index 5dfc541c6..5dfc541c6 100644
--- a/data/emoticons/noto-emoticons/png/u1f939_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f939_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f939_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f939_200d_2642.png
index b08491d9c..b08491d9c 100644
--- a/data/emoticons/noto-emoticons/png/u1f939_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f939_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f93a.png b/gajim/data/emoticons/noto-emoticons/png/u1f93a.png
index 90bd7b28b..90bd7b28b 100644
--- a/data/emoticons/noto-emoticons/png/u1f93a.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f93a.png
diff --git a/data/emoticons/noto-emoticons/png/u1f93c.png b/gajim/data/emoticons/noto-emoticons/png/u1f93c.png
index 67adecb5f..67adecb5f 100644
--- a/data/emoticons/noto-emoticons/png/u1f93c.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f93c.png
diff --git a/data/emoticons/noto-emoticons/png/u1f93c_1f3fb.png b/gajim/data/emoticons/noto-emoticons/png/u1f93c_1f3fb.png
index 2c76ac751..2c76ac751 100644
--- a/data/emoticons/noto-emoticons/png/u1f93c_1f3fb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f93c_1f3fb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f93c_1f3fb_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f93c_1f3fb_200d_2640.png
index 7d79b5519..7d79b5519 100644
--- a/data/emoticons/noto-emoticons/png/u1f93c_1f3fb_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f93c_1f3fb_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f93c_1f3fb_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f93c_1f3fb_200d_2642.png
index 2c76ac751..2c76ac751 100644
--- a/data/emoticons/noto-emoticons/png/u1f93c_1f3fb_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f93c_1f3fb_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f93c_1f3fc.png b/gajim/data/emoticons/noto-emoticons/png/u1f93c_1f3fc.png
index dee20ace6..dee20ace6 100644
--- a/data/emoticons/noto-emoticons/png/u1f93c_1f3fc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f93c_1f3fc.png
diff --git a/data/emoticons/noto-emoticons/png/u1f93c_1f3fc_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f93c_1f3fc_200d_2640.png
index 713c4f4f3..713c4f4f3 100644
--- a/data/emoticons/noto-emoticons/png/u1f93c_1f3fc_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f93c_1f3fc_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f93c_1f3fc_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f93c_1f3fc_200d_2642.png
index dee20ace6..dee20ace6 100644
--- a/data/emoticons/noto-emoticons/png/u1f93c_1f3fc_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f93c_1f3fc_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f93c_1f3fd.png b/gajim/data/emoticons/noto-emoticons/png/u1f93c_1f3fd.png
index 82f0626e8..82f0626e8 100644
--- a/data/emoticons/noto-emoticons/png/u1f93c_1f3fd.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f93c_1f3fd.png
diff --git a/data/emoticons/noto-emoticons/png/u1f93c_1f3fd_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f93c_1f3fd_200d_2640.png
index a8e86e95a..a8e86e95a 100644
--- a/data/emoticons/noto-emoticons/png/u1f93c_1f3fd_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f93c_1f3fd_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f93c_1f3fd_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f93c_1f3fd_200d_2642.png
index 82f0626e8..82f0626e8 100644
--- a/data/emoticons/noto-emoticons/png/u1f93c_1f3fd_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f93c_1f3fd_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f93c_1f3fe.png b/gajim/data/emoticons/noto-emoticons/png/u1f93c_1f3fe.png
index d50c23ad6..d50c23ad6 100644
--- a/data/emoticons/noto-emoticons/png/u1f93c_1f3fe.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f93c_1f3fe.png
diff --git a/data/emoticons/noto-emoticons/png/u1f93c_1f3fe_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f93c_1f3fe_200d_2640.png
index 077bffa62..077bffa62 100644
--- a/data/emoticons/noto-emoticons/png/u1f93c_1f3fe_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f93c_1f3fe_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f93c_1f3fe_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f93c_1f3fe_200d_2642.png
index d50c23ad6..d50c23ad6 100644
--- a/data/emoticons/noto-emoticons/png/u1f93c_1f3fe_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f93c_1f3fe_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f93c_1f3ff.png b/gajim/data/emoticons/noto-emoticons/png/u1f93c_1f3ff.png
index 8b272f90f..8b272f90f 100644
--- a/data/emoticons/noto-emoticons/png/u1f93c_1f3ff.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f93c_1f3ff.png
diff --git a/data/emoticons/noto-emoticons/png/u1f93c_1f3ff_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f93c_1f3ff_200d_2640.png
index 0017a889a..0017a889a 100644
--- a/data/emoticons/noto-emoticons/png/u1f93c_1f3ff_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f93c_1f3ff_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f93c_1f3ff_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f93c_1f3ff_200d_2642.png
index 8b272f90f..8b272f90f 100644
--- a/data/emoticons/noto-emoticons/png/u1f93c_1f3ff_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f93c_1f3ff_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f93c_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f93c_200d_2640.png
index 44280bfdb..44280bfdb 100644
--- a/data/emoticons/noto-emoticons/png/u1f93c_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f93c_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f93c_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f93c_200d_2642.png
index 67adecb5f..67adecb5f 100644
--- a/data/emoticons/noto-emoticons/png/u1f93c_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f93c_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f93d.png b/gajim/data/emoticons/noto-emoticons/png/u1f93d.png
index 09869f73b..09869f73b 100644
--- a/data/emoticons/noto-emoticons/png/u1f93d.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f93d.png
diff --git a/data/emoticons/noto-emoticons/png/u1f93d_1f3fb.png b/gajim/data/emoticons/noto-emoticons/png/u1f93d_1f3fb.png
index fc9735e89..fc9735e89 100644
--- a/data/emoticons/noto-emoticons/png/u1f93d_1f3fb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f93d_1f3fb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f93d_1f3fb_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f93d_1f3fb_200d_2640.png
index 459b1a5ad..459b1a5ad 100644
--- a/data/emoticons/noto-emoticons/png/u1f93d_1f3fb_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f93d_1f3fb_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f93d_1f3fb_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f93d_1f3fb_200d_2642.png
index fc9735e89..fc9735e89 100644
--- a/data/emoticons/noto-emoticons/png/u1f93d_1f3fb_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f93d_1f3fb_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f93d_1f3fc.png b/gajim/data/emoticons/noto-emoticons/png/u1f93d_1f3fc.png
index a47479d1b..a47479d1b 100644
--- a/data/emoticons/noto-emoticons/png/u1f93d_1f3fc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f93d_1f3fc.png
diff --git a/data/emoticons/noto-emoticons/png/u1f93d_1f3fc_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f93d_1f3fc_200d_2640.png
index ab6f7cb70..ab6f7cb70 100644
--- a/data/emoticons/noto-emoticons/png/u1f93d_1f3fc_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f93d_1f3fc_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f93d_1f3fc_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f93d_1f3fc_200d_2642.png
index a47479d1b..a47479d1b 100644
--- a/data/emoticons/noto-emoticons/png/u1f93d_1f3fc_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f93d_1f3fc_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f93d_1f3fd.png b/gajim/data/emoticons/noto-emoticons/png/u1f93d_1f3fd.png
index 7483f9bc1..7483f9bc1 100644
--- a/data/emoticons/noto-emoticons/png/u1f93d_1f3fd.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f93d_1f3fd.png
diff --git a/data/emoticons/noto-emoticons/png/u1f93d_1f3fd_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f93d_1f3fd_200d_2640.png
index 89e962f36..89e962f36 100644
--- a/data/emoticons/noto-emoticons/png/u1f93d_1f3fd_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f93d_1f3fd_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f93d_1f3fd_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f93d_1f3fd_200d_2642.png
index 7483f9bc1..7483f9bc1 100644
--- a/data/emoticons/noto-emoticons/png/u1f93d_1f3fd_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f93d_1f3fd_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f93d_1f3fe.png b/gajim/data/emoticons/noto-emoticons/png/u1f93d_1f3fe.png
index fa53ef9a2..fa53ef9a2 100644
--- a/data/emoticons/noto-emoticons/png/u1f93d_1f3fe.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f93d_1f3fe.png
diff --git a/data/emoticons/noto-emoticons/png/u1f93d_1f3fe_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f93d_1f3fe_200d_2640.png
index fb5642941..fb5642941 100644
--- a/data/emoticons/noto-emoticons/png/u1f93d_1f3fe_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f93d_1f3fe_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f93d_1f3fe_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f93d_1f3fe_200d_2642.png
index fa53ef9a2..fa53ef9a2 100644
--- a/data/emoticons/noto-emoticons/png/u1f93d_1f3fe_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f93d_1f3fe_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f93d_1f3ff.png b/gajim/data/emoticons/noto-emoticons/png/u1f93d_1f3ff.png
index b3cdcf373..b3cdcf373 100644
--- a/data/emoticons/noto-emoticons/png/u1f93d_1f3ff.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f93d_1f3ff.png
diff --git a/data/emoticons/noto-emoticons/png/u1f93d_1f3ff_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f93d_1f3ff_200d_2640.png
index f5abed815..f5abed815 100644
--- a/data/emoticons/noto-emoticons/png/u1f93d_1f3ff_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f93d_1f3ff_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f93d_1f3ff_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f93d_1f3ff_200d_2642.png
index b3cdcf373..b3cdcf373 100644
--- a/data/emoticons/noto-emoticons/png/u1f93d_1f3ff_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f93d_1f3ff_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f93d_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f93d_200d_2640.png
index 15a3e6e7b..15a3e6e7b 100644
--- a/data/emoticons/noto-emoticons/png/u1f93d_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f93d_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f93d_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f93d_200d_2642.png
index 09869f73b..09869f73b 100644
--- a/data/emoticons/noto-emoticons/png/u1f93d_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f93d_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f93e.png b/gajim/data/emoticons/noto-emoticons/png/u1f93e.png
index 153132b7a..153132b7a 100644
--- a/data/emoticons/noto-emoticons/png/u1f93e.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f93e.png
diff --git a/data/emoticons/noto-emoticons/png/u1f93e_1f3fb.png b/gajim/data/emoticons/noto-emoticons/png/u1f93e_1f3fb.png
index a1b8c1282..a1b8c1282 100644
--- a/data/emoticons/noto-emoticons/png/u1f93e_1f3fb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f93e_1f3fb.png
diff --git a/data/emoticons/noto-emoticons/png/u1f93e_1f3fb_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f93e_1f3fb_200d_2640.png
index 6ef3905e9..6ef3905e9 100644
--- a/data/emoticons/noto-emoticons/png/u1f93e_1f3fb_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f93e_1f3fb_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f93e_1f3fb_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f93e_1f3fb_200d_2642.png
index a1b8c1282..a1b8c1282 100644
--- a/data/emoticons/noto-emoticons/png/u1f93e_1f3fb_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f93e_1f3fb_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f93e_1f3fc.png b/gajim/data/emoticons/noto-emoticons/png/u1f93e_1f3fc.png
index c9c2e28af..c9c2e28af 100644
--- a/data/emoticons/noto-emoticons/png/u1f93e_1f3fc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f93e_1f3fc.png
diff --git a/data/emoticons/noto-emoticons/png/u1f93e_1f3fc_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f93e_1f3fc_200d_2640.png
index 0952822c9..0952822c9 100644
--- a/data/emoticons/noto-emoticons/png/u1f93e_1f3fc_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f93e_1f3fc_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f93e_1f3fc_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f93e_1f3fc_200d_2642.png
index c9c2e28af..c9c2e28af 100644
--- a/data/emoticons/noto-emoticons/png/u1f93e_1f3fc_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f93e_1f3fc_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f93e_1f3fd.png b/gajim/data/emoticons/noto-emoticons/png/u1f93e_1f3fd.png
index 76807db04..76807db04 100644
--- a/data/emoticons/noto-emoticons/png/u1f93e_1f3fd.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f93e_1f3fd.png
diff --git a/data/emoticons/noto-emoticons/png/u1f93e_1f3fd_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f93e_1f3fd_200d_2640.png
index 70fc1fce0..70fc1fce0 100644
--- a/data/emoticons/noto-emoticons/png/u1f93e_1f3fd_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f93e_1f3fd_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f93e_1f3fd_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f93e_1f3fd_200d_2642.png
index 76807db04..76807db04 100644
--- a/data/emoticons/noto-emoticons/png/u1f93e_1f3fd_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f93e_1f3fd_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f93e_1f3fe.png b/gajim/data/emoticons/noto-emoticons/png/u1f93e_1f3fe.png
index 09496f632..09496f632 100644
--- a/data/emoticons/noto-emoticons/png/u1f93e_1f3fe.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f93e_1f3fe.png
diff --git a/data/emoticons/noto-emoticons/png/u1f93e_1f3fe_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f93e_1f3fe_200d_2640.png
index 12f0a0d5f..12f0a0d5f 100644
--- a/data/emoticons/noto-emoticons/png/u1f93e_1f3fe_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f93e_1f3fe_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f93e_1f3fe_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f93e_1f3fe_200d_2642.png
index 09496f632..09496f632 100644
--- a/data/emoticons/noto-emoticons/png/u1f93e_1f3fe_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f93e_1f3fe_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f93e_1f3ff.png b/gajim/data/emoticons/noto-emoticons/png/u1f93e_1f3ff.png
index 90e63ec6c..90e63ec6c 100644
--- a/data/emoticons/noto-emoticons/png/u1f93e_1f3ff.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f93e_1f3ff.png
diff --git a/data/emoticons/noto-emoticons/png/u1f93e_1f3ff_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f93e_1f3ff_200d_2640.png
index 7128ac385..7128ac385 100644
--- a/data/emoticons/noto-emoticons/png/u1f93e_1f3ff_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f93e_1f3ff_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f93e_1f3ff_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f93e_1f3ff_200d_2642.png
index 90e63ec6c..90e63ec6c 100644
--- a/data/emoticons/noto-emoticons/png/u1f93e_1f3ff_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f93e_1f3ff_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f93e_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u1f93e_200d_2640.png
index 1e21057f0..1e21057f0 100644
--- a/data/emoticons/noto-emoticons/png/u1f93e_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f93e_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u1f93e_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u1f93e_200d_2642.png
index 153132b7a..153132b7a 100644
--- a/data/emoticons/noto-emoticons/png/u1f93e_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f93e_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u1f940.png b/gajim/data/emoticons/noto-emoticons/png/u1f940.png
index 8d3a1c701..8d3a1c701 100644
--- a/data/emoticons/noto-emoticons/png/u1f940.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f940.png
diff --git a/data/emoticons/noto-emoticons/png/u1f941.png b/gajim/data/emoticons/noto-emoticons/png/u1f941.png
index c67bacae1..c67bacae1 100644
--- a/data/emoticons/noto-emoticons/png/u1f941.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f941.png
diff --git a/data/emoticons/noto-emoticons/png/u1f942.png b/gajim/data/emoticons/noto-emoticons/png/u1f942.png
index 44ccd422c..44ccd422c 100644
--- a/data/emoticons/noto-emoticons/png/u1f942.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f942.png
diff --git a/data/emoticons/noto-emoticons/png/u1f943.png b/gajim/data/emoticons/noto-emoticons/png/u1f943.png
index 1304d95a1..1304d95a1 100644
--- a/data/emoticons/noto-emoticons/png/u1f943.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f943.png
diff --git a/data/emoticons/noto-emoticons/png/u1f944.png b/gajim/data/emoticons/noto-emoticons/png/u1f944.png
index 5f54f56b1..5f54f56b1 100644
--- a/data/emoticons/noto-emoticons/png/u1f944.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f944.png
diff --git a/data/emoticons/noto-emoticons/png/u1f945.png b/gajim/data/emoticons/noto-emoticons/png/u1f945.png
index 1fddf2887..1fddf2887 100644
--- a/data/emoticons/noto-emoticons/png/u1f945.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f945.png
diff --git a/data/emoticons/noto-emoticons/png/u1f947.png b/gajim/data/emoticons/noto-emoticons/png/u1f947.png
index b948b57b5..b948b57b5 100644
--- a/data/emoticons/noto-emoticons/png/u1f947.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f947.png
diff --git a/data/emoticons/noto-emoticons/png/u1f948.png b/gajim/data/emoticons/noto-emoticons/png/u1f948.png
index fd70ca476..fd70ca476 100644
--- a/data/emoticons/noto-emoticons/png/u1f948.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f948.png
diff --git a/data/emoticons/noto-emoticons/png/u1f949.png b/gajim/data/emoticons/noto-emoticons/png/u1f949.png
index 981335922..981335922 100644
--- a/data/emoticons/noto-emoticons/png/u1f949.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f949.png
diff --git a/data/emoticons/noto-emoticons/png/u1f94a.png b/gajim/data/emoticons/noto-emoticons/png/u1f94a.png
index 0391332bb..0391332bb 100644
--- a/data/emoticons/noto-emoticons/png/u1f94a.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f94a.png
diff --git a/data/emoticons/noto-emoticons/png/u1f94b.png b/gajim/data/emoticons/noto-emoticons/png/u1f94b.png
index 92049d7a0..92049d7a0 100644
--- a/data/emoticons/noto-emoticons/png/u1f94b.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f94b.png
diff --git a/data/emoticons/noto-emoticons/png/u1f950.png b/gajim/data/emoticons/noto-emoticons/png/u1f950.png
index 5e54fc9b9..5e54fc9b9 100644
--- a/data/emoticons/noto-emoticons/png/u1f950.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f950.png
diff --git a/data/emoticons/noto-emoticons/png/u1f951.png b/gajim/data/emoticons/noto-emoticons/png/u1f951.png
index 94285320f..94285320f 100644
--- a/data/emoticons/noto-emoticons/png/u1f951.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f951.png
diff --git a/data/emoticons/noto-emoticons/png/u1f952.png b/gajim/data/emoticons/noto-emoticons/png/u1f952.png
index b5e223b34..b5e223b34 100644
--- a/data/emoticons/noto-emoticons/png/u1f952.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f952.png
diff --git a/data/emoticons/noto-emoticons/png/u1f953.png b/gajim/data/emoticons/noto-emoticons/png/u1f953.png
index bf5733bdc..bf5733bdc 100644
--- a/data/emoticons/noto-emoticons/png/u1f953.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f953.png
diff --git a/data/emoticons/noto-emoticons/png/u1f954.png b/gajim/data/emoticons/noto-emoticons/png/u1f954.png
index 23546858b..23546858b 100644
--- a/data/emoticons/noto-emoticons/png/u1f954.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f954.png
diff --git a/data/emoticons/noto-emoticons/png/u1f955.png b/gajim/data/emoticons/noto-emoticons/png/u1f955.png
index 7a1d9fc61..7a1d9fc61 100644
--- a/data/emoticons/noto-emoticons/png/u1f955.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f955.png
diff --git a/data/emoticons/noto-emoticons/png/u1f956.png b/gajim/data/emoticons/noto-emoticons/png/u1f956.png
index e814c5d36..e814c5d36 100644
--- a/data/emoticons/noto-emoticons/png/u1f956.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f956.png
diff --git a/data/emoticons/noto-emoticons/png/u1f957.png b/gajim/data/emoticons/noto-emoticons/png/u1f957.png
index 211740e19..211740e19 100644
--- a/data/emoticons/noto-emoticons/png/u1f957.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f957.png
diff --git a/data/emoticons/noto-emoticons/png/u1f958.png b/gajim/data/emoticons/noto-emoticons/png/u1f958.png
index 2cf8deed8..2cf8deed8 100644
--- a/data/emoticons/noto-emoticons/png/u1f958.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f958.png
diff --git a/data/emoticons/noto-emoticons/png/u1f959.png b/gajim/data/emoticons/noto-emoticons/png/u1f959.png
index 700c5d252..700c5d252 100644
--- a/data/emoticons/noto-emoticons/png/u1f959.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f959.png
diff --git a/data/emoticons/noto-emoticons/png/u1f95a.png b/gajim/data/emoticons/noto-emoticons/png/u1f95a.png
index 05249fbe6..05249fbe6 100644
--- a/data/emoticons/noto-emoticons/png/u1f95a.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f95a.png
diff --git a/data/emoticons/noto-emoticons/png/u1f95b.png b/gajim/data/emoticons/noto-emoticons/png/u1f95b.png
index ca032ea61..ca032ea61 100644
--- a/data/emoticons/noto-emoticons/png/u1f95b.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f95b.png
diff --git a/data/emoticons/noto-emoticons/png/u1f95c.png b/gajim/data/emoticons/noto-emoticons/png/u1f95c.png
index e5b659f59..e5b659f59 100644
--- a/data/emoticons/noto-emoticons/png/u1f95c.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f95c.png
diff --git a/data/emoticons/noto-emoticons/png/u1f95d.png b/gajim/data/emoticons/noto-emoticons/png/u1f95d.png
index 2c5a1635e..2c5a1635e 100644
--- a/data/emoticons/noto-emoticons/png/u1f95d.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f95d.png
diff --git a/data/emoticons/noto-emoticons/png/u1f95e.png b/gajim/data/emoticons/noto-emoticons/png/u1f95e.png
index db838a545..db838a545 100644
--- a/data/emoticons/noto-emoticons/png/u1f95e.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f95e.png
diff --git a/data/emoticons/noto-emoticons/png/u1f980.png b/gajim/data/emoticons/noto-emoticons/png/u1f980.png
index 44770fcb0..44770fcb0 100644
--- a/data/emoticons/noto-emoticons/png/u1f980.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f980.png
diff --git a/data/emoticons/noto-emoticons/png/u1f981.png b/gajim/data/emoticons/noto-emoticons/png/u1f981.png
index ee6b47f35..ee6b47f35 100644
--- a/data/emoticons/noto-emoticons/png/u1f981.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f981.png
diff --git a/data/emoticons/noto-emoticons/png/u1f982.png b/gajim/data/emoticons/noto-emoticons/png/u1f982.png
index 170031d17..170031d17 100644
--- a/data/emoticons/noto-emoticons/png/u1f982.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f982.png
diff --git a/data/emoticons/noto-emoticons/png/u1f983.png b/gajim/data/emoticons/noto-emoticons/png/u1f983.png
index 37b0548d4..37b0548d4 100644
--- a/data/emoticons/noto-emoticons/png/u1f983.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f983.png
diff --git a/data/emoticons/noto-emoticons/png/u1f984.png b/gajim/data/emoticons/noto-emoticons/png/u1f984.png
index 35873ba27..35873ba27 100644
--- a/data/emoticons/noto-emoticons/png/u1f984.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f984.png
diff --git a/data/emoticons/noto-emoticons/png/u1f985.png b/gajim/data/emoticons/noto-emoticons/png/u1f985.png
index 94891849c..94891849c 100644
--- a/data/emoticons/noto-emoticons/png/u1f985.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f985.png
diff --git a/data/emoticons/noto-emoticons/png/u1f986.png b/gajim/data/emoticons/noto-emoticons/png/u1f986.png
index ab9d9523f..ab9d9523f 100644
--- a/data/emoticons/noto-emoticons/png/u1f986.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f986.png
diff --git a/data/emoticons/noto-emoticons/png/u1f987.png b/gajim/data/emoticons/noto-emoticons/png/u1f987.png
index 299173667..299173667 100644
--- a/data/emoticons/noto-emoticons/png/u1f987.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f987.png
diff --git a/data/emoticons/noto-emoticons/png/u1f988.png b/gajim/data/emoticons/noto-emoticons/png/u1f988.png
index 5fefc5168..5fefc5168 100644
--- a/data/emoticons/noto-emoticons/png/u1f988.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f988.png
diff --git a/data/emoticons/noto-emoticons/png/u1f989.png b/gajim/data/emoticons/noto-emoticons/png/u1f989.png
index 44e455be0..44e455be0 100644
--- a/data/emoticons/noto-emoticons/png/u1f989.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f989.png
diff --git a/data/emoticons/noto-emoticons/png/u1f98a.png b/gajim/data/emoticons/noto-emoticons/png/u1f98a.png
index 63a49e83c..63a49e83c 100644
--- a/data/emoticons/noto-emoticons/png/u1f98a.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f98a.png
diff --git a/data/emoticons/noto-emoticons/png/u1f98b.png b/gajim/data/emoticons/noto-emoticons/png/u1f98b.png
index 7bdc626ef..7bdc626ef 100644
--- a/data/emoticons/noto-emoticons/png/u1f98b.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f98b.png
diff --git a/data/emoticons/noto-emoticons/png/u1f98c.png b/gajim/data/emoticons/noto-emoticons/png/u1f98c.png
index 3eedf86e9..3eedf86e9 100644
--- a/data/emoticons/noto-emoticons/png/u1f98c.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f98c.png
diff --git a/data/emoticons/noto-emoticons/png/u1f98d.png b/gajim/data/emoticons/noto-emoticons/png/u1f98d.png
index 0be62e003..0be62e003 100644
--- a/data/emoticons/noto-emoticons/png/u1f98d.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f98d.png
diff --git a/data/emoticons/noto-emoticons/png/u1f98e.png b/gajim/data/emoticons/noto-emoticons/png/u1f98e.png
index 4606af221..4606af221 100644
--- a/data/emoticons/noto-emoticons/png/u1f98e.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f98e.png
diff --git a/data/emoticons/noto-emoticons/png/u1f98f.png b/gajim/data/emoticons/noto-emoticons/png/u1f98f.png
index f0f776486..f0f776486 100644
--- a/data/emoticons/noto-emoticons/png/u1f98f.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f98f.png
diff --git a/data/emoticons/noto-emoticons/png/u1f990.png b/gajim/data/emoticons/noto-emoticons/png/u1f990.png
index ceda3c7b5..ceda3c7b5 100644
--- a/data/emoticons/noto-emoticons/png/u1f990.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f990.png
diff --git a/data/emoticons/noto-emoticons/png/u1f991.png b/gajim/data/emoticons/noto-emoticons/png/u1f991.png
index f68a80e5f..f68a80e5f 100644
--- a/data/emoticons/noto-emoticons/png/u1f991.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f991.png
diff --git a/data/emoticons/noto-emoticons/png/u1f9c0.png b/gajim/data/emoticons/noto-emoticons/png/u1f9c0.png
index 177bd32d8..177bd32d8 100644
--- a/data/emoticons/noto-emoticons/png/u1f9c0.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u1f9c0.png
diff --git a/data/emoticons/noto-emoticons/png/u203c.png b/gajim/data/emoticons/noto-emoticons/png/u203c.png
index 312c879b8..312c879b8 100644
--- a/data/emoticons/noto-emoticons/png/u203c.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u203c.png
diff --git a/data/emoticons/noto-emoticons/png/u2049.png b/gajim/data/emoticons/noto-emoticons/png/u2049.png
index 2e7db6f20..2e7db6f20 100644
--- a/data/emoticons/noto-emoticons/png/u2049.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u2049.png
diff --git a/data/emoticons/noto-emoticons/png/u20e3.png b/gajim/data/emoticons/noto-emoticons/png/u20e3.png
index 4674842c2..4674842c2 100644
--- a/data/emoticons/noto-emoticons/png/u20e3.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u20e3.png
diff --git a/data/emoticons/noto-emoticons/png/u2122.png b/gajim/data/emoticons/noto-emoticons/png/u2122.png
index 3e5397985..3e5397985 100644
--- a/data/emoticons/noto-emoticons/png/u2122.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u2122.png
diff --git a/data/emoticons/noto-emoticons/png/u2139.png b/gajim/data/emoticons/noto-emoticons/png/u2139.png
index 0b250afd6..0b250afd6 100644
--- a/data/emoticons/noto-emoticons/png/u2139.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u2139.png
diff --git a/data/emoticons/noto-emoticons/png/u2194.png b/gajim/data/emoticons/noto-emoticons/png/u2194.png
index 095804bcd..095804bcd 100644
--- a/data/emoticons/noto-emoticons/png/u2194.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u2194.png
diff --git a/data/emoticons/noto-emoticons/png/u2195.png b/gajim/data/emoticons/noto-emoticons/png/u2195.png
index be51502f0..be51502f0 100644
--- a/data/emoticons/noto-emoticons/png/u2195.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u2195.png
diff --git a/data/emoticons/noto-emoticons/png/u2196.png b/gajim/data/emoticons/noto-emoticons/png/u2196.png
index 59cf3c221..59cf3c221 100644
--- a/data/emoticons/noto-emoticons/png/u2196.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u2196.png
diff --git a/data/emoticons/noto-emoticons/png/u2197.png b/gajim/data/emoticons/noto-emoticons/png/u2197.png
index caa33d1fd..caa33d1fd 100644
--- a/data/emoticons/noto-emoticons/png/u2197.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u2197.png
diff --git a/data/emoticons/noto-emoticons/png/u2198.png b/gajim/data/emoticons/noto-emoticons/png/u2198.png
index df602e920..df602e920 100644
--- a/data/emoticons/noto-emoticons/png/u2198.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u2198.png
diff --git a/data/emoticons/noto-emoticons/png/u2199.png b/gajim/data/emoticons/noto-emoticons/png/u2199.png
index 8cf285fa8..8cf285fa8 100644
--- a/data/emoticons/noto-emoticons/png/u2199.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u2199.png
diff --git a/data/emoticons/noto-emoticons/png/u21a9.png b/gajim/data/emoticons/noto-emoticons/png/u21a9.png
index 6e87a6bde..6e87a6bde 100644
--- a/data/emoticons/noto-emoticons/png/u21a9.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u21a9.png
diff --git a/data/emoticons/noto-emoticons/png/u21aa.png b/gajim/data/emoticons/noto-emoticons/png/u21aa.png
index 6a363e942..6a363e942 100644
--- a/data/emoticons/noto-emoticons/png/u21aa.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u21aa.png
diff --git a/data/emoticons/noto-emoticons/png/u231a.png b/gajim/data/emoticons/noto-emoticons/png/u231a.png
index 7a4d83595..7a4d83595 100644
--- a/data/emoticons/noto-emoticons/png/u231a.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u231a.png
diff --git a/data/emoticons/noto-emoticons/png/u231b.png b/gajim/data/emoticons/noto-emoticons/png/u231b.png
index 1c7df1949..1c7df1949 100644
--- a/data/emoticons/noto-emoticons/png/u231b.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u231b.png
diff --git a/data/emoticons/noto-emoticons/png/u2328.png b/gajim/data/emoticons/noto-emoticons/png/u2328.png
index b1f3eb946..b1f3eb946 100644
--- a/data/emoticons/noto-emoticons/png/u2328.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u2328.png
diff --git a/data/emoticons/noto-emoticons/png/u23cf.png b/gajim/data/emoticons/noto-emoticons/png/u23cf.png
index ed7634a2f..ed7634a2f 100644
--- a/data/emoticons/noto-emoticons/png/u23cf.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u23cf.png
diff --git a/data/emoticons/noto-emoticons/png/u23e9.png b/gajim/data/emoticons/noto-emoticons/png/u23e9.png
index 65c967003..65c967003 100644
--- a/data/emoticons/noto-emoticons/png/u23e9.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u23e9.png
diff --git a/data/emoticons/noto-emoticons/png/u23ea.png b/gajim/data/emoticons/noto-emoticons/png/u23ea.png
index 64546c687..64546c687 100644
--- a/data/emoticons/noto-emoticons/png/u23ea.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u23ea.png
diff --git a/data/emoticons/noto-emoticons/png/u23eb.png b/gajim/data/emoticons/noto-emoticons/png/u23eb.png
index a1502093e..a1502093e 100644
--- a/data/emoticons/noto-emoticons/png/u23eb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u23eb.png
diff --git a/data/emoticons/noto-emoticons/png/u23ec.png b/gajim/data/emoticons/noto-emoticons/png/u23ec.png
index 77c3da659..77c3da659 100644
--- a/data/emoticons/noto-emoticons/png/u23ec.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u23ec.png
diff --git a/data/emoticons/noto-emoticons/png/u23ed.png b/gajim/data/emoticons/noto-emoticons/png/u23ed.png
index 0b61e6865..0b61e6865 100644
--- a/data/emoticons/noto-emoticons/png/u23ed.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u23ed.png
diff --git a/data/emoticons/noto-emoticons/png/u23ee.png b/gajim/data/emoticons/noto-emoticons/png/u23ee.png
index 65549e653..65549e653 100644
--- a/data/emoticons/noto-emoticons/png/u23ee.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u23ee.png
diff --git a/data/emoticons/noto-emoticons/png/u23ef.png b/gajim/data/emoticons/noto-emoticons/png/u23ef.png
index d3225ad1a..d3225ad1a 100644
--- a/data/emoticons/noto-emoticons/png/u23ef.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u23ef.png
diff --git a/data/emoticons/noto-emoticons/png/u23f0.png b/gajim/data/emoticons/noto-emoticons/png/u23f0.png
index 490fec18b..490fec18b 100644
--- a/data/emoticons/noto-emoticons/png/u23f0.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u23f0.png
diff --git a/data/emoticons/noto-emoticons/png/u23f1.png b/gajim/data/emoticons/noto-emoticons/png/u23f1.png
index 589bf32b9..589bf32b9 100644
--- a/data/emoticons/noto-emoticons/png/u23f1.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u23f1.png
diff --git a/data/emoticons/noto-emoticons/png/u23f2.png b/gajim/data/emoticons/noto-emoticons/png/u23f2.png
index b59554a1f..b59554a1f 100644
--- a/data/emoticons/noto-emoticons/png/u23f2.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u23f2.png
diff --git a/data/emoticons/noto-emoticons/png/u23f3.png b/gajim/data/emoticons/noto-emoticons/png/u23f3.png
index 7dbccf56a..7dbccf56a 100644
--- a/data/emoticons/noto-emoticons/png/u23f3.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u23f3.png
diff --git a/data/emoticons/noto-emoticons/png/u23f8.png b/gajim/data/emoticons/noto-emoticons/png/u23f8.png
index d2f736da0..d2f736da0 100644
--- a/data/emoticons/noto-emoticons/png/u23f8.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u23f8.png
diff --git a/data/emoticons/noto-emoticons/png/u23f9.png b/gajim/data/emoticons/noto-emoticons/png/u23f9.png
index e1d3ecfca..e1d3ecfca 100644
--- a/data/emoticons/noto-emoticons/png/u23f9.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u23f9.png
diff --git a/data/emoticons/noto-emoticons/png/u23fa.png b/gajim/data/emoticons/noto-emoticons/png/u23fa.png
index c698aa659..c698aa659 100644
--- a/data/emoticons/noto-emoticons/png/u23fa.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u23fa.png
diff --git a/data/emoticons/noto-emoticons/png/u24c2.png b/gajim/data/emoticons/noto-emoticons/png/u24c2.png
index 095928af8..095928af8 100644
--- a/data/emoticons/noto-emoticons/png/u24c2.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u24c2.png
diff --git a/data/emoticons/noto-emoticons/png/u25aa.png b/gajim/data/emoticons/noto-emoticons/png/u25aa.png
index 70b92f8bf..70b92f8bf 100644
--- a/data/emoticons/noto-emoticons/png/u25aa.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u25aa.png
diff --git a/data/emoticons/noto-emoticons/png/u25ab.png b/gajim/data/emoticons/noto-emoticons/png/u25ab.png
index 77d53f1ce..77d53f1ce 100644
--- a/data/emoticons/noto-emoticons/png/u25ab.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u25ab.png
diff --git a/data/emoticons/noto-emoticons/png/u25b6.png b/gajim/data/emoticons/noto-emoticons/png/u25b6.png
index 25c2709fe..25c2709fe 100644
--- a/data/emoticons/noto-emoticons/png/u25b6.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u25b6.png
diff --git a/data/emoticons/noto-emoticons/png/u25c0.png b/gajim/data/emoticons/noto-emoticons/png/u25c0.png
index d188c863f..d188c863f 100644
--- a/data/emoticons/noto-emoticons/png/u25c0.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u25c0.png
diff --git a/data/emoticons/noto-emoticons/png/u25fb.png b/gajim/data/emoticons/noto-emoticons/png/u25fb.png
index dbbd14475..dbbd14475 100644
--- a/data/emoticons/noto-emoticons/png/u25fb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u25fb.png
diff --git a/data/emoticons/noto-emoticons/png/u25fc.png b/gajim/data/emoticons/noto-emoticons/png/u25fc.png
index d381ca2ec..d381ca2ec 100644
--- a/data/emoticons/noto-emoticons/png/u25fc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u25fc.png
diff --git a/data/emoticons/noto-emoticons/png/u25fd.png b/gajim/data/emoticons/noto-emoticons/png/u25fd.png
index af85f4aa2..af85f4aa2 100644
--- a/data/emoticons/noto-emoticons/png/u25fd.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u25fd.png
diff --git a/data/emoticons/noto-emoticons/png/u25fe.png b/gajim/data/emoticons/noto-emoticons/png/u25fe.png
index e2c2d2ba2..e2c2d2ba2 100644
--- a/data/emoticons/noto-emoticons/png/u25fe.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u25fe.png
diff --git a/data/emoticons/noto-emoticons/png/u2600.png b/gajim/data/emoticons/noto-emoticons/png/u2600.png
index d2b77ac38..d2b77ac38 100644
--- a/data/emoticons/noto-emoticons/png/u2600.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u2600.png
diff --git a/data/emoticons/noto-emoticons/png/u2601.png b/gajim/data/emoticons/noto-emoticons/png/u2601.png
index f807f122f..f807f122f 100644
--- a/data/emoticons/noto-emoticons/png/u2601.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u2601.png
diff --git a/data/emoticons/noto-emoticons/png/u2602.png b/gajim/data/emoticons/noto-emoticons/png/u2602.png
index 8339e81c6..8339e81c6 100644
--- a/data/emoticons/noto-emoticons/png/u2602.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u2602.png
diff --git a/data/emoticons/noto-emoticons/png/u2603.png b/gajim/data/emoticons/noto-emoticons/png/u2603.png
index 966ce508e..966ce508e 100644
--- a/data/emoticons/noto-emoticons/png/u2603.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u2603.png
diff --git a/data/emoticons/noto-emoticons/png/u2604.png b/gajim/data/emoticons/noto-emoticons/png/u2604.png
index 746f4e881..746f4e881 100644
--- a/data/emoticons/noto-emoticons/png/u2604.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u2604.png
diff --git a/data/emoticons/noto-emoticons/png/u260e.png b/gajim/data/emoticons/noto-emoticons/png/u260e.png
index 1bdbf866c..1bdbf866c 100644
--- a/data/emoticons/noto-emoticons/png/u260e.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u260e.png
diff --git a/data/emoticons/noto-emoticons/png/u2611.png b/gajim/data/emoticons/noto-emoticons/png/u2611.png
index 2d3552d45..2d3552d45 100644
--- a/data/emoticons/noto-emoticons/png/u2611.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u2611.png
diff --git a/data/emoticons/noto-emoticons/png/u2614.png b/gajim/data/emoticons/noto-emoticons/png/u2614.png
index 99a848ab3..99a848ab3 100644
--- a/data/emoticons/noto-emoticons/png/u2614.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u2614.png
diff --git a/data/emoticons/noto-emoticons/png/u2615.png b/gajim/data/emoticons/noto-emoticons/png/u2615.png
index 69dc6dedd..69dc6dedd 100644
--- a/data/emoticons/noto-emoticons/png/u2615.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u2615.png
diff --git a/data/emoticons/noto-emoticons/png/u2618.png b/gajim/data/emoticons/noto-emoticons/png/u2618.png
index 25e24d7df..25e24d7df 100644
--- a/data/emoticons/noto-emoticons/png/u2618.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u2618.png
diff --git a/data/emoticons/noto-emoticons/png/u261d.png b/gajim/data/emoticons/noto-emoticons/png/u261d.png
index 278420d62..278420d62 100644
--- a/data/emoticons/noto-emoticons/png/u261d.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u261d.png
diff --git a/data/emoticons/noto-emoticons/png/u261d_1f3fb.png b/gajim/data/emoticons/noto-emoticons/png/u261d_1f3fb.png
index e40aaf1a5..e40aaf1a5 100644
--- a/data/emoticons/noto-emoticons/png/u261d_1f3fb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u261d_1f3fb.png
diff --git a/data/emoticons/noto-emoticons/png/u261d_1f3fc.png b/gajim/data/emoticons/noto-emoticons/png/u261d_1f3fc.png
index ccc49c34e..ccc49c34e 100644
--- a/data/emoticons/noto-emoticons/png/u261d_1f3fc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u261d_1f3fc.png
diff --git a/data/emoticons/noto-emoticons/png/u261d_1f3fd.png b/gajim/data/emoticons/noto-emoticons/png/u261d_1f3fd.png
index eadb8b76b..eadb8b76b 100644
--- a/data/emoticons/noto-emoticons/png/u261d_1f3fd.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u261d_1f3fd.png
diff --git a/data/emoticons/noto-emoticons/png/u261d_1f3fe.png b/gajim/data/emoticons/noto-emoticons/png/u261d_1f3fe.png
index de94b5523..de94b5523 100644
--- a/data/emoticons/noto-emoticons/png/u261d_1f3fe.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u261d_1f3fe.png
diff --git a/data/emoticons/noto-emoticons/png/u261d_1f3ff.png b/gajim/data/emoticons/noto-emoticons/png/u261d_1f3ff.png
index a713a24a0..a713a24a0 100644
--- a/data/emoticons/noto-emoticons/png/u261d_1f3ff.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u261d_1f3ff.png
diff --git a/data/emoticons/noto-emoticons/png/u2620.png b/gajim/data/emoticons/noto-emoticons/png/u2620.png
index d2d5deaa6..d2d5deaa6 100644
--- a/data/emoticons/noto-emoticons/png/u2620.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u2620.png
diff --git a/data/emoticons/noto-emoticons/png/u2622.png b/gajim/data/emoticons/noto-emoticons/png/u2622.png
index 98e605c1a..98e605c1a 100644
--- a/data/emoticons/noto-emoticons/png/u2622.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u2622.png
diff --git a/data/emoticons/noto-emoticons/png/u2623.png b/gajim/data/emoticons/noto-emoticons/png/u2623.png
index 8b1980b2e..8b1980b2e 100644
--- a/data/emoticons/noto-emoticons/png/u2623.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u2623.png
diff --git a/data/emoticons/noto-emoticons/png/u2626.png b/gajim/data/emoticons/noto-emoticons/png/u2626.png
index be3342974..be3342974 100644
--- a/data/emoticons/noto-emoticons/png/u2626.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u2626.png
diff --git a/data/emoticons/noto-emoticons/png/u262a.png b/gajim/data/emoticons/noto-emoticons/png/u262a.png
index 3cfd3b755..3cfd3b755 100644
--- a/data/emoticons/noto-emoticons/png/u262a.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u262a.png
diff --git a/data/emoticons/noto-emoticons/png/u262e.png b/gajim/data/emoticons/noto-emoticons/png/u262e.png
index 26be3ae05..26be3ae05 100644
--- a/data/emoticons/noto-emoticons/png/u262e.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u262e.png
diff --git a/data/emoticons/noto-emoticons/png/u262f.png b/gajim/data/emoticons/noto-emoticons/png/u262f.png
index f6fb191e7..f6fb191e7 100644
--- a/data/emoticons/noto-emoticons/png/u262f.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u262f.png
diff --git a/data/emoticons/noto-emoticons/png/u2638.png b/gajim/data/emoticons/noto-emoticons/png/u2638.png
index 50803357e..50803357e 100644
--- a/data/emoticons/noto-emoticons/png/u2638.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u2638.png
diff --git a/data/emoticons/noto-emoticons/png/u2639.png b/gajim/data/emoticons/noto-emoticons/png/u2639.png
index fb9f33e4f..fb9f33e4f 100644
--- a/data/emoticons/noto-emoticons/png/u2639.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u2639.png
diff --git a/data/emoticons/noto-emoticons/png/u263a.png b/gajim/data/emoticons/noto-emoticons/png/u263a.png
index aac621332..aac621332 100644
--- a/data/emoticons/noto-emoticons/png/u263a.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u263a.png
diff --git a/data/emoticons/noto-emoticons/png/u2640.png b/gajim/data/emoticons/noto-emoticons/png/u2640.png
index fed0580d0..fed0580d0 100644
--- a/data/emoticons/noto-emoticons/png/u2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u2640.png
diff --git a/data/emoticons/noto-emoticons/png/u2642.png b/gajim/data/emoticons/noto-emoticons/png/u2642.png
index e6650ce3c..e6650ce3c 100644
--- a/data/emoticons/noto-emoticons/png/u2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u2642.png
diff --git a/data/emoticons/noto-emoticons/png/u2648.png b/gajim/data/emoticons/noto-emoticons/png/u2648.png
index ab71d09b4..ab71d09b4 100644
--- a/data/emoticons/noto-emoticons/png/u2648.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u2648.png
diff --git a/data/emoticons/noto-emoticons/png/u2649.png b/gajim/data/emoticons/noto-emoticons/png/u2649.png
index 7ea6a1f81..7ea6a1f81 100644
--- a/data/emoticons/noto-emoticons/png/u2649.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u2649.png
diff --git a/data/emoticons/noto-emoticons/png/u264a.png b/gajim/data/emoticons/noto-emoticons/png/u264a.png
index de70657b5..de70657b5 100644
--- a/data/emoticons/noto-emoticons/png/u264a.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u264a.png
diff --git a/data/emoticons/noto-emoticons/png/u264b.png b/gajim/data/emoticons/noto-emoticons/png/u264b.png
index 939caf3ad..939caf3ad 100644
--- a/data/emoticons/noto-emoticons/png/u264b.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u264b.png
diff --git a/data/emoticons/noto-emoticons/png/u264c.png b/gajim/data/emoticons/noto-emoticons/png/u264c.png
index be6b990da..be6b990da 100644
--- a/data/emoticons/noto-emoticons/png/u264c.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u264c.png
diff --git a/data/emoticons/noto-emoticons/png/u264d.png b/gajim/data/emoticons/noto-emoticons/png/u264d.png
index 226952771..226952771 100644
--- a/data/emoticons/noto-emoticons/png/u264d.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u264d.png
diff --git a/data/emoticons/noto-emoticons/png/u264e.png b/gajim/data/emoticons/noto-emoticons/png/u264e.png
index 33754d253..33754d253 100644
--- a/data/emoticons/noto-emoticons/png/u264e.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u264e.png
diff --git a/data/emoticons/noto-emoticons/png/u264f.png b/gajim/data/emoticons/noto-emoticons/png/u264f.png
index ffd95a501..ffd95a501 100644
--- a/data/emoticons/noto-emoticons/png/u264f.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u264f.png
diff --git a/data/emoticons/noto-emoticons/png/u2650.png b/gajim/data/emoticons/noto-emoticons/png/u2650.png
index fb59d321c..fb59d321c 100644
--- a/data/emoticons/noto-emoticons/png/u2650.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u2650.png
diff --git a/data/emoticons/noto-emoticons/png/u2651.png b/gajim/data/emoticons/noto-emoticons/png/u2651.png
index 75df3c15d..75df3c15d 100644
--- a/data/emoticons/noto-emoticons/png/u2651.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u2651.png
diff --git a/data/emoticons/noto-emoticons/png/u2652.png b/gajim/data/emoticons/noto-emoticons/png/u2652.png
index 6853ec1cf..6853ec1cf 100644
--- a/data/emoticons/noto-emoticons/png/u2652.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u2652.png
diff --git a/data/emoticons/noto-emoticons/png/u2653.png b/gajim/data/emoticons/noto-emoticons/png/u2653.png
index c73064b9c..c73064b9c 100644
--- a/data/emoticons/noto-emoticons/png/u2653.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u2653.png
diff --git a/data/emoticons/noto-emoticons/png/u2660.png b/gajim/data/emoticons/noto-emoticons/png/u2660.png
index 8c1684085..8c1684085 100644
--- a/data/emoticons/noto-emoticons/png/u2660.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u2660.png
diff --git a/data/emoticons/noto-emoticons/png/u2663.png b/gajim/data/emoticons/noto-emoticons/png/u2663.png
index 50e7699cc..50e7699cc 100644
--- a/data/emoticons/noto-emoticons/png/u2663.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u2663.png
diff --git a/data/emoticons/noto-emoticons/png/u2665.png b/gajim/data/emoticons/noto-emoticons/png/u2665.png
index 80104f2d3..80104f2d3 100644
--- a/data/emoticons/noto-emoticons/png/u2665.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u2665.png
diff --git a/data/emoticons/noto-emoticons/png/u2666.png b/gajim/data/emoticons/noto-emoticons/png/u2666.png
index 86e6877f8..86e6877f8 100644
--- a/data/emoticons/noto-emoticons/png/u2666.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u2666.png
diff --git a/data/emoticons/noto-emoticons/png/u2668.png b/gajim/data/emoticons/noto-emoticons/png/u2668.png
index 66cb6eddb..66cb6eddb 100644
--- a/data/emoticons/noto-emoticons/png/u2668.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u2668.png
diff --git a/data/emoticons/noto-emoticons/png/u267b.png b/gajim/data/emoticons/noto-emoticons/png/u267b.png
index d6b47c60a..d6b47c60a 100644
--- a/data/emoticons/noto-emoticons/png/u267b.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u267b.png
diff --git a/data/emoticons/noto-emoticons/png/u267f.png b/gajim/data/emoticons/noto-emoticons/png/u267f.png
index ecb27973f..ecb27973f 100644
--- a/data/emoticons/noto-emoticons/png/u267f.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u267f.png
diff --git a/data/emoticons/noto-emoticons/png/u2692.png b/gajim/data/emoticons/noto-emoticons/png/u2692.png
index f7fe88178..f7fe88178 100644
--- a/data/emoticons/noto-emoticons/png/u2692.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u2692.png
diff --git a/data/emoticons/noto-emoticons/png/u2693.png b/gajim/data/emoticons/noto-emoticons/png/u2693.png
index cba2dd049..cba2dd049 100644
--- a/data/emoticons/noto-emoticons/png/u2693.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u2693.png
diff --git a/data/emoticons/noto-emoticons/png/u2694.png b/gajim/data/emoticons/noto-emoticons/png/u2694.png
index 787d32c72..787d32c72 100644
--- a/data/emoticons/noto-emoticons/png/u2694.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u2694.png
diff --git a/data/emoticons/noto-emoticons/png/u2695.png b/gajim/data/emoticons/noto-emoticons/png/u2695.png
index bbac934dc..bbac934dc 100644
--- a/data/emoticons/noto-emoticons/png/u2695.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u2695.png
diff --git a/data/emoticons/noto-emoticons/png/u2696.png b/gajim/data/emoticons/noto-emoticons/png/u2696.png
index bb7087cc6..bb7087cc6 100644
--- a/data/emoticons/noto-emoticons/png/u2696.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u2696.png
diff --git a/data/emoticons/noto-emoticons/png/u2697.png b/gajim/data/emoticons/noto-emoticons/png/u2697.png
index b9c689098..b9c689098 100644
--- a/data/emoticons/noto-emoticons/png/u2697.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u2697.png
diff --git a/data/emoticons/noto-emoticons/png/u2699.png b/gajim/data/emoticons/noto-emoticons/png/u2699.png
index 52aff1047..52aff1047 100644
--- a/data/emoticons/noto-emoticons/png/u2699.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u2699.png
diff --git a/data/emoticons/noto-emoticons/png/u269b.png b/gajim/data/emoticons/noto-emoticons/png/u269b.png
index 8ef096ce6..8ef096ce6 100644
--- a/data/emoticons/noto-emoticons/png/u269b.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u269b.png
diff --git a/data/emoticons/noto-emoticons/png/u269c.png b/gajim/data/emoticons/noto-emoticons/png/u269c.png
index 5dce14df6..5dce14df6 100644
--- a/data/emoticons/noto-emoticons/png/u269c.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u269c.png
diff --git a/data/emoticons/noto-emoticons/png/u26a0.png b/gajim/data/emoticons/noto-emoticons/png/u26a0.png
index 9eb1f2f07..9eb1f2f07 100644
--- a/data/emoticons/noto-emoticons/png/u26a0.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u26a0.png
diff --git a/data/emoticons/noto-emoticons/png/u26a1.png b/gajim/data/emoticons/noto-emoticons/png/u26a1.png
index 5ce85e9d3..5ce85e9d3 100644
--- a/data/emoticons/noto-emoticons/png/u26a1.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u26a1.png
diff --git a/data/emoticons/noto-emoticons/png/u26aa.png b/gajim/data/emoticons/noto-emoticons/png/u26aa.png
index a84a68039..a84a68039 100644
--- a/data/emoticons/noto-emoticons/png/u26aa.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u26aa.png
diff --git a/data/emoticons/noto-emoticons/png/u26ab.png b/gajim/data/emoticons/noto-emoticons/png/u26ab.png
index 48b2546aa..48b2546aa 100644
--- a/data/emoticons/noto-emoticons/png/u26ab.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u26ab.png
diff --git a/data/emoticons/noto-emoticons/png/u26b0.png b/gajim/data/emoticons/noto-emoticons/png/u26b0.png
index 87341e672..87341e672 100644
--- a/data/emoticons/noto-emoticons/png/u26b0.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u26b0.png
diff --git a/data/emoticons/noto-emoticons/png/u26b1.png b/gajim/data/emoticons/noto-emoticons/png/u26b1.png
index 69fe68c95..69fe68c95 100644
--- a/data/emoticons/noto-emoticons/png/u26b1.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u26b1.png
diff --git a/data/emoticons/noto-emoticons/png/u26bd.png b/gajim/data/emoticons/noto-emoticons/png/u26bd.png
index f20694794..f20694794 100644
--- a/data/emoticons/noto-emoticons/png/u26bd.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u26bd.png
diff --git a/data/emoticons/noto-emoticons/png/u26be.png b/gajim/data/emoticons/noto-emoticons/png/u26be.png
index 92fcf335a..92fcf335a 100644
--- a/data/emoticons/noto-emoticons/png/u26be.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u26be.png
diff --git a/data/emoticons/noto-emoticons/png/u26c4.png b/gajim/data/emoticons/noto-emoticons/png/u26c4.png
index 88fca5408..88fca5408 100644
--- a/data/emoticons/noto-emoticons/png/u26c4.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u26c4.png
diff --git a/data/emoticons/noto-emoticons/png/u26c5.png b/gajim/data/emoticons/noto-emoticons/png/u26c5.png
index b13310d1b..b13310d1b 100644
--- a/data/emoticons/noto-emoticons/png/u26c5.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u26c5.png
diff --git a/data/emoticons/noto-emoticons/png/u26c8.png b/gajim/data/emoticons/noto-emoticons/png/u26c8.png
index 8bd3bd942..8bd3bd942 100644
--- a/data/emoticons/noto-emoticons/png/u26c8.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u26c8.png
diff --git a/data/emoticons/noto-emoticons/png/u26ce.png b/gajim/data/emoticons/noto-emoticons/png/u26ce.png
index d62cf5310..d62cf5310 100644
--- a/data/emoticons/noto-emoticons/png/u26ce.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u26ce.png
diff --git a/data/emoticons/noto-emoticons/png/u26cf.png b/gajim/data/emoticons/noto-emoticons/png/u26cf.png
index 13400e2be..13400e2be 100644
--- a/data/emoticons/noto-emoticons/png/u26cf.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u26cf.png
diff --git a/data/emoticons/noto-emoticons/png/u26d1.png b/gajim/data/emoticons/noto-emoticons/png/u26d1.png
index ce2cbe219..ce2cbe219 100644
--- a/data/emoticons/noto-emoticons/png/u26d1.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u26d1.png
diff --git a/data/emoticons/noto-emoticons/png/u26d3.png b/gajim/data/emoticons/noto-emoticons/png/u26d3.png
index 93a72dbaa..93a72dbaa 100644
--- a/data/emoticons/noto-emoticons/png/u26d3.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u26d3.png
diff --git a/data/emoticons/noto-emoticons/png/u26d4.png b/gajim/data/emoticons/noto-emoticons/png/u26d4.png
index 6fe59eded..6fe59eded 100644
--- a/data/emoticons/noto-emoticons/png/u26d4.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u26d4.png
diff --git a/data/emoticons/noto-emoticons/png/u26e9.png b/gajim/data/emoticons/noto-emoticons/png/u26e9.png
index 06cd0d96f..06cd0d96f 100644
--- a/data/emoticons/noto-emoticons/png/u26e9.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u26e9.png
diff --git a/data/emoticons/noto-emoticons/png/u26ea.png b/gajim/data/emoticons/noto-emoticons/png/u26ea.png
index 2abb1b72d..2abb1b72d 100644
--- a/data/emoticons/noto-emoticons/png/u26ea.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u26ea.png
diff --git a/data/emoticons/noto-emoticons/png/u26f0.png b/gajim/data/emoticons/noto-emoticons/png/u26f0.png
index 6b14921fc..6b14921fc 100644
--- a/data/emoticons/noto-emoticons/png/u26f0.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u26f0.png
diff --git a/data/emoticons/noto-emoticons/png/u26f1.png b/gajim/data/emoticons/noto-emoticons/png/u26f1.png
index de9188d16..de9188d16 100644
--- a/data/emoticons/noto-emoticons/png/u26f1.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u26f1.png
diff --git a/data/emoticons/noto-emoticons/png/u26f2.png b/gajim/data/emoticons/noto-emoticons/png/u26f2.png
index 78dc5f167..78dc5f167 100644
--- a/data/emoticons/noto-emoticons/png/u26f2.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u26f2.png
diff --git a/data/emoticons/noto-emoticons/png/u26f3.png b/gajim/data/emoticons/noto-emoticons/png/u26f3.png
index f4db227ea..f4db227ea 100644
--- a/data/emoticons/noto-emoticons/png/u26f3.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u26f3.png
diff --git a/data/emoticons/noto-emoticons/png/u26f4.png b/gajim/data/emoticons/noto-emoticons/png/u26f4.png
index 345482fe5..345482fe5 100644
--- a/data/emoticons/noto-emoticons/png/u26f4.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u26f4.png
diff --git a/data/emoticons/noto-emoticons/png/u26f5.png b/gajim/data/emoticons/noto-emoticons/png/u26f5.png
index 660aca13f..660aca13f 100644
--- a/data/emoticons/noto-emoticons/png/u26f5.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u26f5.png
diff --git a/data/emoticons/noto-emoticons/png/u26f7.png b/gajim/data/emoticons/noto-emoticons/png/u26f7.png
index 1f3fdbb77..1f3fdbb77 100644
--- a/data/emoticons/noto-emoticons/png/u26f7.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u26f7.png
diff --git a/data/emoticons/noto-emoticons/png/u26f8.png b/gajim/data/emoticons/noto-emoticons/png/u26f8.png
index af8a11f45..af8a11f45 100644
--- a/data/emoticons/noto-emoticons/png/u26f8.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u26f8.png
diff --git a/data/emoticons/noto-emoticons/png/u26f9.png b/gajim/data/emoticons/noto-emoticons/png/u26f9.png
index 2c42d1209..2c42d1209 100644
--- a/data/emoticons/noto-emoticons/png/u26f9.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u26f9.png
diff --git a/data/emoticons/noto-emoticons/png/u26f9_1f3fb.png b/gajim/data/emoticons/noto-emoticons/png/u26f9_1f3fb.png
index 3049c1248..3049c1248 100644
--- a/data/emoticons/noto-emoticons/png/u26f9_1f3fb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u26f9_1f3fb.png
diff --git a/data/emoticons/noto-emoticons/png/u26f9_1f3fb_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u26f9_1f3fb_200d_2640.png
index bd1670a52..bd1670a52 100644
--- a/data/emoticons/noto-emoticons/png/u26f9_1f3fb_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u26f9_1f3fb_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u26f9_1f3fb_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u26f9_1f3fb_200d_2642.png
index 3049c1248..3049c1248 100644
--- a/data/emoticons/noto-emoticons/png/u26f9_1f3fb_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u26f9_1f3fb_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u26f9_1f3fc.png b/gajim/data/emoticons/noto-emoticons/png/u26f9_1f3fc.png
index bf676c778..bf676c778 100644
--- a/data/emoticons/noto-emoticons/png/u26f9_1f3fc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u26f9_1f3fc.png
diff --git a/data/emoticons/noto-emoticons/png/u26f9_1f3fc_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u26f9_1f3fc_200d_2640.png
index 672a6e599..672a6e599 100644
--- a/data/emoticons/noto-emoticons/png/u26f9_1f3fc_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u26f9_1f3fc_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u26f9_1f3fc_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u26f9_1f3fc_200d_2642.png
index bf676c778..bf676c778 100644
--- a/data/emoticons/noto-emoticons/png/u26f9_1f3fc_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u26f9_1f3fc_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u26f9_1f3fd.png b/gajim/data/emoticons/noto-emoticons/png/u26f9_1f3fd.png
index 6b1a00ba8..6b1a00ba8 100644
--- a/data/emoticons/noto-emoticons/png/u26f9_1f3fd.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u26f9_1f3fd.png
diff --git a/data/emoticons/noto-emoticons/png/u26f9_1f3fd_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u26f9_1f3fd_200d_2640.png
index 202c433ed..202c433ed 100644
--- a/data/emoticons/noto-emoticons/png/u26f9_1f3fd_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u26f9_1f3fd_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u26f9_1f3fd_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u26f9_1f3fd_200d_2642.png
index 6b1a00ba8..6b1a00ba8 100644
--- a/data/emoticons/noto-emoticons/png/u26f9_1f3fd_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u26f9_1f3fd_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u26f9_1f3fe.png b/gajim/data/emoticons/noto-emoticons/png/u26f9_1f3fe.png
index 6462b13b6..6462b13b6 100644
--- a/data/emoticons/noto-emoticons/png/u26f9_1f3fe.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u26f9_1f3fe.png
diff --git a/data/emoticons/noto-emoticons/png/u26f9_1f3fe_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u26f9_1f3fe_200d_2640.png
index 3fab91404..3fab91404 100644
--- a/data/emoticons/noto-emoticons/png/u26f9_1f3fe_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u26f9_1f3fe_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u26f9_1f3fe_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u26f9_1f3fe_200d_2642.png
index 6462b13b6..6462b13b6 100644
--- a/data/emoticons/noto-emoticons/png/u26f9_1f3fe_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u26f9_1f3fe_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u26f9_1f3ff.png b/gajim/data/emoticons/noto-emoticons/png/u26f9_1f3ff.png
index 0cd49037f..0cd49037f 100644
--- a/data/emoticons/noto-emoticons/png/u26f9_1f3ff.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u26f9_1f3ff.png
diff --git a/data/emoticons/noto-emoticons/png/u26f9_1f3ff_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u26f9_1f3ff_200d_2640.png
index 8ed8cf3d7..8ed8cf3d7 100644
--- a/data/emoticons/noto-emoticons/png/u26f9_1f3ff_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u26f9_1f3ff_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u26f9_1f3ff_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u26f9_1f3ff_200d_2642.png
index 0cd49037f..0cd49037f 100644
--- a/data/emoticons/noto-emoticons/png/u26f9_1f3ff_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u26f9_1f3ff_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u26f9_200d_2640.png b/gajim/data/emoticons/noto-emoticons/png/u26f9_200d_2640.png
index 2b97eea63..2b97eea63 100644
--- a/data/emoticons/noto-emoticons/png/u26f9_200d_2640.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u26f9_200d_2640.png
diff --git a/data/emoticons/noto-emoticons/png/u26f9_200d_2642.png b/gajim/data/emoticons/noto-emoticons/png/u26f9_200d_2642.png
index 2c42d1209..2c42d1209 100644
--- a/data/emoticons/noto-emoticons/png/u26f9_200d_2642.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u26f9_200d_2642.png
diff --git a/data/emoticons/noto-emoticons/png/u26fa.png b/gajim/data/emoticons/noto-emoticons/png/u26fa.png
index c8116aea3..c8116aea3 100644
--- a/data/emoticons/noto-emoticons/png/u26fa.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u26fa.png
diff --git a/data/emoticons/noto-emoticons/png/u26fd.png b/gajim/data/emoticons/noto-emoticons/png/u26fd.png
index 4a2e7e892..4a2e7e892 100644
--- a/data/emoticons/noto-emoticons/png/u26fd.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u26fd.png
diff --git a/data/emoticons/noto-emoticons/png/u2702.png b/gajim/data/emoticons/noto-emoticons/png/u2702.png
index 024a70e94..024a70e94 100644
--- a/data/emoticons/noto-emoticons/png/u2702.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u2702.png
diff --git a/data/emoticons/noto-emoticons/png/u2705.png b/gajim/data/emoticons/noto-emoticons/png/u2705.png
index b6642f26e..b6642f26e 100644
--- a/data/emoticons/noto-emoticons/png/u2705.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u2705.png
diff --git a/data/emoticons/noto-emoticons/png/u2708.png b/gajim/data/emoticons/noto-emoticons/png/u2708.png
index 4d7319eda..4d7319eda 100644
--- a/data/emoticons/noto-emoticons/png/u2708.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u2708.png
diff --git a/data/emoticons/noto-emoticons/png/u2709.png b/gajim/data/emoticons/noto-emoticons/png/u2709.png
index 309ff4eb8..309ff4eb8 100644
--- a/data/emoticons/noto-emoticons/png/u2709.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u2709.png
diff --git a/data/emoticons/noto-emoticons/png/u270a.png b/gajim/data/emoticons/noto-emoticons/png/u270a.png
index 00a9cc8ad..00a9cc8ad 100644
--- a/data/emoticons/noto-emoticons/png/u270a.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u270a.png
diff --git a/data/emoticons/noto-emoticons/png/u270a_1f3fb.png b/gajim/data/emoticons/noto-emoticons/png/u270a_1f3fb.png
index 7525e5954..7525e5954 100644
--- a/data/emoticons/noto-emoticons/png/u270a_1f3fb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u270a_1f3fb.png
diff --git a/data/emoticons/noto-emoticons/png/u270a_1f3fc.png b/gajim/data/emoticons/noto-emoticons/png/u270a_1f3fc.png
index 6a0debdc3..6a0debdc3 100644
--- a/data/emoticons/noto-emoticons/png/u270a_1f3fc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u270a_1f3fc.png
diff --git a/data/emoticons/noto-emoticons/png/u270a_1f3fd.png b/gajim/data/emoticons/noto-emoticons/png/u270a_1f3fd.png
index 9b8dd290b..9b8dd290b 100644
--- a/data/emoticons/noto-emoticons/png/u270a_1f3fd.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u270a_1f3fd.png
diff --git a/data/emoticons/noto-emoticons/png/u270a_1f3fe.png b/gajim/data/emoticons/noto-emoticons/png/u270a_1f3fe.png
index 91067d6c7..91067d6c7 100644
--- a/data/emoticons/noto-emoticons/png/u270a_1f3fe.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u270a_1f3fe.png
diff --git a/data/emoticons/noto-emoticons/png/u270a_1f3ff.png b/gajim/data/emoticons/noto-emoticons/png/u270a_1f3ff.png
index 6653ffd32..6653ffd32 100644
--- a/data/emoticons/noto-emoticons/png/u270a_1f3ff.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u270a_1f3ff.png
diff --git a/data/emoticons/noto-emoticons/png/u270b.png b/gajim/data/emoticons/noto-emoticons/png/u270b.png
index cd9869d14..cd9869d14 100644
--- a/data/emoticons/noto-emoticons/png/u270b.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u270b.png
diff --git a/data/emoticons/noto-emoticons/png/u270b_1f3fb.png b/gajim/data/emoticons/noto-emoticons/png/u270b_1f3fb.png
index bcb839732..bcb839732 100644
--- a/data/emoticons/noto-emoticons/png/u270b_1f3fb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u270b_1f3fb.png
diff --git a/data/emoticons/noto-emoticons/png/u270b_1f3fc.png b/gajim/data/emoticons/noto-emoticons/png/u270b_1f3fc.png
index f882b12f9..f882b12f9 100644
--- a/data/emoticons/noto-emoticons/png/u270b_1f3fc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u270b_1f3fc.png
diff --git a/data/emoticons/noto-emoticons/png/u270b_1f3fd.png b/gajim/data/emoticons/noto-emoticons/png/u270b_1f3fd.png
index 0b6140c97..0b6140c97 100644
--- a/data/emoticons/noto-emoticons/png/u270b_1f3fd.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u270b_1f3fd.png
diff --git a/data/emoticons/noto-emoticons/png/u270b_1f3fe.png b/gajim/data/emoticons/noto-emoticons/png/u270b_1f3fe.png
index 2ecedcd3f..2ecedcd3f 100644
--- a/data/emoticons/noto-emoticons/png/u270b_1f3fe.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u270b_1f3fe.png
diff --git a/data/emoticons/noto-emoticons/png/u270b_1f3ff.png b/gajim/data/emoticons/noto-emoticons/png/u270b_1f3ff.png
index 4ba727175..4ba727175 100644
--- a/data/emoticons/noto-emoticons/png/u270b_1f3ff.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u270b_1f3ff.png
diff --git a/data/emoticons/noto-emoticons/png/u270c.png b/gajim/data/emoticons/noto-emoticons/png/u270c.png
index fa251eb6f..fa251eb6f 100644
--- a/data/emoticons/noto-emoticons/png/u270c.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u270c.png
diff --git a/data/emoticons/noto-emoticons/png/u270c_1f3fb.png b/gajim/data/emoticons/noto-emoticons/png/u270c_1f3fb.png
index 7138a8bc7..7138a8bc7 100644
--- a/data/emoticons/noto-emoticons/png/u270c_1f3fb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u270c_1f3fb.png
diff --git a/data/emoticons/noto-emoticons/png/u270c_1f3fc.png b/gajim/data/emoticons/noto-emoticons/png/u270c_1f3fc.png
index 585516606..585516606 100644
--- a/data/emoticons/noto-emoticons/png/u270c_1f3fc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u270c_1f3fc.png
diff --git a/data/emoticons/noto-emoticons/png/u270c_1f3fd.png b/gajim/data/emoticons/noto-emoticons/png/u270c_1f3fd.png
index 7194e88c7..7194e88c7 100644
--- a/data/emoticons/noto-emoticons/png/u270c_1f3fd.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u270c_1f3fd.png
diff --git a/data/emoticons/noto-emoticons/png/u270c_1f3fe.png b/gajim/data/emoticons/noto-emoticons/png/u270c_1f3fe.png
index 002c23888..002c23888 100644
--- a/data/emoticons/noto-emoticons/png/u270c_1f3fe.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u270c_1f3fe.png
diff --git a/data/emoticons/noto-emoticons/png/u270c_1f3ff.png b/gajim/data/emoticons/noto-emoticons/png/u270c_1f3ff.png
index 3707819b7..3707819b7 100644
--- a/data/emoticons/noto-emoticons/png/u270c_1f3ff.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u270c_1f3ff.png
diff --git a/data/emoticons/noto-emoticons/png/u270d.png b/gajim/data/emoticons/noto-emoticons/png/u270d.png
index 7d76c56ad..7d76c56ad 100644
--- a/data/emoticons/noto-emoticons/png/u270d.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u270d.png
diff --git a/data/emoticons/noto-emoticons/png/u270d_1f3fb.png b/gajim/data/emoticons/noto-emoticons/png/u270d_1f3fb.png
index be324a48d..be324a48d 100644
--- a/data/emoticons/noto-emoticons/png/u270d_1f3fb.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u270d_1f3fb.png
diff --git a/data/emoticons/noto-emoticons/png/u270d_1f3fc.png b/gajim/data/emoticons/noto-emoticons/png/u270d_1f3fc.png
index 44e6b5c7a..44e6b5c7a 100644
--- a/data/emoticons/noto-emoticons/png/u270d_1f3fc.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u270d_1f3fc.png
diff --git a/data/emoticons/noto-emoticons/png/u270d_1f3fd.png b/gajim/data/emoticons/noto-emoticons/png/u270d_1f3fd.png
index 944dcf911..944dcf911 100644
--- a/data/emoticons/noto-emoticons/png/u270d_1f3fd.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u270d_1f3fd.png
diff --git a/data/emoticons/noto-emoticons/png/u270d_1f3fe.png b/gajim/data/emoticons/noto-emoticons/png/u270d_1f3fe.png
index ad2c491a2..ad2c491a2 100644
--- a/data/emoticons/noto-emoticons/png/u270d_1f3fe.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u270d_1f3fe.png
diff --git a/data/emoticons/noto-emoticons/png/u270d_1f3ff.png b/gajim/data/emoticons/noto-emoticons/png/u270d_1f3ff.png
index 48674f0e5..48674f0e5 100644
--- a/data/emoticons/noto-emoticons/png/u270d_1f3ff.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u270d_1f3ff.png
diff --git a/data/emoticons/noto-emoticons/png/u270f.png b/gajim/data/emoticons/noto-emoticons/png/u270f.png
index 2f57a5fc2..2f57a5fc2 100644
--- a/data/emoticons/noto-emoticons/png/u270f.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u270f.png
diff --git a/data/emoticons/noto-emoticons/png/u2712.png b/gajim/data/emoticons/noto-emoticons/png/u2712.png
index dc7b7701b..dc7b7701b 100644
--- a/data/emoticons/noto-emoticons/png/u2712.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u2712.png
diff --git a/data/emoticons/noto-emoticons/png/u2714.png b/gajim/data/emoticons/noto-emoticons/png/u2714.png
index 203d3ec3e..203d3ec3e 100644
--- a/data/emoticons/noto-emoticons/png/u2714.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u2714.png
diff --git a/data/emoticons/noto-emoticons/png/u2716.png b/gajim/data/emoticons/noto-emoticons/png/u2716.png
index bff1480d2..bff1480d2 100644
--- a/data/emoticons/noto-emoticons/png/u2716.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u2716.png
diff --git a/data/emoticons/noto-emoticons/png/u271d.png b/gajim/data/emoticons/noto-emoticons/png/u271d.png
index 6a3d56601..6a3d56601 100644
--- a/data/emoticons/noto-emoticons/png/u271d.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u271d.png
diff --git a/data/emoticons/noto-emoticons/png/u2721.png b/gajim/data/emoticons/noto-emoticons/png/u2721.png
index 2e7ce4db0..2e7ce4db0 100644
--- a/data/emoticons/noto-emoticons/png/u2721.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u2721.png
diff --git a/data/emoticons/noto-emoticons/png/u2728.png b/gajim/data/emoticons/noto-emoticons/png/u2728.png
index e22aa21f1..e22aa21f1 100644
--- a/data/emoticons/noto-emoticons/png/u2728.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u2728.png
diff --git a/data/emoticons/noto-emoticons/png/u2733.png b/gajim/data/emoticons/noto-emoticons/png/u2733.png
index 27bc2bd9d..27bc2bd9d 100644
--- a/data/emoticons/noto-emoticons/png/u2733.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u2733.png
diff --git a/data/emoticons/noto-emoticons/png/u2734.png b/gajim/data/emoticons/noto-emoticons/png/u2734.png
index 4aceb5a50..4aceb5a50 100644
--- a/data/emoticons/noto-emoticons/png/u2734.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u2734.png
diff --git a/data/emoticons/noto-emoticons/png/u2744.png b/gajim/data/emoticons/noto-emoticons/png/u2744.png
index 290772013..290772013 100644
--- a/data/emoticons/noto-emoticons/png/u2744.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u2744.png
diff --git a/data/emoticons/noto-emoticons/png/u2747.png b/gajim/data/emoticons/noto-emoticons/png/u2747.png
index f98340a5f..f98340a5f 100644
--- a/data/emoticons/noto-emoticons/png/u2747.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u2747.png
diff --git a/data/emoticons/noto-emoticons/png/u274c.png b/gajim/data/emoticons/noto-emoticons/png/u274c.png
index f9897c85c..f9897c85c 100644
--- a/data/emoticons/noto-emoticons/png/u274c.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u274c.png
diff --git a/data/emoticons/noto-emoticons/png/u274e.png b/gajim/data/emoticons/noto-emoticons/png/u274e.png
index 8ef649066..8ef649066 100644
--- a/data/emoticons/noto-emoticons/png/u274e.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u274e.png
diff --git a/data/emoticons/noto-emoticons/png/u2753.png b/gajim/data/emoticons/noto-emoticons/png/u2753.png
index c639a6afe..c639a6afe 100644
--- a/data/emoticons/noto-emoticons/png/u2753.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u2753.png
diff --git a/data/emoticons/noto-emoticons/png/u2754.png b/gajim/data/emoticons/noto-emoticons/png/u2754.png
index 48fd0c4f8..48fd0c4f8 100644
--- a/data/emoticons/noto-emoticons/png/u2754.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u2754.png
diff --git a/data/emoticons/noto-emoticons/png/u2755.png b/gajim/data/emoticons/noto-emoticons/png/u2755.png
index 139eacf1f..139eacf1f 100644
--- a/data/emoticons/noto-emoticons/png/u2755.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u2755.png
diff --git a/data/emoticons/noto-emoticons/png/u2757.png b/gajim/data/emoticons/noto-emoticons/png/u2757.png
index b223ec4b8..b223ec4b8 100644
--- a/data/emoticons/noto-emoticons/png/u2757.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u2757.png
diff --git a/data/emoticons/noto-emoticons/png/u2763.png b/gajim/data/emoticons/noto-emoticons/png/u2763.png
index b2e7667f9..b2e7667f9 100644
--- a/data/emoticons/noto-emoticons/png/u2763.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u2763.png
diff --git a/data/emoticons/noto-emoticons/png/u2764.png b/gajim/data/emoticons/noto-emoticons/png/u2764.png
index c371171c4..c371171c4 100644
--- a/data/emoticons/noto-emoticons/png/u2764.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u2764.png
diff --git a/data/emoticons/noto-emoticons/png/u2795.png b/gajim/data/emoticons/noto-emoticons/png/u2795.png
index 9f3a429c0..9f3a429c0 100644
--- a/data/emoticons/noto-emoticons/png/u2795.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u2795.png
diff --git a/data/emoticons/noto-emoticons/png/u2796.png b/gajim/data/emoticons/noto-emoticons/png/u2796.png
index 5b1c4bdbf..5b1c4bdbf 100644
--- a/data/emoticons/noto-emoticons/png/u2796.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u2796.png
diff --git a/data/emoticons/noto-emoticons/png/u2797.png b/gajim/data/emoticons/noto-emoticons/png/u2797.png
index 754f6ab8b..754f6ab8b 100644
--- a/data/emoticons/noto-emoticons/png/u2797.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u2797.png
diff --git a/data/emoticons/noto-emoticons/png/u27a1.png b/gajim/data/emoticons/noto-emoticons/png/u27a1.png
index f7337004b..f7337004b 100644
--- a/data/emoticons/noto-emoticons/png/u27a1.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u27a1.png
diff --git a/data/emoticons/noto-emoticons/png/u27b0.png b/gajim/data/emoticons/noto-emoticons/png/u27b0.png
index 58a79bc04..58a79bc04 100644
--- a/data/emoticons/noto-emoticons/png/u27b0.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u27b0.png
diff --git a/data/emoticons/noto-emoticons/png/u27bf.png b/gajim/data/emoticons/noto-emoticons/png/u27bf.png
index df7d202a5..df7d202a5 100644
--- a/data/emoticons/noto-emoticons/png/u27bf.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u27bf.png
diff --git a/data/emoticons/noto-emoticons/png/u2934.png b/gajim/data/emoticons/noto-emoticons/png/u2934.png
index 3008ad0b7..3008ad0b7 100644
--- a/data/emoticons/noto-emoticons/png/u2934.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u2934.png
diff --git a/data/emoticons/noto-emoticons/png/u2935.png b/gajim/data/emoticons/noto-emoticons/png/u2935.png
index 31657e32f..31657e32f 100644
--- a/data/emoticons/noto-emoticons/png/u2935.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u2935.png
diff --git a/data/emoticons/noto-emoticons/png/u2b05.png b/gajim/data/emoticons/noto-emoticons/png/u2b05.png
index f69e423ba..f69e423ba 100644
--- a/data/emoticons/noto-emoticons/png/u2b05.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u2b05.png
diff --git a/data/emoticons/noto-emoticons/png/u2b06.png b/gajim/data/emoticons/noto-emoticons/png/u2b06.png
index ce38cd6d7..ce38cd6d7 100644
--- a/data/emoticons/noto-emoticons/png/u2b06.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u2b06.png
diff --git a/data/emoticons/noto-emoticons/png/u2b07.png b/gajim/data/emoticons/noto-emoticons/png/u2b07.png
index 2368784eb..2368784eb 100644
--- a/data/emoticons/noto-emoticons/png/u2b07.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u2b07.png
diff --git a/data/emoticons/noto-emoticons/png/u2b1b.png b/gajim/data/emoticons/noto-emoticons/png/u2b1b.png
index cb6af0474..cb6af0474 100644
--- a/data/emoticons/noto-emoticons/png/u2b1b.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u2b1b.png
diff --git a/data/emoticons/noto-emoticons/png/u2b1c.png b/gajim/data/emoticons/noto-emoticons/png/u2b1c.png
index 8c1690f52..8c1690f52 100644
--- a/data/emoticons/noto-emoticons/png/u2b1c.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u2b1c.png
diff --git a/data/emoticons/noto-emoticons/png/u2b50.png b/gajim/data/emoticons/noto-emoticons/png/u2b50.png
index 0d262f046..0d262f046 100644
--- a/data/emoticons/noto-emoticons/png/u2b50.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u2b50.png
diff --git a/data/emoticons/noto-emoticons/png/u2b55.png b/gajim/data/emoticons/noto-emoticons/png/u2b55.png
index 68abfbb3e..68abfbb3e 100644
--- a/data/emoticons/noto-emoticons/png/u2b55.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u2b55.png
diff --git a/data/emoticons/noto-emoticons/png/u3030.png b/gajim/data/emoticons/noto-emoticons/png/u3030.png
index 168b618c4..168b618c4 100644
--- a/data/emoticons/noto-emoticons/png/u3030.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u3030.png
diff --git a/data/emoticons/noto-emoticons/png/u303d.png b/gajim/data/emoticons/noto-emoticons/png/u303d.png
index 74520547c..74520547c 100644
--- a/data/emoticons/noto-emoticons/png/u303d.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u303d.png
diff --git a/data/emoticons/noto-emoticons/png/u3297.png b/gajim/data/emoticons/noto-emoticons/png/u3297.png
index 248af75ed..248af75ed 100644
--- a/data/emoticons/noto-emoticons/png/u3297.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u3297.png
diff --git a/data/emoticons/noto-emoticons/png/u3299.png b/gajim/data/emoticons/noto-emoticons/png/u3299.png
index 02600ee65..02600ee65 100644
--- a/data/emoticons/noto-emoticons/png/u3299.png
+++ b/gajim/data/emoticons/noto-emoticons/png/u3299.png
diff --git a/data/emoticons/noto-emoticons/png/ufe82b.png b/gajim/data/emoticons/noto-emoticons/png/ufe82b.png
index ef8e10b04..ef8e10b04 100644
--- a/data/emoticons/noto-emoticons/png/ufe82b.png
+++ b/gajim/data/emoticons/noto-emoticons/png/ufe82b.png
diff --git a/data/gui/Makefile.am b/gajim/data/gui/Makefile.am
index b36d5d7fe..a0908cec3 100644
--- a/data/gui/Makefile.am
+++ b/gajim/data/gui/Makefile.am
@@ -1,5 +1,4 @@
-
-guidir = $(pkgdatadir)/data/gui
+guidir = $(gajim_srcdir)/data/gui
 gui_DATA = $(srcdir)/*.ui
 EXTRA_DIST = $(gui_DATA)
 
diff --git a/data/gui/account_context_menu.ui b/gajim/data/gui/account_context_menu.ui
index 91257c213..91257c213 100644
--- a/data/gui/account_context_menu.ui
+++ b/gajim/data/gui/account_context_menu.ui
diff --git a/data/gui/account_creation_wizard_window.ui b/gajim/data/gui/account_creation_wizard_window.ui
index 6cfaa4ade..6cfaa4ade 100644
--- a/data/gui/account_creation_wizard_window.ui
+++ b/gajim/data/gui/account_creation_wizard_window.ui
diff --git a/data/gui/accounts_window.ui b/gajim/data/gui/accounts_window.ui
index 60416ad0c..60416ad0c 100644
--- a/data/gui/accounts_window.ui
+++ b/gajim/data/gui/accounts_window.ui
diff --git a/data/gui/add_new_contact_window.ui b/gajim/data/gui/add_new_contact_window.ui
index 377dc70f4..377dc70f4 100644
--- a/data/gui/add_new_contact_window.ui
+++ b/gajim/data/gui/add_new_contact_window.ui
diff --git a/data/gui/adhoc_commands_window.ui b/gajim/data/gui/adhoc_commands_window.ui
index 8446cbee5..8446cbee5 100644
--- a/data/gui/adhoc_commands_window.ui
+++ b/gajim/data/gui/adhoc_commands_window.ui
diff --git a/data/gui/advanced_configuration_window.ui b/gajim/data/gui/advanced_configuration_window.ui
index 88cef610f..88cef610f 100644
--- a/data/gui/advanced_configuration_window.ui
+++ b/gajim/data/gui/advanced_configuration_window.ui
diff --git a/data/gui/application_menu.ui b/gajim/data/gui/application_menu.ui
index 2be3e5eed..2be3e5eed 100644
--- a/data/gui/application_menu.ui
+++ b/gajim/data/gui/application_menu.ui
diff --git a/data/gui/archiving_313_preferences_item.ui b/gajim/data/gui/archiving_313_preferences_item.ui
index bda22250a..bda22250a 100644
--- a/data/gui/archiving_313_preferences_item.ui
+++ b/gajim/data/gui/archiving_313_preferences_item.ui
diff --git a/data/gui/archiving_313_preferences_window.ui b/gajim/data/gui/archiving_313_preferences_window.ui
index 994a3a3f9..994a3a3f9 100644
--- a/data/gui/archiving_313_preferences_window.ui
+++ b/gajim/data/gui/archiving_313_preferences_window.ui
diff --git a/data/gui/atom_entry_window.ui b/gajim/data/gui/atom_entry_window.ui
index a19b3e2db..a19b3e2db 100644
--- a/data/gui/atom_entry_window.ui
+++ b/gajim/data/gui/atom_entry_window.ui
diff --git a/data/gui/blocked_contacts_window.ui b/gajim/data/gui/blocked_contacts_window.ui
index 6fdcfbbcb..6fdcfbbcb 100644
--- a/data/gui/blocked_contacts_window.ui
+++ b/gajim/data/gui/blocked_contacts_window.ui
diff --git a/data/gui/change_activity_dialog.ui b/gajim/data/gui/change_activity_dialog.ui
index da4adec19..da4adec19 100644
--- a/data/gui/change_activity_dialog.ui
+++ b/gajim/data/gui/change_activity_dialog.ui
diff --git a/data/gui/change_mood_dialog.ui b/gajim/data/gui/change_mood_dialog.ui
index 08373c8d7..08373c8d7 100644
--- a/data/gui/change_mood_dialog.ui
+++ b/gajim/data/gui/change_mood_dialog.ui
diff --git a/data/gui/change_password_dialog.ui b/gajim/data/gui/change_password_dialog.ui
index 13ffe02a7..13ffe02a7 100644
--- a/data/gui/change_password_dialog.ui
+++ b/gajim/data/gui/change_password_dialog.ui
diff --git a/data/gui/change_status_message_dialog.ui b/gajim/data/gui/change_status_message_dialog.ui
index f8a5f8787..f8a5f8787 100644
--- a/data/gui/change_status_message_dialog.ui
+++ b/gajim/data/gui/change_status_message_dialog.ui
diff --git a/data/gui/chat_context_menu.ui b/gajim/data/gui/chat_context_menu.ui
index c5ef3ce7e..c5ef3ce7e 100644
--- a/data/gui/chat_context_menu.ui
+++ b/gajim/data/gui/chat_context_menu.ui
diff --git a/data/gui/chat_control.ui b/gajim/data/gui/chat_control.ui
index bab728ca0..bab728ca0 100644
--- a/data/gui/chat_control.ui
+++ b/gajim/data/gui/chat_control.ui
diff --git a/data/gui/chat_to_muc_window.ui b/gajim/data/gui/chat_to_muc_window.ui
index 363a6bb43..363a6bb43 100644
--- a/data/gui/chat_to_muc_window.ui
+++ b/gajim/data/gui/chat_to_muc_window.ui
diff --git a/data/gui/choose_gpg_key_dialog.ui b/gajim/data/gui/choose_gpg_key_dialog.ui
index 7a6c2f0ad..7a6c2f0ad 100644
--- a/data/gui/choose_gpg_key_dialog.ui
+++ b/gajim/data/gui/choose_gpg_key_dialog.ui
diff --git a/data/gui/contact_context_menu.ui b/gajim/data/gui/contact_context_menu.ui
index 98d846d40..98d846d40 100644
--- a/data/gui/contact_context_menu.ui
+++ b/gajim/data/gui/contact_context_menu.ui
diff --git a/data/gui/data_form_window.ui b/gajim/data/gui/data_form_window.ui
index f9856c8b2..f9856c8b2 100644
--- a/data/gui/data_form_window.ui
+++ b/gajim/data/gui/data_form_window.ui
diff --git a/data/gui/dubbleinput_dialog.ui b/gajim/data/gui/dubbleinput_dialog.ui
index 72a1fe883..72a1fe883 100644
--- a/data/gui/dubbleinput_dialog.ui
+++ b/gajim/data/gui/dubbleinput_dialog.ui
diff --git a/data/gui/edit_groups_dialog.ui b/gajim/data/gui/edit_groups_dialog.ui
index e9b949058..e9b949058 100644
--- a/data/gui/edit_groups_dialog.ui
+++ b/gajim/data/gui/edit_groups_dialog.ui
diff --git a/data/gui/esession_info_window.ui b/gajim/data/gui/esession_info_window.ui
index a82a0e2e9..a82a0e2e9 100644
--- a/data/gui/esession_info_window.ui
+++ b/gajim/data/gui/esession_info_window.ui
diff --git a/data/gui/exception_dialog.ui b/gajim/data/gui/exception_dialog.ui
index 76f582931..76f582931 100644
--- a/data/gui/exception_dialog.ui
+++ b/gajim/data/gui/exception_dialog.ui
diff --git a/data/gui/features_window.ui b/gajim/data/gui/features_window.ui
index a09677ce4..a09677ce4 100644
--- a/data/gui/features_window.ui
+++ b/gajim/data/gui/features_window.ui
diff --git a/data/gui/filetransfers.ui b/gajim/data/gui/filetransfers.ui
index bde4547ce..bde4547ce 100644
--- a/data/gui/filetransfers.ui
+++ b/gajim/data/gui/filetransfers.ui
diff --git a/data/gui/gajim_themes_window.ui b/gajim/data/gui/gajim_themes_window.ui
index e4492a883..e4492a883 100644
--- a/data/gui/gajim_themes_window.ui
+++ b/gajim/data/gui/gajim_themes_window.ui
diff --git a/data/gui/gc_control_popup_menu.ui b/gajim/data/gui/gc_control_popup_menu.ui
index 719bcd34a..719bcd34a 100644
--- a/data/gui/gc_control_popup_menu.ui
+++ b/gajim/data/gui/gc_control_popup_menu.ui
diff --git a/data/gui/gc_occupants_menu.ui b/gajim/data/gui/gc_occupants_menu.ui
index 1c2824474..1c2824474 100644
--- a/data/gui/gc_occupants_menu.ui
+++ b/gajim/data/gui/gc_occupants_menu.ui
diff --git a/data/gui/groupchat_control.ui b/gajim/data/gui/groupchat_control.ui
index d6019f4ea..d6019f4ea 100644
--- a/data/gui/groupchat_control.ui
+++ b/gajim/data/gui/groupchat_control.ui
diff --git a/data/gui/groups_post_window.ui b/gajim/data/gui/groups_post_window.ui
index 74280e325..74280e325 100644
--- a/data/gui/groups_post_window.ui
+++ b/gajim/data/gui/groups_post_window.ui
diff --git a/data/gui/history_manager.ui b/gajim/data/gui/history_manager.ui
index 22fa161f4..22fa161f4 100644
--- a/data/gui/history_manager.ui
+++ b/gajim/data/gui/history_manager.ui
diff --git a/data/gui/history_window.ui b/gajim/data/gui/history_window.ui
index 99e3d3dcc..99e3d3dcc 100644
--- a/data/gui/history_window.ui
+++ b/gajim/data/gui/history_window.ui
diff --git a/data/gui/input_dialog.ui b/gajim/data/gui/input_dialog.ui
index 7e92ddb36..7e92ddb36 100644
--- a/data/gui/input_dialog.ui
+++ b/gajim/data/gui/input_dialog.ui
diff --git a/data/gui/input_text_dialog.ui b/gajim/data/gui/input_text_dialog.ui
index f495e203b..f495e203b 100644
--- a/data/gui/input_text_dialog.ui
+++ b/gajim/data/gui/input_text_dialog.ui
diff --git a/data/gui/join_groupchat_window.ui b/gajim/data/gui/join_groupchat_window.ui
index 9ba120367..9ba120367 100644
--- a/data/gui/join_groupchat_window.ui
+++ b/gajim/data/gui/join_groupchat_window.ui
diff --git a/data/gui/manage_bookmarks_window.ui b/gajim/data/gui/manage_bookmarks_window.ui
index 5752156be..5752156be 100644
--- a/data/gui/manage_bookmarks_window.ui
+++ b/gajim/data/gui/manage_bookmarks_window.ui
diff --git a/data/gui/manage_pep_services_window.ui b/gajim/data/gui/manage_pep_services_window.ui
index ebb5a3f53..ebb5a3f53 100644
--- a/data/gui/manage_pep_services_window.ui
+++ b/gajim/data/gui/manage_pep_services_window.ui
diff --git a/data/gui/manage_proxies_window.ui b/gajim/data/gui/manage_proxies_window.ui
index a2f486939..a2f486939 100644
--- a/data/gui/manage_proxies_window.ui
+++ b/gajim/data/gui/manage_proxies_window.ui
diff --git a/data/gui/manage_sounds_window.ui b/gajim/data/gui/manage_sounds_window.ui
index d793757e6..d793757e6 100644
--- a/data/gui/manage_sounds_window.ui
+++ b/gajim/data/gui/manage_sounds_window.ui
diff --git a/data/gui/message_window.ui b/gajim/data/gui/message_window.ui
index 0aab2b026..0aab2b026 100644
--- a/data/gui/message_window.ui
+++ b/gajim/data/gui/message_window.ui
diff --git a/data/gui/passphrase_dialog.ui b/gajim/data/gui/passphrase_dialog.ui
index 2d6b9e36e..2d6b9e36e 100644
--- a/data/gui/passphrase_dialog.ui
+++ b/gajim/data/gui/passphrase_dialog.ui
diff --git a/data/gui/plugins_window.ui b/gajim/data/gui/plugins_window.ui
index c3ed73363..c3ed73363 100644
--- a/data/gui/plugins_window.ui
+++ b/gajim/data/gui/plugins_window.ui
diff --git a/data/gui/popup_notification_window.ui b/gajim/data/gui/popup_notification_window.ui
index fcc16d5d0..fcc16d5d0 100644
--- a/data/gui/popup_notification_window.ui
+++ b/gajim/data/gui/popup_notification_window.ui
diff --git a/data/gui/preferences_window.ui b/gajim/data/gui/preferences_window.ui
index a8b667471..a8b667471 100644
--- a/data/gui/preferences_window.ui
+++ b/gajim/data/gui/preferences_window.ui
diff --git a/data/gui/privacy_list_window.ui b/gajim/data/gui/privacy_list_window.ui
index 58ba7a9b6..58ba7a9b6 100644
--- a/data/gui/privacy_list_window.ui
+++ b/gajim/data/gui/privacy_list_window.ui
diff --git a/data/gui/privacy_lists_window.ui b/gajim/data/gui/privacy_lists_window.ui
index b9c6a1367..b9c6a1367 100644
--- a/data/gui/privacy_lists_window.ui
+++ b/gajim/data/gui/privacy_lists_window.ui
diff --git a/data/gui/profile_window.ui b/gajim/data/gui/profile_window.ui
index 0a6fe161e..0a6fe161e 100644
--- a/data/gui/profile_window.ui
+++ b/gajim/data/gui/profile_window.ui
diff --git a/data/gui/progress_dialog.ui b/gajim/data/gui/progress_dialog.ui
index 44f3fd42a..44f3fd42a 100644
--- a/data/gui/progress_dialog.ui
+++ b/gajim/data/gui/progress_dialog.ui
diff --git a/data/gui/remove_account_window.ui b/gajim/data/gui/remove_account_window.ui
index c1e18e3e3..c1e18e3e3 100644
--- a/data/gui/remove_account_window.ui
+++ b/gajim/data/gui/remove_account_window.ui
diff --git a/data/gui/roster_item_exchange_window.ui b/gajim/data/gui/roster_item_exchange_window.ui
index 930764d49..930764d49 100644
--- a/data/gui/roster_item_exchange_window.ui
+++ b/gajim/data/gui/roster_item_exchange_window.ui
diff --git a/data/gui/roster_window.ui b/gajim/data/gui/roster_window.ui
index e70381f9e..e70381f9e 100644
--- a/data/gui/roster_window.ui
+++ b/gajim/data/gui/roster_window.ui
diff --git a/data/gui/search_window.ui b/gajim/data/gui/search_window.ui
index 3b93567d3..3b93567d3 100644
--- a/data/gui/search_window.ui
+++ b/gajim/data/gui/search_window.ui
diff --git a/data/gui/service_discovery_window.ui b/gajim/data/gui/service_discovery_window.ui
index 16fe77569..16fe77569 100644
--- a/data/gui/service_discovery_window.ui
+++ b/gajim/data/gui/service_discovery_window.ui
diff --git a/data/gui/service_registration_window.ui b/gajim/data/gui/service_registration_window.ui
index a7ff3e995..a7ff3e995 100644
--- a/data/gui/service_registration_window.ui
+++ b/gajim/data/gui/service_registration_window.ui
diff --git a/data/gui/shortcuts_window.ui b/gajim/data/gui/shortcuts_window.ui
index 16144e31c..16144e31c 100644
--- a/data/gui/shortcuts_window.ui
+++ b/gajim/data/gui/shortcuts_window.ui
diff --git a/data/gui/single_message_window.ui b/gajim/data/gui/single_message_window.ui
index c7c704cce..c7c704cce 100644
--- a/data/gui/single_message_window.ui
+++ b/gajim/data/gui/single_message_window.ui
diff --git a/data/gui/subscription_request_popup_menu.ui b/gajim/data/gui/subscription_request_popup_menu.ui
index e250672f4..e250672f4 100644
--- a/data/gui/subscription_request_popup_menu.ui
+++ b/gajim/data/gui/subscription_request_popup_menu.ui
diff --git a/data/gui/subscription_request_window.ui b/gajim/data/gui/subscription_request_window.ui
index 835bb00d3..835bb00d3 100644
--- a/data/gui/subscription_request_window.ui
+++ b/gajim/data/gui/subscription_request_window.ui
diff --git a/data/gui/synchronise_select_account_dialog.ui b/gajim/data/gui/synchronise_select_account_dialog.ui
index 365f862c1..365f862c1 100644
--- a/data/gui/synchronise_select_account_dialog.ui
+++ b/gajim/data/gui/synchronise_select_account_dialog.ui
diff --git a/data/gui/synchronise_select_contacts_dialog.ui b/gajim/data/gui/synchronise_select_contacts_dialog.ui
index 7bc2abb29..7bc2abb29 100644
--- a/data/gui/synchronise_select_contacts_dialog.ui
+++ b/gajim/data/gui/synchronise_select_contacts_dialog.ui
diff --git a/data/gui/systray_context_menu.ui b/gajim/data/gui/systray_context_menu.ui
index 9d83b13b8..9d83b13b8 100644
--- a/data/gui/systray_context_menu.ui
+++ b/gajim/data/gui/systray_context_menu.ui
diff --git a/data/gui/tooltip_gc_contact.ui b/gajim/data/gui/tooltip_gc_contact.ui
index bfa67bae5..bfa67bae5 100644
--- a/data/gui/tooltip_gc_contact.ui
+++ b/gajim/data/gui/tooltip_gc_contact.ui
diff --git a/data/gui/tooltip_roster_contact.ui b/gajim/data/gui/tooltip_roster_contact.ui
index 58e8d92c1..58e8d92c1 100644
--- a/data/gui/tooltip_roster_contact.ui
+++ b/gajim/data/gui/tooltip_roster_contact.ui
diff --git a/data/gui/vcard_information_window.ui b/gajim/data/gui/vcard_information_window.ui
index 8ba56c295..8ba56c295 100644
--- a/data/gui/vcard_information_window.ui
+++ b/gajim/data/gui/vcard_information_window.ui
diff --git a/data/gui/voip_call_received_dialog.ui b/gajim/data/gui/voip_call_received_dialog.ui
index 02fb10f02..02fb10f02 100644
--- a/data/gui/voip_call_received_dialog.ui
+++ b/gajim/data/gui/voip_call_received_dialog.ui
diff --git a/data/gui/xml_console_window.ui b/gajim/data/gui/xml_console_window.ui
index dd9d697ea..dd9d697ea 100644
--- a/data/gui/xml_console_window.ui
+++ b/gajim/data/gui/xml_console_window.ui
diff --git a/data/gui/zeroconf_context_menu.ui b/gajim/data/gui/zeroconf_context_menu.ui
index e825df093..e825df093 100644
--- a/data/gui/zeroconf_context_menu.ui
+++ b/gajim/data/gui/zeroconf_context_menu.ui
diff --git a/data/gui/zeroconf_information_window.ui b/gajim/data/gui/zeroconf_information_window.ui
index 7f3813b3a..7f3813b3a 100644
--- a/data/gui/zeroconf_information_window.ui
+++ b/gajim/data/gui/zeroconf_information_window.ui
diff --git a/data/iconsets/Makefile.am b/gajim/data/iconsets/Makefile.am
index d83643525..a938009f1 100644
--- a/data/iconsets/Makefile.am
+++ b/gajim/data/iconsets/Makefile.am
@@ -1,4 +1,4 @@
-iconsetdir = $(pkgdatadir)/data/iconsets
+iconsetdir = $(gajim_srcdir)/data/iconsets
 nobase_dist_iconset_DATA = \
 	$(srcdir)/*/16x16/* \
 	$(srcdir)/*/32x32/* \
diff --git a/data/iconsets/dcraven/16x16/away.png b/gajim/data/iconsets/dcraven/16x16/away.png
index dfaf27dbd..dfaf27dbd 100644
--- a/data/iconsets/dcraven/16x16/away.png
+++ b/gajim/data/iconsets/dcraven/16x16/away.png
diff --git a/data/iconsets/dcraven/16x16/chat.png b/gajim/data/iconsets/dcraven/16x16/chat.png
index d27339e7a..d27339e7a 100644
--- a/data/iconsets/dcraven/16x16/chat.png
+++ b/gajim/data/iconsets/dcraven/16x16/chat.png
diff --git a/data/iconsets/dcraven/16x16/closed.png b/gajim/data/iconsets/dcraven/16x16/closed.png
index 0e1723906..0e1723906 100644
--- a/data/iconsets/dcraven/16x16/closed.png
+++ b/gajim/data/iconsets/dcraven/16x16/closed.png
diff --git a/data/iconsets/dcraven/16x16/connecting.png b/gajim/data/iconsets/dcraven/16x16/connecting.png
index 396ec2b90..396ec2b90 100644
--- a/data/iconsets/dcraven/16x16/connecting.png
+++ b/gajim/data/iconsets/dcraven/16x16/connecting.png
diff --git a/data/iconsets/dcraven/16x16/dnd.png b/gajim/data/iconsets/dcraven/16x16/dnd.png
index eeaefc4aa..eeaefc4aa 100644
--- a/data/iconsets/dcraven/16x16/dnd.png
+++ b/gajim/data/iconsets/dcraven/16x16/dnd.png
diff --git a/data/iconsets/dcraven/16x16/error.png b/gajim/data/iconsets/dcraven/16x16/error.png
index 4d7e145e0..4d7e145e0 100644
--- a/data/iconsets/dcraven/16x16/error.png
+++ b/gajim/data/iconsets/dcraven/16x16/error.png
diff --git a/data/iconsets/dcraven/16x16/event.png b/gajim/data/iconsets/dcraven/16x16/event.png
index dbcd39f80..dbcd39f80 100644
--- a/data/iconsets/dcraven/16x16/event.png
+++ b/gajim/data/iconsets/dcraven/16x16/event.png
diff --git a/data/iconsets/dcraven/16x16/invisible.png b/gajim/data/iconsets/dcraven/16x16/invisible.png
index efad578c3..efad578c3 100644
--- a/data/iconsets/dcraven/16x16/invisible.png
+++ b/gajim/data/iconsets/dcraven/16x16/invisible.png
diff --git a/data/iconsets/dcraven/16x16/muc_active.png b/gajim/data/iconsets/dcraven/16x16/muc_active.png
index efdd60f12..efdd60f12 100644
--- a/data/iconsets/dcraven/16x16/muc_active.png
+++ b/gajim/data/iconsets/dcraven/16x16/muc_active.png
diff --git a/data/iconsets/dcraven/16x16/muc_inactive.png b/gajim/data/iconsets/dcraven/16x16/muc_inactive.png
index 0bf75af15..0bf75af15 100644
--- a/data/iconsets/dcraven/16x16/muc_inactive.png
+++ b/gajim/data/iconsets/dcraven/16x16/muc_inactive.png
diff --git a/data/iconsets/dcraven/16x16/not_in_roster.png b/gajim/data/iconsets/dcraven/16x16/not_in_roster.png
index 1c4c1df57..1c4c1df57 100644
--- a/data/iconsets/dcraven/16x16/not_in_roster.png
+++ b/gajim/data/iconsets/dcraven/16x16/not_in_roster.png
diff --git a/data/iconsets/dcraven/16x16/offline.png b/gajim/data/iconsets/dcraven/16x16/offline.png
index 5db4953d2..5db4953d2 100644
--- a/data/iconsets/dcraven/16x16/offline.png
+++ b/gajim/data/iconsets/dcraven/16x16/offline.png
diff --git a/data/iconsets/dcraven/16x16/online.png b/gajim/data/iconsets/dcraven/16x16/online.png
index 9820382d9..9820382d9 100644
--- a/data/iconsets/dcraven/16x16/online.png
+++ b/gajim/data/iconsets/dcraven/16x16/online.png
diff --git a/data/iconsets/dcraven/16x16/opened.png b/gajim/data/iconsets/dcraven/16x16/opened.png
index ab34475cb..ab34475cb 100644
--- a/data/iconsets/dcraven/16x16/opened.png
+++ b/gajim/data/iconsets/dcraven/16x16/opened.png
diff --git a/data/iconsets/dcraven/16x16/requested.png b/gajim/data/iconsets/dcraven/16x16/requested.png
index 140675375..140675375 100644
--- a/data/iconsets/dcraven/16x16/requested.png
+++ b/gajim/data/iconsets/dcraven/16x16/requested.png
diff --git a/data/iconsets/dcraven/16x16/xa.png b/gajim/data/iconsets/dcraven/16x16/xa.png
index 9a13cb3cd..9a13cb3cd 100644
--- a/data/iconsets/dcraven/16x16/xa.png
+++ b/gajim/data/iconsets/dcraven/16x16/xa.png
diff --git a/data/iconsets/dcraven/32x32/away.png b/gajim/data/iconsets/dcraven/32x32/away.png
index a708af3bd..a708af3bd 100644
--- a/data/iconsets/dcraven/32x32/away.png
+++ b/gajim/data/iconsets/dcraven/32x32/away.png
diff --git a/data/iconsets/dcraven/32x32/chat.png b/gajim/data/iconsets/dcraven/32x32/chat.png
index ec4ef0d8d..ec4ef0d8d 100644
--- a/data/iconsets/dcraven/32x32/chat.png
+++ b/gajim/data/iconsets/dcraven/32x32/chat.png
diff --git a/data/iconsets/dcraven/32x32/closed.png b/gajim/data/iconsets/dcraven/32x32/closed.png
index 91469ac12..91469ac12 100644
--- a/data/iconsets/dcraven/32x32/closed.png
+++ b/gajim/data/iconsets/dcraven/32x32/closed.png
diff --git a/data/iconsets/dcraven/32x32/connecting.png b/gajim/data/iconsets/dcraven/32x32/connecting.png
index 35ac602a4..35ac602a4 100644
--- a/data/iconsets/dcraven/32x32/connecting.png
+++ b/gajim/data/iconsets/dcraven/32x32/connecting.png
diff --git a/data/iconsets/dcraven/32x32/dnd.png b/gajim/data/iconsets/dcraven/32x32/dnd.png
index 492d2b4f2..492d2b4f2 100644
--- a/data/iconsets/dcraven/32x32/dnd.png
+++ b/gajim/data/iconsets/dcraven/32x32/dnd.png
diff --git a/data/iconsets/dcraven/32x32/error.png b/gajim/data/iconsets/dcraven/32x32/error.png
index ff16e2ffa..ff16e2ffa 100644
--- a/data/iconsets/dcraven/32x32/error.png
+++ b/gajim/data/iconsets/dcraven/32x32/error.png
diff --git a/data/iconsets/dcraven/32x32/event.png b/gajim/data/iconsets/dcraven/32x32/event.png
index 20efb6f90..20efb6f90 100644
--- a/data/iconsets/dcraven/32x32/event.png
+++ b/gajim/data/iconsets/dcraven/32x32/event.png
diff --git a/data/iconsets/dcraven/32x32/invisible.png b/gajim/data/iconsets/dcraven/32x32/invisible.png
index 8571eb2bf..8571eb2bf 100644
--- a/data/iconsets/dcraven/32x32/invisible.png
+++ b/gajim/data/iconsets/dcraven/32x32/invisible.png
diff --git a/data/iconsets/dcraven/32x32/muc_active.png b/gajim/data/iconsets/dcraven/32x32/muc_active.png
index 3c7474c82..3c7474c82 100644
--- a/data/iconsets/dcraven/32x32/muc_active.png
+++ b/gajim/data/iconsets/dcraven/32x32/muc_active.png
diff --git a/data/iconsets/dcraven/32x32/muc_inactive.png b/gajim/data/iconsets/dcraven/32x32/muc_inactive.png
index 279843fde..279843fde 100644
--- a/data/iconsets/dcraven/32x32/muc_inactive.png
+++ b/gajim/data/iconsets/dcraven/32x32/muc_inactive.png
diff --git a/data/iconsets/dcraven/32x32/not_in_roster.png b/gajim/data/iconsets/dcraven/32x32/not_in_roster.png
index e9aebd435..e9aebd435 100644
--- a/data/iconsets/dcraven/32x32/not_in_roster.png
+++ b/gajim/data/iconsets/dcraven/32x32/not_in_roster.png
diff --git a/data/iconsets/dcraven/32x32/offline.png b/gajim/data/iconsets/dcraven/32x32/offline.png
index cc590185a..cc590185a 100644
--- a/data/iconsets/dcraven/32x32/offline.png
+++ b/gajim/data/iconsets/dcraven/32x32/offline.png
diff --git a/data/iconsets/dcraven/32x32/online.png b/gajim/data/iconsets/dcraven/32x32/online.png
index cb2f65a03..cb2f65a03 100644
--- a/data/iconsets/dcraven/32x32/online.png
+++ b/gajim/data/iconsets/dcraven/32x32/online.png
diff --git a/data/iconsets/dcraven/32x32/opened.png b/gajim/data/iconsets/dcraven/32x32/opened.png
index 2a208454a..2a208454a 100644
--- a/data/iconsets/dcraven/32x32/opened.png
+++ b/gajim/data/iconsets/dcraven/32x32/opened.png
diff --git a/data/iconsets/dcraven/32x32/requested.png b/gajim/data/iconsets/dcraven/32x32/requested.png
index ebc054418..ebc054418 100644
--- a/data/iconsets/dcraven/32x32/requested.png
+++ b/gajim/data/iconsets/dcraven/32x32/requested.png
diff --git a/data/iconsets/dcraven/32x32/xa.png b/gajim/data/iconsets/dcraven/32x32/xa.png
index 72e3996c6..72e3996c6 100644
--- a/data/iconsets/dcraven/32x32/xa.png
+++ b/gajim/data/iconsets/dcraven/32x32/xa.png
diff --git a/data/iconsets/dcraven/48x48/offline.png b/gajim/data/iconsets/dcraven/48x48/offline.png
index 03c81c2f3..03c81c2f3 100644
--- a/data/iconsets/dcraven/48x48/offline.png
+++ b/gajim/data/iconsets/dcraven/48x48/offline.png
diff --git a/data/iconsets/dcraven/48x48/online.png b/gajim/data/iconsets/dcraven/48x48/online.png
index 8be7fbd70..8be7fbd70 100644
--- a/data/iconsets/dcraven/48x48/online.png
+++ b/gajim/data/iconsets/dcraven/48x48/online.png
diff --git a/data/iconsets/gnome/16x16/away.png b/gajim/data/iconsets/gnome/16x16/away.png
index bbd5dbaf5..bbd5dbaf5 100644
--- a/data/iconsets/gnome/16x16/away.png
+++ b/gajim/data/iconsets/gnome/16x16/away.png
diff --git a/data/iconsets/gnome/16x16/chat.png b/gajim/data/iconsets/gnome/16x16/chat.png
index badfb2d6d..badfb2d6d 100644
--- a/data/iconsets/gnome/16x16/chat.png
+++ b/gajim/data/iconsets/gnome/16x16/chat.png
diff --git a/data/iconsets/gnome/16x16/closed.png b/gajim/data/iconsets/gnome/16x16/closed.png
index 71ed19c04..71ed19c04 100644
--- a/data/iconsets/gnome/16x16/closed.png
+++ b/gajim/data/iconsets/gnome/16x16/closed.png
diff --git a/data/iconsets/gnome/16x16/connecting.gif b/gajim/data/iconsets/gnome/16x16/connecting.gif
index 1d85e2354..1d85e2354 100644
--- a/data/iconsets/gnome/16x16/connecting.gif
+++ b/gajim/data/iconsets/gnome/16x16/connecting.gif
diff --git a/data/iconsets/gnome/16x16/dnd.png b/gajim/data/iconsets/gnome/16x16/dnd.png
index 0e31d6938..0e31d6938 100644
--- a/data/iconsets/gnome/16x16/dnd.png
+++ b/gajim/data/iconsets/gnome/16x16/dnd.png
diff --git a/data/iconsets/gnome/16x16/error.png b/gajim/data/iconsets/gnome/16x16/error.png
index 578102f99..578102f99 100644
--- a/data/iconsets/gnome/16x16/error.png
+++ b/gajim/data/iconsets/gnome/16x16/error.png
diff --git a/data/iconsets/gnome/16x16/event.gif b/gajim/data/iconsets/gnome/16x16/event.gif
index 59fb9d117..59fb9d117 100644
--- a/data/iconsets/gnome/16x16/event.gif
+++ b/gajim/data/iconsets/gnome/16x16/event.gif
diff --git a/data/iconsets/gnome/16x16/invisible.png b/gajim/data/iconsets/gnome/16x16/invisible.png
index 7a99d65a7..7a99d65a7 100644
--- a/data/iconsets/gnome/16x16/invisible.png
+++ b/gajim/data/iconsets/gnome/16x16/invisible.png
diff --git a/data/iconsets/gnome/16x16/muc_active.png b/gajim/data/iconsets/gnome/16x16/muc_active.png
index efdd60f12..efdd60f12 100644
--- a/data/iconsets/gnome/16x16/muc_active.png
+++ b/gajim/data/iconsets/gnome/16x16/muc_active.png
diff --git a/data/iconsets/gnome/16x16/muc_inactive.png b/gajim/data/iconsets/gnome/16x16/muc_inactive.png
index 0bf75af15..0bf75af15 100644
--- a/data/iconsets/gnome/16x16/muc_inactive.png
+++ b/gajim/data/iconsets/gnome/16x16/muc_inactive.png
diff --git a/data/iconsets/gnome/16x16/not_in_roster.png b/gajim/data/iconsets/gnome/16x16/not_in_roster.png
index 45cda57e6..45cda57e6 100644
--- a/data/iconsets/gnome/16x16/not_in_roster.png
+++ b/gajim/data/iconsets/gnome/16x16/not_in_roster.png
diff --git a/data/iconsets/gnome/16x16/offline.png b/gajim/data/iconsets/gnome/16x16/offline.png
index 60a6e40e6..60a6e40e6 100644
--- a/data/iconsets/gnome/16x16/offline.png
+++ b/gajim/data/iconsets/gnome/16x16/offline.png
diff --git a/data/iconsets/gnome/16x16/online.png b/gajim/data/iconsets/gnome/16x16/online.png
index 30b318fd6..30b318fd6 100644
--- a/data/iconsets/gnome/16x16/online.png
+++ b/gajim/data/iconsets/gnome/16x16/online.png
diff --git a/data/iconsets/gnome/16x16/opened.png b/gajim/data/iconsets/gnome/16x16/opened.png
index 8df4f53ea..8df4f53ea 100644
--- a/data/iconsets/gnome/16x16/opened.png
+++ b/gajim/data/iconsets/gnome/16x16/opened.png
diff --git a/data/iconsets/gnome/16x16/requested.png b/gajim/data/iconsets/gnome/16x16/requested.png
index 4dc377b44..4dc377b44 100644
--- a/data/iconsets/gnome/16x16/requested.png
+++ b/gajim/data/iconsets/gnome/16x16/requested.png
diff --git a/data/iconsets/gnome/16x16/xa.png b/gajim/data/iconsets/gnome/16x16/xa.png
index 319b20115..319b20115 100644
--- a/data/iconsets/gnome/16x16/xa.png
+++ b/gajim/data/iconsets/gnome/16x16/xa.png
diff --git a/data/iconsets/gnome/32x32/away.png b/gajim/data/iconsets/gnome/32x32/away.png
index a31290323..a31290323 100644
--- a/data/iconsets/gnome/32x32/away.png
+++ b/gajim/data/iconsets/gnome/32x32/away.png
diff --git a/data/iconsets/gnome/32x32/chat.png b/gajim/data/iconsets/gnome/32x32/chat.png
index 1d1c8ba02..1d1c8ba02 100644
--- a/data/iconsets/gnome/32x32/chat.png
+++ b/gajim/data/iconsets/gnome/32x32/chat.png
diff --git a/data/iconsets/gnome/32x32/dnd.png b/gajim/data/iconsets/gnome/32x32/dnd.png
index d421e4b79..d421e4b79 100644
--- a/data/iconsets/gnome/32x32/dnd.png
+++ b/gajim/data/iconsets/gnome/32x32/dnd.png
diff --git a/data/iconsets/gnome/32x32/muc_active.png b/gajim/data/iconsets/gnome/32x32/muc_active.png
index 3c7474c82..3c7474c82 100644
--- a/data/iconsets/gnome/32x32/muc_active.png
+++ b/gajim/data/iconsets/gnome/32x32/muc_active.png
diff --git a/data/iconsets/gnome/32x32/muc_inactive.png b/gajim/data/iconsets/gnome/32x32/muc_inactive.png
index 279843fde..279843fde 100644
--- a/data/iconsets/gnome/32x32/muc_inactive.png
+++ b/gajim/data/iconsets/gnome/32x32/muc_inactive.png
diff --git a/data/iconsets/gnome/32x32/not_in_roster.png b/gajim/data/iconsets/gnome/32x32/not_in_roster.png
index 4cd5a230b..4cd5a230b 100644
--- a/data/iconsets/gnome/32x32/not_in_roster.png
+++ b/gajim/data/iconsets/gnome/32x32/not_in_roster.png
diff --git a/data/iconsets/gnome/32x32/offline.png b/gajim/data/iconsets/gnome/32x32/offline.png
index f3fb12768..f3fb12768 100644
--- a/data/iconsets/gnome/32x32/offline.png
+++ b/gajim/data/iconsets/gnome/32x32/offline.png
diff --git a/data/iconsets/gnome/32x32/online.png b/gajim/data/iconsets/gnome/32x32/online.png
index 4e02f9a8f..4e02f9a8f 100644
--- a/data/iconsets/gnome/32x32/online.png
+++ b/gajim/data/iconsets/gnome/32x32/online.png
diff --git a/data/iconsets/gnome/32x32/requested.png b/gajim/data/iconsets/gnome/32x32/requested.png
index f32a55ac4..f32a55ac4 100644
--- a/data/iconsets/gnome/32x32/requested.png
+++ b/gajim/data/iconsets/gnome/32x32/requested.png
diff --git a/data/iconsets/gnome/32x32/xa.png b/gajim/data/iconsets/gnome/32x32/xa.png
index cbe251ea8..cbe251ea8 100644
--- a/data/iconsets/gnome/32x32/xa.png
+++ b/gajim/data/iconsets/gnome/32x32/xa.png
diff --git a/data/iconsets/gnome/48x48/offline.png b/gajim/data/iconsets/gnome/48x48/offline.png
index f3fb12768..f3fb12768 100644
--- a/data/iconsets/gnome/48x48/offline.png
+++ b/gajim/data/iconsets/gnome/48x48/offline.png
diff --git a/data/iconsets/gnome/48x48/online.png b/gajim/data/iconsets/gnome/48x48/online.png
index 4e02f9a8f..4e02f9a8f 100644
--- a/data/iconsets/gnome/48x48/online.png
+++ b/gajim/data/iconsets/gnome/48x48/online.png
diff --git a/data/iconsets/goojim/16x16/away.png b/gajim/data/iconsets/goojim/16x16/away.png
index 72a4c7a1d..72a4c7a1d 100644
--- a/data/iconsets/goojim/16x16/away.png
+++ b/gajim/data/iconsets/goojim/16x16/away.png
diff --git a/data/iconsets/goojim/16x16/chat.png b/gajim/data/iconsets/goojim/16x16/chat.png
index 7dcf08e4d..7dcf08e4d 100644
--- a/data/iconsets/goojim/16x16/chat.png
+++ b/gajim/data/iconsets/goojim/16x16/chat.png
diff --git a/data/iconsets/goojim/16x16/closed.png b/gajim/data/iconsets/goojim/16x16/closed.png
index ee32dff1d..ee32dff1d 100644
--- a/data/iconsets/goojim/16x16/closed.png
+++ b/gajim/data/iconsets/goojim/16x16/closed.png
diff --git a/data/iconsets/goojim/16x16/connecting.png b/gajim/data/iconsets/goojim/16x16/connecting.png
index d74b7c6e8..d74b7c6e8 100644
--- a/data/iconsets/goojim/16x16/connecting.png
+++ b/gajim/data/iconsets/goojim/16x16/connecting.png
diff --git a/data/iconsets/goojim/16x16/dnd.png b/gajim/data/iconsets/goojim/16x16/dnd.png
index 3d045a374..3d045a374 100644
--- a/data/iconsets/goojim/16x16/dnd.png
+++ b/gajim/data/iconsets/goojim/16x16/dnd.png
diff --git a/data/iconsets/goojim/16x16/error.png b/gajim/data/iconsets/goojim/16x16/error.png
index 85cce3860..85cce3860 100644
--- a/data/iconsets/goojim/16x16/error.png
+++ b/gajim/data/iconsets/goojim/16x16/error.png
diff --git a/data/iconsets/goojim/16x16/event.png b/gajim/data/iconsets/goojim/16x16/event.png
index 381100218..381100218 100644
--- a/data/iconsets/goojim/16x16/event.png
+++ b/gajim/data/iconsets/goojim/16x16/event.png
diff --git a/data/iconsets/goojim/16x16/invisible.png b/gajim/data/iconsets/goojim/16x16/invisible.png
index 073b8b8aa..073b8b8aa 100644
--- a/data/iconsets/goojim/16x16/invisible.png
+++ b/gajim/data/iconsets/goojim/16x16/invisible.png
diff --git a/data/iconsets/goojim/16x16/muc_active.png b/gajim/data/iconsets/goojim/16x16/muc_active.png
index efdd60f12..efdd60f12 100644
--- a/data/iconsets/goojim/16x16/muc_active.png
+++ b/gajim/data/iconsets/goojim/16x16/muc_active.png
diff --git a/data/iconsets/goojim/16x16/muc_inactive.png b/gajim/data/iconsets/goojim/16x16/muc_inactive.png
index 0bf75af15..0bf75af15 100644
--- a/data/iconsets/goojim/16x16/muc_inactive.png
+++ b/gajim/data/iconsets/goojim/16x16/muc_inactive.png
diff --git a/data/iconsets/goojim/16x16/not_in_roster.png b/gajim/data/iconsets/goojim/16x16/not_in_roster.png
index b6adff121..b6adff121 100644
--- a/data/iconsets/goojim/16x16/not_in_roster.png
+++ b/gajim/data/iconsets/goojim/16x16/not_in_roster.png
diff --git a/data/iconsets/goojim/16x16/offline.png b/gajim/data/iconsets/goojim/16x16/offline.png
index 0c265dfd9..0c265dfd9 100644
--- a/data/iconsets/goojim/16x16/offline.png
+++ b/gajim/data/iconsets/goojim/16x16/offline.png
diff --git a/data/iconsets/goojim/16x16/online.png b/gajim/data/iconsets/goojim/16x16/online.png
index 431997652..431997652 100644
--- a/data/iconsets/goojim/16x16/online.png
+++ b/gajim/data/iconsets/goojim/16x16/online.png
diff --git a/data/iconsets/goojim/16x16/opened.png b/gajim/data/iconsets/goojim/16x16/opened.png
index a735933d9..a735933d9 100644
--- a/data/iconsets/goojim/16x16/opened.png
+++ b/gajim/data/iconsets/goojim/16x16/opened.png
diff --git a/data/iconsets/goojim/16x16/requested.png b/gajim/data/iconsets/goojim/16x16/requested.png
index b151fb5e8..b151fb5e8 100644
--- a/data/iconsets/goojim/16x16/requested.png
+++ b/gajim/data/iconsets/goojim/16x16/requested.png
diff --git a/data/iconsets/goojim/16x16/xa.png b/gajim/data/iconsets/goojim/16x16/xa.png
index 96906eaca..96906eaca 100644
--- a/data/iconsets/goojim/16x16/xa.png
+++ b/gajim/data/iconsets/goojim/16x16/xa.png
diff --git a/data/iconsets/goojim/32x32/away.png b/gajim/data/iconsets/goojim/32x32/away.png
index 70d92ba5d..70d92ba5d 100644
--- a/data/iconsets/goojim/32x32/away.png
+++ b/gajim/data/iconsets/goojim/32x32/away.png
diff --git a/data/iconsets/goojim/32x32/chat.png b/gajim/data/iconsets/goojim/32x32/chat.png
index e896f1d39..e896f1d39 100644
--- a/data/iconsets/goojim/32x32/chat.png
+++ b/gajim/data/iconsets/goojim/32x32/chat.png
diff --git a/data/iconsets/goojim/32x32/closed.png b/gajim/data/iconsets/goojim/32x32/closed.png
index bf0f789b1..bf0f789b1 100644
--- a/data/iconsets/goojim/32x32/closed.png
+++ b/gajim/data/iconsets/goojim/32x32/closed.png
diff --git a/data/iconsets/goojim/32x32/connecting.png b/gajim/data/iconsets/goojim/32x32/connecting.png
index 637183b08..637183b08 100644
--- a/data/iconsets/goojim/32x32/connecting.png
+++ b/gajim/data/iconsets/goojim/32x32/connecting.png
diff --git a/data/iconsets/goojim/32x32/dnd.png b/gajim/data/iconsets/goojim/32x32/dnd.png
index d6aa46c5d..d6aa46c5d 100644
--- a/data/iconsets/goojim/32x32/dnd.png
+++ b/gajim/data/iconsets/goojim/32x32/dnd.png
diff --git a/data/iconsets/goojim/32x32/error.png b/gajim/data/iconsets/goojim/32x32/error.png
index 600bb94c9..600bb94c9 100644
--- a/data/iconsets/goojim/32x32/error.png
+++ b/gajim/data/iconsets/goojim/32x32/error.png
diff --git a/data/iconsets/goojim/32x32/event.png b/gajim/data/iconsets/goojim/32x32/event.png
index f45e1950d..f45e1950d 100644
--- a/data/iconsets/goojim/32x32/event.png
+++ b/gajim/data/iconsets/goojim/32x32/event.png
diff --git a/data/iconsets/goojim/32x32/invisible.png b/gajim/data/iconsets/goojim/32x32/invisible.png
index fd83fc46d..fd83fc46d 100644
--- a/data/iconsets/goojim/32x32/invisible.png
+++ b/gajim/data/iconsets/goojim/32x32/invisible.png
diff --git a/data/iconsets/goojim/32x32/muc_active.png b/gajim/data/iconsets/goojim/32x32/muc_active.png
index 3c7474c82..3c7474c82 100644
--- a/data/iconsets/goojim/32x32/muc_active.png
+++ b/gajim/data/iconsets/goojim/32x32/muc_active.png
diff --git a/data/iconsets/goojim/32x32/muc_inactive.png b/gajim/data/iconsets/goojim/32x32/muc_inactive.png
index 279843fde..279843fde 100644
--- a/data/iconsets/goojim/32x32/muc_inactive.png
+++ b/gajim/data/iconsets/goojim/32x32/muc_inactive.png
diff --git a/data/iconsets/goojim/32x32/not_in_roster.png b/gajim/data/iconsets/goojim/32x32/not_in_roster.png
index 85c807d27..85c807d27 100644
--- a/data/iconsets/goojim/32x32/not_in_roster.png
+++ b/gajim/data/iconsets/goojim/32x32/not_in_roster.png
diff --git a/data/iconsets/goojim/32x32/offline.png b/gajim/data/iconsets/goojim/32x32/offline.png
index 5c8a35e86..5c8a35e86 100644
--- a/data/iconsets/goojim/32x32/offline.png
+++ b/gajim/data/iconsets/goojim/32x32/offline.png
diff --git a/data/iconsets/goojim/32x32/online.png b/gajim/data/iconsets/goojim/32x32/online.png
index cf2d6dd3c..cf2d6dd3c 100644
--- a/data/iconsets/goojim/32x32/online.png
+++ b/gajim/data/iconsets/goojim/32x32/online.png
diff --git a/data/iconsets/goojim/32x32/opened.png b/gajim/data/iconsets/goojim/32x32/opened.png
index 4143dea0f..4143dea0f 100644
--- a/data/iconsets/goojim/32x32/opened.png
+++ b/gajim/data/iconsets/goojim/32x32/opened.png
diff --git a/data/iconsets/goojim/32x32/requested.png b/gajim/data/iconsets/goojim/32x32/requested.png
index 546a363eb..546a363eb 100644
--- a/data/iconsets/goojim/32x32/requested.png
+++ b/gajim/data/iconsets/goojim/32x32/requested.png
diff --git a/data/iconsets/goojim/32x32/xa.png b/gajim/data/iconsets/goojim/32x32/xa.png
index aa4697066..aa4697066 100644
--- a/data/iconsets/goojim/32x32/xa.png
+++ b/gajim/data/iconsets/goojim/32x32/xa.png
diff --git a/data/iconsets/goojim/48x48/offline.png b/gajim/data/iconsets/goojim/48x48/offline.png
index a29dd7e1b..a29dd7e1b 100644
--- a/data/iconsets/goojim/48x48/offline.png
+++ b/gajim/data/iconsets/goojim/48x48/offline.png
diff --git a/data/iconsets/goojim/48x48/online.png b/gajim/data/iconsets/goojim/48x48/online.png
index 3fd526d4a..3fd526d4a 100644
--- a/data/iconsets/goojim/48x48/online.png
+++ b/gajim/data/iconsets/goojim/48x48/online.png
diff --git a/data/iconsets/gota/16x16/away.png b/gajim/data/iconsets/gota/16x16/away.png
index 84b6b094c..84b6b094c 100644
--- a/data/iconsets/gota/16x16/away.png
+++ b/gajim/data/iconsets/gota/16x16/away.png
diff --git a/data/iconsets/gota/16x16/chat.png b/gajim/data/iconsets/gota/16x16/chat.png
index b557d203e..b557d203e 100644
--- a/data/iconsets/gota/16x16/chat.png
+++ b/gajim/data/iconsets/gota/16x16/chat.png
diff --git a/data/iconsets/gota/16x16/closed.png b/gajim/data/iconsets/gota/16x16/closed.png
index 0b8439d11..0b8439d11 100644
--- a/data/iconsets/gota/16x16/closed.png
+++ b/gajim/data/iconsets/gota/16x16/closed.png
diff --git a/data/iconsets/gota/16x16/connecting.gif b/gajim/data/iconsets/gota/16x16/connecting.gif
index 2ce91f76c..2ce91f76c 100644
--- a/data/iconsets/gota/16x16/connecting.gif
+++ b/gajim/data/iconsets/gota/16x16/connecting.gif
diff --git a/data/iconsets/gota/16x16/dnd.png b/gajim/data/iconsets/gota/16x16/dnd.png
index d19c7f6e8..d19c7f6e8 100644
--- a/data/iconsets/gota/16x16/dnd.png
+++ b/gajim/data/iconsets/gota/16x16/dnd.png
diff --git a/data/iconsets/gota/16x16/error.png b/gajim/data/iconsets/gota/16x16/error.png
index 4e1c85ead..4e1c85ead 100644
--- a/data/iconsets/gota/16x16/error.png
+++ b/gajim/data/iconsets/gota/16x16/error.png
diff --git a/data/iconsets/gota/16x16/event.gif b/gajim/data/iconsets/gota/16x16/event.gif
index e3bdfa014..e3bdfa014 100644
--- a/data/iconsets/gota/16x16/event.gif
+++ b/gajim/data/iconsets/gota/16x16/event.gif
diff --git a/data/iconsets/gota/16x16/invisible.png b/gajim/data/iconsets/gota/16x16/invisible.png
index b30666a86..b30666a86 100644
--- a/data/iconsets/gota/16x16/invisible.png
+++ b/gajim/data/iconsets/gota/16x16/invisible.png
diff --git a/data/iconsets/gota/16x16/muc_active.png b/gajim/data/iconsets/gota/16x16/muc_active.png
index efdd60f12..efdd60f12 100644
--- a/data/iconsets/gota/16x16/muc_active.png
+++ b/gajim/data/iconsets/gota/16x16/muc_active.png
diff --git a/data/iconsets/gota/16x16/muc_inactive.png b/gajim/data/iconsets/gota/16x16/muc_inactive.png
index 0bf75af15..0bf75af15 100644
--- a/data/iconsets/gota/16x16/muc_inactive.png
+++ b/gajim/data/iconsets/gota/16x16/muc_inactive.png
diff --git a/data/iconsets/gota/16x16/not_in_roster.png b/gajim/data/iconsets/gota/16x16/not_in_roster.png
index e4cab925b..e4cab925b 100644
--- a/data/iconsets/gota/16x16/not_in_roster.png
+++ b/gajim/data/iconsets/gota/16x16/not_in_roster.png
diff --git a/data/iconsets/gota/16x16/offline.png b/gajim/data/iconsets/gota/16x16/offline.png
index a4e188f36..a4e188f36 100644
--- a/data/iconsets/gota/16x16/offline.png
+++ b/gajim/data/iconsets/gota/16x16/offline.png
diff --git a/data/iconsets/gota/16x16/online.png b/gajim/data/iconsets/gota/16x16/online.png
index dd86745db..dd86745db 100644
--- a/data/iconsets/gota/16x16/online.png
+++ b/gajim/data/iconsets/gota/16x16/online.png
diff --git a/data/iconsets/gota/16x16/opened.png b/gajim/data/iconsets/gota/16x16/opened.png
index 3e18f4141..3e18f4141 100644
--- a/data/iconsets/gota/16x16/opened.png
+++ b/gajim/data/iconsets/gota/16x16/opened.png
diff --git a/data/iconsets/gota/16x16/requested.png b/gajim/data/iconsets/gota/16x16/requested.png
index baff984c8..baff984c8 100644
--- a/data/iconsets/gota/16x16/requested.png
+++ b/gajim/data/iconsets/gota/16x16/requested.png
diff --git a/data/iconsets/gota/16x16/xa.png b/gajim/data/iconsets/gota/16x16/xa.png
index 94bab7787..94bab7787 100644
--- a/data/iconsets/gota/16x16/xa.png
+++ b/gajim/data/iconsets/gota/16x16/xa.png
diff --git a/data/iconsets/gota/32x32/away.png b/gajim/data/iconsets/gota/32x32/away.png
index 405d40357..405d40357 100644
--- a/data/iconsets/gota/32x32/away.png
+++ b/gajim/data/iconsets/gota/32x32/away.png
diff --git a/data/iconsets/gota/32x32/chat.png b/gajim/data/iconsets/gota/32x32/chat.png
index 22c304bfc..22c304bfc 100644
--- a/data/iconsets/gota/32x32/chat.png
+++ b/gajim/data/iconsets/gota/32x32/chat.png
diff --git a/data/iconsets/gota/32x32/closed.png b/gajim/data/iconsets/gota/32x32/closed.png
index db43d93ad..db43d93ad 100644
--- a/data/iconsets/gota/32x32/closed.png
+++ b/gajim/data/iconsets/gota/32x32/closed.png
diff --git a/data/iconsets/gota/32x32/connecting.gif b/gajim/data/iconsets/gota/32x32/connecting.gif
index 5a379c90e..5a379c90e 100644
--- a/data/iconsets/gota/32x32/connecting.gif
+++ b/gajim/data/iconsets/gota/32x32/connecting.gif
diff --git a/data/iconsets/gota/32x32/dnd.png b/gajim/data/iconsets/gota/32x32/dnd.png
index f609c322a..f609c322a 100644
--- a/data/iconsets/gota/32x32/dnd.png
+++ b/gajim/data/iconsets/gota/32x32/dnd.png
diff --git a/data/iconsets/gota/32x32/error.png b/gajim/data/iconsets/gota/32x32/error.png
index 562495063..562495063 100644
--- a/data/iconsets/gota/32x32/error.png
+++ b/gajim/data/iconsets/gota/32x32/error.png
diff --git a/data/iconsets/gota/32x32/event.gif b/gajim/data/iconsets/gota/32x32/event.gif
index b2b4e022e..b2b4e022e 100644
--- a/data/iconsets/gota/32x32/event.gif
+++ b/gajim/data/iconsets/gota/32x32/event.gif
diff --git a/data/iconsets/gota/32x32/invisible.png b/gajim/data/iconsets/gota/32x32/invisible.png
index 6aecc358f..6aecc358f 100644
--- a/data/iconsets/gota/32x32/invisible.png
+++ b/gajim/data/iconsets/gota/32x32/invisible.png
diff --git a/data/iconsets/gota/32x32/muc_active.png b/gajim/data/iconsets/gota/32x32/muc_active.png
index 3c7474c82..3c7474c82 100644
--- a/data/iconsets/gota/32x32/muc_active.png
+++ b/gajim/data/iconsets/gota/32x32/muc_active.png
diff --git a/data/iconsets/gota/32x32/muc_inactive.png b/gajim/data/iconsets/gota/32x32/muc_inactive.png
index 279843fde..279843fde 100644
--- a/data/iconsets/gota/32x32/muc_inactive.png
+++ b/gajim/data/iconsets/gota/32x32/muc_inactive.png
diff --git a/data/iconsets/gota/32x32/not_in_roster.png b/gajim/data/iconsets/gota/32x32/not_in_roster.png
index f7a77a4f4..f7a77a4f4 100644
--- a/data/iconsets/gota/32x32/not_in_roster.png
+++ b/gajim/data/iconsets/gota/32x32/not_in_roster.png
diff --git a/data/iconsets/gota/32x32/offline.png b/gajim/data/iconsets/gota/32x32/offline.png
index 6bc715b6d..6bc715b6d 100644
--- a/data/iconsets/gota/32x32/offline.png
+++ b/gajim/data/iconsets/gota/32x32/offline.png
diff --git a/data/iconsets/gota/32x32/online.png b/gajim/data/iconsets/gota/32x32/online.png
index 20cab8b86..20cab8b86 100644
--- a/data/iconsets/gota/32x32/online.png
+++ b/gajim/data/iconsets/gota/32x32/online.png
diff --git a/data/iconsets/gota/32x32/opened.png b/gajim/data/iconsets/gota/32x32/opened.png
index 86e9a8982..86e9a8982 100644
--- a/data/iconsets/gota/32x32/opened.png
+++ b/gajim/data/iconsets/gota/32x32/opened.png
diff --git a/data/iconsets/gota/32x32/requested.png b/gajim/data/iconsets/gota/32x32/requested.png
index 236f9f9ff..236f9f9ff 100644
--- a/data/iconsets/gota/32x32/requested.png
+++ b/gajim/data/iconsets/gota/32x32/requested.png
diff --git a/data/iconsets/gota/32x32/xa.png b/gajim/data/iconsets/gota/32x32/xa.png
index 677ac71db..677ac71db 100644
--- a/data/iconsets/gota/32x32/xa.png
+++ b/gajim/data/iconsets/gota/32x32/xa.png
diff --git a/data/iconsets/gota/48x48/offline.png b/gajim/data/iconsets/gota/48x48/offline.png
index 6bc715b6d..6bc715b6d 100644
--- a/data/iconsets/gota/48x48/offline.png
+++ b/gajim/data/iconsets/gota/48x48/offline.png
diff --git a/data/iconsets/gota/48x48/online.png b/gajim/data/iconsets/gota/48x48/online.png
index 20cab8b86..20cab8b86 100644
--- a/data/iconsets/gota/48x48/online.png
+++ b/gajim/data/iconsets/gota/48x48/online.png
diff --git a/data/iconsets/jabberbulb/16x16/away.png b/gajim/data/iconsets/jabberbulb/16x16/away.png
index 354aaa9d8..354aaa9d8 100644
--- a/data/iconsets/jabberbulb/16x16/away.png
+++ b/gajim/data/iconsets/jabberbulb/16x16/away.png
diff --git a/data/iconsets/jabberbulb/16x16/chat.png b/gajim/data/iconsets/jabberbulb/16x16/chat.png
index bf4296c81..bf4296c81 100644
--- a/data/iconsets/jabberbulb/16x16/chat.png
+++ b/gajim/data/iconsets/jabberbulb/16x16/chat.png
diff --git a/data/iconsets/jabberbulb/16x16/closed.png b/gajim/data/iconsets/jabberbulb/16x16/closed.png
index 2cff0d6fc..2cff0d6fc 100644
--- a/data/iconsets/jabberbulb/16x16/closed.png
+++ b/gajim/data/iconsets/jabberbulb/16x16/closed.png
diff --git a/data/iconsets/jabberbulb/16x16/connecting.png b/gajim/data/iconsets/jabberbulb/16x16/connecting.png
index 9801f62e9..9801f62e9 100644
--- a/data/iconsets/jabberbulb/16x16/connecting.png
+++ b/gajim/data/iconsets/jabberbulb/16x16/connecting.png
diff --git a/data/iconsets/jabberbulb/16x16/dnd.png b/gajim/data/iconsets/jabberbulb/16x16/dnd.png
index 933e3d181..933e3d181 100644
--- a/data/iconsets/jabberbulb/16x16/dnd.png
+++ b/gajim/data/iconsets/jabberbulb/16x16/dnd.png
diff --git a/data/iconsets/jabberbulb/16x16/error.png b/gajim/data/iconsets/jabberbulb/16x16/error.png
index 0ecf3a82c..0ecf3a82c 100644
--- a/data/iconsets/jabberbulb/16x16/error.png
+++ b/gajim/data/iconsets/jabberbulb/16x16/error.png
diff --git a/data/iconsets/jabberbulb/16x16/event.gif b/gajim/data/iconsets/jabberbulb/16x16/event.gif
index 4a36aa2ce..4a36aa2ce 100644
--- a/data/iconsets/jabberbulb/16x16/event.gif
+++ b/gajim/data/iconsets/jabberbulb/16x16/event.gif
diff --git a/data/iconsets/jabberbulb/16x16/invisible.png b/gajim/data/iconsets/jabberbulb/16x16/invisible.png
index 19fd677fe..19fd677fe 100644
--- a/data/iconsets/jabberbulb/16x16/invisible.png
+++ b/gajim/data/iconsets/jabberbulb/16x16/invisible.png
diff --git a/data/iconsets/jabberbulb/16x16/muc_active.png b/gajim/data/iconsets/jabberbulb/16x16/muc_active.png
index efdd60f12..efdd60f12 100644
--- a/data/iconsets/jabberbulb/16x16/muc_active.png
+++ b/gajim/data/iconsets/jabberbulb/16x16/muc_active.png
diff --git a/data/iconsets/jabberbulb/16x16/muc_inactive.png b/gajim/data/iconsets/jabberbulb/16x16/muc_inactive.png
index 0bf75af15..0bf75af15 100644
--- a/data/iconsets/jabberbulb/16x16/muc_inactive.png
+++ b/gajim/data/iconsets/jabberbulb/16x16/muc_inactive.png
diff --git a/data/iconsets/jabberbulb/16x16/not_in_roster.png b/gajim/data/iconsets/jabberbulb/16x16/not_in_roster.png
index d705d2a40..d705d2a40 100644
--- a/data/iconsets/jabberbulb/16x16/not_in_roster.png
+++ b/gajim/data/iconsets/jabberbulb/16x16/not_in_roster.png
diff --git a/data/iconsets/jabberbulb/16x16/offline.png b/gajim/data/iconsets/jabberbulb/16x16/offline.png
index 7dfb587a7..7dfb587a7 100644
--- a/data/iconsets/jabberbulb/16x16/offline.png
+++ b/gajim/data/iconsets/jabberbulb/16x16/offline.png
diff --git a/data/iconsets/jabberbulb/16x16/online.png b/gajim/data/iconsets/jabberbulb/16x16/online.png
index 6e030a9d1..6e030a9d1 100644
--- a/data/iconsets/jabberbulb/16x16/online.png
+++ b/gajim/data/iconsets/jabberbulb/16x16/online.png
diff --git a/data/iconsets/jabberbulb/16x16/opened.png b/gajim/data/iconsets/jabberbulb/16x16/opened.png
index 2a13d8034..2a13d8034 100644
--- a/data/iconsets/jabberbulb/16x16/opened.png
+++ b/gajim/data/iconsets/jabberbulb/16x16/opened.png
diff --git a/data/iconsets/jabberbulb/16x16/requested.png b/gajim/data/iconsets/jabberbulb/16x16/requested.png
index 9474b7ab1..9474b7ab1 100644
--- a/data/iconsets/jabberbulb/16x16/requested.png
+++ b/gajim/data/iconsets/jabberbulb/16x16/requested.png
diff --git a/data/iconsets/jabberbulb/16x16/xa.png b/gajim/data/iconsets/jabberbulb/16x16/xa.png
index 61b8ade70..61b8ade70 100644
--- a/data/iconsets/jabberbulb/16x16/xa.png
+++ b/gajim/data/iconsets/jabberbulb/16x16/xa.png
diff --git a/data/iconsets/jabberbulb/32x32/away.png b/gajim/data/iconsets/jabberbulb/32x32/away.png
index e6a4e69e0..e6a4e69e0 100644
--- a/data/iconsets/jabberbulb/32x32/away.png
+++ b/gajim/data/iconsets/jabberbulb/32x32/away.png
diff --git a/data/iconsets/jabberbulb/32x32/chat.png b/gajim/data/iconsets/jabberbulb/32x32/chat.png
index f31896300..f31896300 100644
--- a/data/iconsets/jabberbulb/32x32/chat.png
+++ b/gajim/data/iconsets/jabberbulb/32x32/chat.png
diff --git a/data/iconsets/jabberbulb/32x32/dnd.png b/gajim/data/iconsets/jabberbulb/32x32/dnd.png
index 0c825db06..0c825db06 100644
--- a/data/iconsets/jabberbulb/32x32/dnd.png
+++ b/gajim/data/iconsets/jabberbulb/32x32/dnd.png
diff --git a/data/iconsets/jabberbulb/32x32/error.png b/gajim/data/iconsets/jabberbulb/32x32/error.png
index f5d2329cc..f5d2329cc 100644
--- a/data/iconsets/jabberbulb/32x32/error.png
+++ b/gajim/data/iconsets/jabberbulb/32x32/error.png
diff --git a/data/iconsets/jabberbulb/32x32/invisible.png b/gajim/data/iconsets/jabberbulb/32x32/invisible.png
index 0b5e352ed..0b5e352ed 100644
--- a/data/iconsets/jabberbulb/32x32/invisible.png
+++ b/gajim/data/iconsets/jabberbulb/32x32/invisible.png
diff --git a/data/iconsets/jabberbulb/32x32/muc_active.png b/gajim/data/iconsets/jabberbulb/32x32/muc_active.png
index 3c7474c82..3c7474c82 100644
--- a/data/iconsets/jabberbulb/32x32/muc_active.png
+++ b/gajim/data/iconsets/jabberbulb/32x32/muc_active.png
diff --git a/data/iconsets/jabberbulb/32x32/muc_inactive.png b/gajim/data/iconsets/jabberbulb/32x32/muc_inactive.png
index 279843fde..279843fde 100644
--- a/data/iconsets/jabberbulb/32x32/muc_inactive.png
+++ b/gajim/data/iconsets/jabberbulb/32x32/muc_inactive.png
diff --git a/data/iconsets/jabberbulb/32x32/not_in_roster.png b/gajim/data/iconsets/jabberbulb/32x32/not_in_roster.png
index d04a6cc47..d04a6cc47 100644
--- a/data/iconsets/jabberbulb/32x32/not_in_roster.png
+++ b/gajim/data/iconsets/jabberbulb/32x32/not_in_roster.png
diff --git a/data/iconsets/jabberbulb/32x32/offline.png b/gajim/data/iconsets/jabberbulb/32x32/offline.png
index 46f0a1a45..46f0a1a45 100644
--- a/data/iconsets/jabberbulb/32x32/offline.png
+++ b/gajim/data/iconsets/jabberbulb/32x32/offline.png
diff --git a/data/iconsets/jabberbulb/32x32/online.png b/gajim/data/iconsets/jabberbulb/32x32/online.png
index 0493a26f1..0493a26f1 100644
--- a/data/iconsets/jabberbulb/32x32/online.png
+++ b/gajim/data/iconsets/jabberbulb/32x32/online.png
diff --git a/data/iconsets/jabberbulb/32x32/requested.png b/gajim/data/iconsets/jabberbulb/32x32/requested.png
index b53268095..b53268095 100644
--- a/data/iconsets/jabberbulb/32x32/requested.png
+++ b/gajim/data/iconsets/jabberbulb/32x32/requested.png
diff --git a/data/iconsets/jabberbulb/32x32/xa.png b/gajim/data/iconsets/jabberbulb/32x32/xa.png
index 63a254ede..63a254ede 100644
--- a/data/iconsets/jabberbulb/32x32/xa.png
+++ b/gajim/data/iconsets/jabberbulb/32x32/xa.png
diff --git a/data/iconsets/jabberbulb/48x48/offline.png b/gajim/data/iconsets/jabberbulb/48x48/offline.png
index 46f0a1a45..46f0a1a45 100644
--- a/data/iconsets/jabberbulb/48x48/offline.png
+++ b/gajim/data/iconsets/jabberbulb/48x48/offline.png
diff --git a/data/iconsets/jabberbulb/48x48/online.png b/gajim/data/iconsets/jabberbulb/48x48/online.png
index 0493a26f1..0493a26f1 100644
--- a/data/iconsets/jabberbulb/48x48/online.png
+++ b/gajim/data/iconsets/jabberbulb/48x48/online.png
diff --git a/data/iconsets/sun/16x16/away.png b/gajim/data/iconsets/sun/16x16/away.png
index 9f9b563d3..9f9b563d3 100644
--- a/data/iconsets/sun/16x16/away.png
+++ b/gajim/data/iconsets/sun/16x16/away.png
diff --git a/data/iconsets/sun/16x16/chat.png b/gajim/data/iconsets/sun/16x16/chat.png
index c4ce6c06a..c4ce6c06a 100644
--- a/data/iconsets/sun/16x16/chat.png
+++ b/gajim/data/iconsets/sun/16x16/chat.png
diff --git a/data/iconsets/sun/16x16/closed.png b/gajim/data/iconsets/sun/16x16/closed.png
index f3f7eb713..f3f7eb713 100644
--- a/data/iconsets/sun/16x16/closed.png
+++ b/gajim/data/iconsets/sun/16x16/closed.png
diff --git a/data/iconsets/sun/16x16/connecting.gif b/gajim/data/iconsets/sun/16x16/connecting.gif
index 53914b066..53914b066 100644
--- a/data/iconsets/sun/16x16/connecting.gif
+++ b/gajim/data/iconsets/sun/16x16/connecting.gif
diff --git a/data/iconsets/sun/16x16/dnd.png b/gajim/data/iconsets/sun/16x16/dnd.png
index 5d5752d18..5d5752d18 100644
--- a/data/iconsets/sun/16x16/dnd.png
+++ b/gajim/data/iconsets/sun/16x16/dnd.png
diff --git a/data/iconsets/sun/16x16/error.png b/gajim/data/iconsets/sun/16x16/error.png
index 63d303093..63d303093 100644
--- a/data/iconsets/sun/16x16/error.png
+++ b/gajim/data/iconsets/sun/16x16/error.png
diff --git a/data/iconsets/sun/16x16/event.gif b/gajim/data/iconsets/sun/16x16/event.gif
index fea7551cf..fea7551cf 100644
--- a/data/iconsets/sun/16x16/event.gif
+++ b/gajim/data/iconsets/sun/16x16/event.gif
diff --git a/data/iconsets/sun/16x16/invisible.png b/gajim/data/iconsets/sun/16x16/invisible.png
index 42a957db4..42a957db4 100644
--- a/data/iconsets/sun/16x16/invisible.png
+++ b/gajim/data/iconsets/sun/16x16/invisible.png
diff --git a/data/iconsets/sun/16x16/muc_active.png b/gajim/data/iconsets/sun/16x16/muc_active.png
index efdd60f12..efdd60f12 100644
--- a/data/iconsets/sun/16x16/muc_active.png
+++ b/gajim/data/iconsets/sun/16x16/muc_active.png
diff --git a/data/iconsets/sun/16x16/muc_inactive.png b/gajim/data/iconsets/sun/16x16/muc_inactive.png
index 0bf75af15..0bf75af15 100644
--- a/data/iconsets/sun/16x16/muc_inactive.png
+++ b/gajim/data/iconsets/sun/16x16/muc_inactive.png
diff --git a/data/iconsets/sun/16x16/not_in_roster.png b/gajim/data/iconsets/sun/16x16/not_in_roster.png
index 55e639f81..55e639f81 100644
--- a/data/iconsets/sun/16x16/not_in_roster.png
+++ b/gajim/data/iconsets/sun/16x16/not_in_roster.png
diff --git a/data/iconsets/sun/16x16/offline.png b/gajim/data/iconsets/sun/16x16/offline.png
index 01bc86574..01bc86574 100644
--- a/data/iconsets/sun/16x16/offline.png
+++ b/gajim/data/iconsets/sun/16x16/offline.png
diff --git a/data/iconsets/sun/16x16/online.png b/gajim/data/iconsets/sun/16x16/online.png
index 578390c5a..578390c5a 100644
--- a/data/iconsets/sun/16x16/online.png
+++ b/gajim/data/iconsets/sun/16x16/online.png
diff --git a/data/iconsets/sun/16x16/opened.png b/gajim/data/iconsets/sun/16x16/opened.png
index 5e1d6a06f..5e1d6a06f 100644
--- a/data/iconsets/sun/16x16/opened.png
+++ b/gajim/data/iconsets/sun/16x16/opened.png
diff --git a/data/iconsets/sun/16x16/requested.png b/gajim/data/iconsets/sun/16x16/requested.png
index 3c48593c3..3c48593c3 100644
--- a/data/iconsets/sun/16x16/requested.png
+++ b/gajim/data/iconsets/sun/16x16/requested.png
diff --git a/data/iconsets/sun/16x16/xa.png b/gajim/data/iconsets/sun/16x16/xa.png
index cdbb40c29..cdbb40c29 100644
--- a/data/iconsets/sun/16x16/xa.png
+++ b/gajim/data/iconsets/sun/16x16/xa.png
diff --git a/data/iconsets/sun/32x32/away.png b/gajim/data/iconsets/sun/32x32/away.png
index e2c50a5e1..e2c50a5e1 100644
--- a/data/iconsets/sun/32x32/away.png
+++ b/gajim/data/iconsets/sun/32x32/away.png
diff --git a/data/iconsets/sun/32x32/chat.png b/gajim/data/iconsets/sun/32x32/chat.png
index 9e4db32ad..9e4db32ad 100644
--- a/data/iconsets/sun/32x32/chat.png
+++ b/gajim/data/iconsets/sun/32x32/chat.png
diff --git a/data/iconsets/sun/32x32/dnd.png b/gajim/data/iconsets/sun/32x32/dnd.png
index 35579a925..35579a925 100644
--- a/data/iconsets/sun/32x32/dnd.png
+++ b/gajim/data/iconsets/sun/32x32/dnd.png
diff --git a/data/iconsets/sun/32x32/error.png b/gajim/data/iconsets/sun/32x32/error.png
index 4255cfbdf..4255cfbdf 100644
--- a/data/iconsets/sun/32x32/error.png
+++ b/gajim/data/iconsets/sun/32x32/error.png
diff --git a/data/iconsets/sun/32x32/invisible.png b/gajim/data/iconsets/sun/32x32/invisible.png
index 140d37e07..140d37e07 100644
--- a/data/iconsets/sun/32x32/invisible.png
+++ b/gajim/data/iconsets/sun/32x32/invisible.png
diff --git a/data/iconsets/sun/32x32/muc_active.png b/gajim/data/iconsets/sun/32x32/muc_active.png
index 3c7474c82..3c7474c82 100644
--- a/data/iconsets/sun/32x32/muc_active.png
+++ b/gajim/data/iconsets/sun/32x32/muc_active.png
diff --git a/data/iconsets/sun/32x32/muc_inactive.png b/gajim/data/iconsets/sun/32x32/muc_inactive.png
index 279843fde..279843fde 100644
--- a/data/iconsets/sun/32x32/muc_inactive.png
+++ b/gajim/data/iconsets/sun/32x32/muc_inactive.png
diff --git a/data/iconsets/sun/32x32/not_in_roster.png b/gajim/data/iconsets/sun/32x32/not_in_roster.png
index 44d4b67a4..44d4b67a4 100644
--- a/data/iconsets/sun/32x32/not_in_roster.png
+++ b/gajim/data/iconsets/sun/32x32/not_in_roster.png
diff --git a/data/iconsets/sun/32x32/offline.png b/gajim/data/iconsets/sun/32x32/offline.png
index ed2413367..ed2413367 100644
--- a/data/iconsets/sun/32x32/offline.png
+++ b/gajim/data/iconsets/sun/32x32/offline.png
diff --git a/data/iconsets/sun/32x32/online.png b/gajim/data/iconsets/sun/32x32/online.png
index fa31e434d..fa31e434d 100644
--- a/data/iconsets/sun/32x32/online.png
+++ b/gajim/data/iconsets/sun/32x32/online.png
diff --git a/data/iconsets/sun/32x32/requested.png b/gajim/data/iconsets/sun/32x32/requested.png
index 029e30db1..029e30db1 100644
--- a/data/iconsets/sun/32x32/requested.png
+++ b/gajim/data/iconsets/sun/32x32/requested.png
diff --git a/data/iconsets/sun/32x32/xa.png b/gajim/data/iconsets/sun/32x32/xa.png
index e099b7f3d..e099b7f3d 100644
--- a/data/iconsets/sun/32x32/xa.png
+++ b/gajim/data/iconsets/sun/32x32/xa.png
diff --git a/data/iconsets/sun/48x48/offline.png b/gajim/data/iconsets/sun/48x48/offline.png
index 6c2a5a1ed..6c2a5a1ed 100644
--- a/data/iconsets/sun/48x48/offline.png
+++ b/gajim/data/iconsets/sun/48x48/offline.png
diff --git a/data/iconsets/sun/48x48/online.png b/gajim/data/iconsets/sun/48x48/online.png
index 9cdc3e81c..9cdc3e81c 100644
--- a/data/iconsets/sun/48x48/online.png
+++ b/gajim/data/iconsets/sun/48x48/online.png
diff --git a/data/iconsets/transports/aim/16x16/away.png b/gajim/data/iconsets/transports/aim/16x16/away.png
index a4c812454..a4c812454 100644
--- a/data/iconsets/transports/aim/16x16/away.png
+++ b/gajim/data/iconsets/transports/aim/16x16/away.png
diff --git a/data/iconsets/transports/aim/16x16/chat.png b/gajim/data/iconsets/transports/aim/16x16/chat.png
index 5bf473cbb..5bf473cbb 100644
--- a/data/iconsets/transports/aim/16x16/chat.png
+++ b/gajim/data/iconsets/transports/aim/16x16/chat.png
diff --git a/data/iconsets/transports/aim/16x16/dnd.png b/gajim/data/iconsets/transports/aim/16x16/dnd.png
index bf2cb9d0e..bf2cb9d0e 100644
--- a/data/iconsets/transports/aim/16x16/dnd.png
+++ b/gajim/data/iconsets/transports/aim/16x16/dnd.png
diff --git a/data/iconsets/transports/aim/16x16/not_in_roster.png b/gajim/data/iconsets/transports/aim/16x16/not_in_roster.png
index 185a9ee53..185a9ee53 100644
--- a/data/iconsets/transports/aim/16x16/not_in_roster.png
+++ b/gajim/data/iconsets/transports/aim/16x16/not_in_roster.png
diff --git a/data/iconsets/transports/aim/16x16/offline.png b/gajim/data/iconsets/transports/aim/16x16/offline.png
index b4368f6e3..b4368f6e3 100644
--- a/data/iconsets/transports/aim/16x16/offline.png
+++ b/gajim/data/iconsets/transports/aim/16x16/offline.png
diff --git a/data/iconsets/transports/aim/16x16/online.png b/gajim/data/iconsets/transports/aim/16x16/online.png
index 265fc1c74..265fc1c74 100644
--- a/data/iconsets/transports/aim/16x16/online.png
+++ b/gajim/data/iconsets/transports/aim/16x16/online.png
diff --git a/data/iconsets/transports/aim/16x16/xa.png b/gajim/data/iconsets/transports/aim/16x16/xa.png
index 6df52c3c0..6df52c3c0 100644
--- a/data/iconsets/transports/aim/16x16/xa.png
+++ b/gajim/data/iconsets/transports/aim/16x16/xa.png
diff --git a/data/iconsets/transports/aim/32x32/away.png b/gajim/data/iconsets/transports/aim/32x32/away.png
index 611d4f879..611d4f879 100644
--- a/data/iconsets/transports/aim/32x32/away.png
+++ b/gajim/data/iconsets/transports/aim/32x32/away.png
diff --git a/data/iconsets/transports/aim/32x32/chat.png b/gajim/data/iconsets/transports/aim/32x32/chat.png
index bdc05885e..bdc05885e 100644
--- a/data/iconsets/transports/aim/32x32/chat.png
+++ b/gajim/data/iconsets/transports/aim/32x32/chat.png
diff --git a/data/iconsets/transports/aim/32x32/dnd.png b/gajim/data/iconsets/transports/aim/32x32/dnd.png
index 4ed29d2da..4ed29d2da 100644
--- a/data/iconsets/transports/aim/32x32/dnd.png
+++ b/gajim/data/iconsets/transports/aim/32x32/dnd.png
diff --git a/data/iconsets/transports/aim/32x32/not_in_roster.png b/gajim/data/iconsets/transports/aim/32x32/not_in_roster.png
index 5a680a410..5a680a410 100644
--- a/data/iconsets/transports/aim/32x32/not_in_roster.png
+++ b/gajim/data/iconsets/transports/aim/32x32/not_in_roster.png
diff --git a/data/iconsets/transports/aim/32x32/offline.png b/gajim/data/iconsets/transports/aim/32x32/offline.png
index a7578a979..a7578a979 100644
--- a/data/iconsets/transports/aim/32x32/offline.png
+++ b/gajim/data/iconsets/transports/aim/32x32/offline.png
diff --git a/data/iconsets/transports/aim/32x32/online.png b/gajim/data/iconsets/transports/aim/32x32/online.png
index 823727ef7..823727ef7 100644
--- a/data/iconsets/transports/aim/32x32/online.png
+++ b/gajim/data/iconsets/transports/aim/32x32/online.png
diff --git a/data/iconsets/transports/aim/32x32/xa.png b/gajim/data/iconsets/transports/aim/32x32/xa.png
index 7890b53af..7890b53af 100644
--- a/data/iconsets/transports/aim/32x32/xa.png
+++ b/gajim/data/iconsets/transports/aim/32x32/xa.png
diff --git a/data/iconsets/transports/aim/48x48/offline.png b/gajim/data/iconsets/transports/aim/48x48/offline.png
index 049ddda3d..049ddda3d 100644
--- a/data/iconsets/transports/aim/48x48/offline.png
+++ b/gajim/data/iconsets/transports/aim/48x48/offline.png
diff --git a/data/iconsets/transports/aim/48x48/online.png b/gajim/data/iconsets/transports/aim/48x48/online.png
index 757d7bba0..757d7bba0 100644
--- a/data/iconsets/transports/aim/48x48/online.png
+++ b/gajim/data/iconsets/transports/aim/48x48/online.png
diff --git a/data/iconsets/transports/facebook/16x16/away.png b/gajim/data/iconsets/transports/facebook/16x16/away.png
index 4bb8de1bb..4bb8de1bb 100644
--- a/data/iconsets/transports/facebook/16x16/away.png
+++ b/gajim/data/iconsets/transports/facebook/16x16/away.png
diff --git a/data/iconsets/transports/facebook/16x16/chat.png b/gajim/data/iconsets/transports/facebook/16x16/chat.png
index bc42cf9b0..bc42cf9b0 100644
--- a/data/iconsets/transports/facebook/16x16/chat.png
+++ b/gajim/data/iconsets/transports/facebook/16x16/chat.png
diff --git a/data/iconsets/transports/facebook/16x16/dnd.png b/gajim/data/iconsets/transports/facebook/16x16/dnd.png
index 4bb8de1bb..4bb8de1bb 100644
--- a/data/iconsets/transports/facebook/16x16/dnd.png
+++ b/gajim/data/iconsets/transports/facebook/16x16/dnd.png
diff --git a/data/iconsets/transports/facebook/16x16/not_in_roster.png b/gajim/data/iconsets/transports/facebook/16x16/not_in_roster.png
index 2666be91a..2666be91a 100644
--- a/data/iconsets/transports/facebook/16x16/not_in_roster.png
+++ b/gajim/data/iconsets/transports/facebook/16x16/not_in_roster.png
diff --git a/data/iconsets/transports/facebook/16x16/offline.png b/gajim/data/iconsets/transports/facebook/16x16/offline.png
index a980b777b..a980b777b 100644
--- a/data/iconsets/transports/facebook/16x16/offline.png
+++ b/gajim/data/iconsets/transports/facebook/16x16/offline.png
diff --git a/data/iconsets/transports/facebook/16x16/online.png b/gajim/data/iconsets/transports/facebook/16x16/online.png
index bc42cf9b0..bc42cf9b0 100644
--- a/data/iconsets/transports/facebook/16x16/online.png
+++ b/gajim/data/iconsets/transports/facebook/16x16/online.png
diff --git a/data/iconsets/transports/facebook/16x16/xa.png b/gajim/data/iconsets/transports/facebook/16x16/xa.png
index 4bb8de1bb..4bb8de1bb 100644
--- a/data/iconsets/transports/facebook/16x16/xa.png
+++ b/gajim/data/iconsets/transports/facebook/16x16/xa.png
diff --git a/data/iconsets/transports/facebook/32x32/away.png b/gajim/data/iconsets/transports/facebook/32x32/away.png
index c89b9304d..c89b9304d 100644
--- a/data/iconsets/transports/facebook/32x32/away.png
+++ b/gajim/data/iconsets/transports/facebook/32x32/away.png
diff --git a/data/iconsets/transports/facebook/32x32/chat.png b/gajim/data/iconsets/transports/facebook/32x32/chat.png
index 65695e9e5..65695e9e5 100644
--- a/data/iconsets/transports/facebook/32x32/chat.png
+++ b/gajim/data/iconsets/transports/facebook/32x32/chat.png
diff --git a/data/iconsets/transports/facebook/32x32/dnd.png b/gajim/data/iconsets/transports/facebook/32x32/dnd.png
index c89b9304d..c89b9304d 100644
--- a/data/iconsets/transports/facebook/32x32/dnd.png
+++ b/gajim/data/iconsets/transports/facebook/32x32/dnd.png
diff --git a/data/iconsets/transports/facebook/32x32/not_in_roster.png b/gajim/data/iconsets/transports/facebook/32x32/not_in_roster.png
index faaaa1ccd..faaaa1ccd 100644
--- a/data/iconsets/transports/facebook/32x32/not_in_roster.png
+++ b/gajim/data/iconsets/transports/facebook/32x32/not_in_roster.png
diff --git a/data/iconsets/transports/facebook/32x32/offline.png b/gajim/data/iconsets/transports/facebook/32x32/offline.png
index 2ae605802..2ae605802 100644
--- a/data/iconsets/transports/facebook/32x32/offline.png
+++ b/gajim/data/iconsets/transports/facebook/32x32/offline.png
diff --git a/data/iconsets/transports/facebook/32x32/online.png b/gajim/data/iconsets/transports/facebook/32x32/online.png
index 65695e9e5..65695e9e5 100644
--- a/data/iconsets/transports/facebook/32x32/online.png
+++ b/gajim/data/iconsets/transports/facebook/32x32/online.png
diff --git a/data/iconsets/transports/facebook/32x32/xa.png b/gajim/data/iconsets/transports/facebook/32x32/xa.png
index c89b9304d..c89b9304d 100644
--- a/data/iconsets/transports/facebook/32x32/xa.png
+++ b/gajim/data/iconsets/transports/facebook/32x32/xa.png
diff --git a/data/iconsets/transports/facebook/48x48/offline.png b/gajim/data/iconsets/transports/facebook/48x48/offline.png
index fd33197c2..fd33197c2 100644
--- a/data/iconsets/transports/facebook/48x48/offline.png
+++ b/gajim/data/iconsets/transports/facebook/48x48/offline.png
diff --git a/data/iconsets/transports/facebook/48x48/online.png b/gajim/data/iconsets/transports/facebook/48x48/online.png
index 2501acaab..2501acaab 100644
--- a/data/iconsets/transports/facebook/48x48/online.png
+++ b/gajim/data/iconsets/transports/facebook/48x48/online.png
diff --git a/data/iconsets/transports/gadu-gadu/16x16/away.png b/gajim/data/iconsets/transports/gadu-gadu/16x16/away.png
index ef1287d8f..ef1287d8f 100644
--- a/data/iconsets/transports/gadu-gadu/16x16/away.png
+++ b/gajim/data/iconsets/transports/gadu-gadu/16x16/away.png
diff --git a/data/iconsets/transports/gadu-gadu/16x16/chat.png b/gajim/data/iconsets/transports/gadu-gadu/16x16/chat.png
index 7d3378aeb..7d3378aeb 100644
--- a/data/iconsets/transports/gadu-gadu/16x16/chat.png
+++ b/gajim/data/iconsets/transports/gadu-gadu/16x16/chat.png
diff --git a/data/iconsets/transports/gadu-gadu/16x16/dnd.png b/gajim/data/iconsets/transports/gadu-gadu/16x16/dnd.png
index 23003b33c..23003b33c 100644
--- a/data/iconsets/transports/gadu-gadu/16x16/dnd.png
+++ b/gajim/data/iconsets/transports/gadu-gadu/16x16/dnd.png
diff --git a/data/iconsets/transports/gadu-gadu/16x16/invisible.png b/gajim/data/iconsets/transports/gadu-gadu/16x16/invisible.png
index 1d408e4e9..1d408e4e9 100644
--- a/data/iconsets/transports/gadu-gadu/16x16/invisible.png
+++ b/gajim/data/iconsets/transports/gadu-gadu/16x16/invisible.png
diff --git a/data/iconsets/transports/gadu-gadu/16x16/not_in_roster.png b/gajim/data/iconsets/transports/gadu-gadu/16x16/not_in_roster.png
index 8409067a5..8409067a5 100644
--- a/data/iconsets/transports/gadu-gadu/16x16/not_in_roster.png
+++ b/gajim/data/iconsets/transports/gadu-gadu/16x16/not_in_roster.png
diff --git a/data/iconsets/transports/gadu-gadu/16x16/offline.png b/gajim/data/iconsets/transports/gadu-gadu/16x16/offline.png
index 3c5093e47..3c5093e47 100644
--- a/data/iconsets/transports/gadu-gadu/16x16/offline.png
+++ b/gajim/data/iconsets/transports/gadu-gadu/16x16/offline.png
diff --git a/data/iconsets/transports/gadu-gadu/16x16/online.png b/gajim/data/iconsets/transports/gadu-gadu/16x16/online.png
index 0a7e6d4e0..0a7e6d4e0 100644
--- a/data/iconsets/transports/gadu-gadu/16x16/online.png
+++ b/gajim/data/iconsets/transports/gadu-gadu/16x16/online.png
diff --git a/data/iconsets/transports/gadu-gadu/16x16/xa.png b/gajim/data/iconsets/transports/gadu-gadu/16x16/xa.png
index ef1287d8f..ef1287d8f 100644
--- a/data/iconsets/transports/gadu-gadu/16x16/xa.png
+++ b/gajim/data/iconsets/transports/gadu-gadu/16x16/xa.png
diff --git a/data/iconsets/transports/gadu-gadu/32x32/away.png b/gajim/data/iconsets/transports/gadu-gadu/32x32/away.png
index 7ac86af1e..7ac86af1e 100644
--- a/data/iconsets/transports/gadu-gadu/32x32/away.png
+++ b/gajim/data/iconsets/transports/gadu-gadu/32x32/away.png
diff --git a/data/iconsets/transports/gadu-gadu/32x32/chat.png b/gajim/data/iconsets/transports/gadu-gadu/32x32/chat.png
index e95ccd2f9..e95ccd2f9 100644
--- a/data/iconsets/transports/gadu-gadu/32x32/chat.png
+++ b/gajim/data/iconsets/transports/gadu-gadu/32x32/chat.png
diff --git a/data/iconsets/transports/gadu-gadu/32x32/dnd.png b/gajim/data/iconsets/transports/gadu-gadu/32x32/dnd.png
index af7dba91c..af7dba91c 100644
--- a/data/iconsets/transports/gadu-gadu/32x32/dnd.png
+++ b/gajim/data/iconsets/transports/gadu-gadu/32x32/dnd.png
diff --git a/data/iconsets/transports/gadu-gadu/32x32/invisible.png b/gajim/data/iconsets/transports/gadu-gadu/32x32/invisible.png
index b13f84cc3..b13f84cc3 100644
--- a/data/iconsets/transports/gadu-gadu/32x32/invisible.png
+++ b/gajim/data/iconsets/transports/gadu-gadu/32x32/invisible.png
diff --git a/data/iconsets/transports/gadu-gadu/32x32/not_in_roster.png b/gajim/data/iconsets/transports/gadu-gadu/32x32/not_in_roster.png
index fc53528cc..fc53528cc 100644
--- a/data/iconsets/transports/gadu-gadu/32x32/not_in_roster.png
+++ b/gajim/data/iconsets/transports/gadu-gadu/32x32/not_in_roster.png
diff --git a/data/iconsets/transports/gadu-gadu/32x32/offline.png b/gajim/data/iconsets/transports/gadu-gadu/32x32/offline.png
index 579a47bed..579a47bed 100644
--- a/data/iconsets/transports/gadu-gadu/32x32/offline.png
+++ b/gajim/data/iconsets/transports/gadu-gadu/32x32/offline.png
diff --git a/data/iconsets/transports/gadu-gadu/32x32/online.png b/gajim/data/iconsets/transports/gadu-gadu/32x32/online.png
index 8d42f25f9..8d42f25f9 100644
--- a/data/iconsets/transports/gadu-gadu/32x32/online.png
+++ b/gajim/data/iconsets/transports/gadu-gadu/32x32/online.png
diff --git a/data/iconsets/transports/gadu-gadu/32x32/xa.png b/gajim/data/iconsets/transports/gadu-gadu/32x32/xa.png
index 7ac86af1e..7ac86af1e 100644
--- a/data/iconsets/transports/gadu-gadu/32x32/xa.png
+++ b/gajim/data/iconsets/transports/gadu-gadu/32x32/xa.png
diff --git a/data/iconsets/transports/gadu-gadu/48x48/offline.png b/gajim/data/iconsets/transports/gadu-gadu/48x48/offline.png
index 49cfc6cd8..49cfc6cd8 100644
--- a/data/iconsets/transports/gadu-gadu/48x48/offline.png
+++ b/gajim/data/iconsets/transports/gadu-gadu/48x48/offline.png
diff --git a/data/iconsets/transports/gadu-gadu/48x48/online.png b/gajim/data/iconsets/transports/gadu-gadu/48x48/online.png
index de2fa0214..de2fa0214 100644
--- a/data/iconsets/transports/gadu-gadu/48x48/online.png
+++ b/gajim/data/iconsets/transports/gadu-gadu/48x48/online.png
diff --git a/data/iconsets/transports/icq/16x16/away.png b/gajim/data/iconsets/transports/icq/16x16/away.png
index 7c6935236..7c6935236 100644
--- a/data/iconsets/transports/icq/16x16/away.png
+++ b/gajim/data/iconsets/transports/icq/16x16/away.png
diff --git a/data/iconsets/transports/icq/16x16/chat.png b/gajim/data/iconsets/transports/icq/16x16/chat.png
index e07261b27..e07261b27 100644
--- a/data/iconsets/transports/icq/16x16/chat.png
+++ b/gajim/data/iconsets/transports/icq/16x16/chat.png
diff --git a/data/iconsets/transports/icq/16x16/dnd.png b/gajim/data/iconsets/transports/icq/16x16/dnd.png
index 9ba3e6906..9ba3e6906 100644
--- a/data/iconsets/transports/icq/16x16/dnd.png
+++ b/gajim/data/iconsets/transports/icq/16x16/dnd.png
diff --git a/data/iconsets/transports/icq/16x16/not_in_roster.png b/gajim/data/iconsets/transports/icq/16x16/not_in_roster.png
index 5517fafce..5517fafce 100644
--- a/data/iconsets/transports/icq/16x16/not_in_roster.png
+++ b/gajim/data/iconsets/transports/icq/16x16/not_in_roster.png
diff --git a/data/iconsets/transports/icq/16x16/offline.png b/gajim/data/iconsets/transports/icq/16x16/offline.png
index 260dd8592..260dd8592 100644
--- a/data/iconsets/transports/icq/16x16/offline.png
+++ b/gajim/data/iconsets/transports/icq/16x16/offline.png
diff --git a/data/iconsets/transports/icq/16x16/online.png b/gajim/data/iconsets/transports/icq/16x16/online.png
index 427c5afe2..427c5afe2 100644
--- a/data/iconsets/transports/icq/16x16/online.png
+++ b/gajim/data/iconsets/transports/icq/16x16/online.png
diff --git a/data/iconsets/transports/icq/16x16/xa.png b/gajim/data/iconsets/transports/icq/16x16/xa.png
index d2d589b2d..d2d589b2d 100644
--- a/data/iconsets/transports/icq/16x16/xa.png
+++ b/gajim/data/iconsets/transports/icq/16x16/xa.png
diff --git a/data/iconsets/transports/icq/32x32/away.png b/gajim/data/iconsets/transports/icq/32x32/away.png
index e1cd5b78f..e1cd5b78f 100644
--- a/data/iconsets/transports/icq/32x32/away.png
+++ b/gajim/data/iconsets/transports/icq/32x32/away.png
diff --git a/data/iconsets/transports/icq/32x32/chat.png b/gajim/data/iconsets/transports/icq/32x32/chat.png
index d1e5d48ea..d1e5d48ea 100644
--- a/data/iconsets/transports/icq/32x32/chat.png
+++ b/gajim/data/iconsets/transports/icq/32x32/chat.png
diff --git a/data/iconsets/transports/icq/32x32/dnd.png b/gajim/data/iconsets/transports/icq/32x32/dnd.png
index ede09e4b2..ede09e4b2 100644
--- a/data/iconsets/transports/icq/32x32/dnd.png
+++ b/gajim/data/iconsets/transports/icq/32x32/dnd.png
diff --git a/data/iconsets/transports/icq/32x32/not_in_roster.png b/gajim/data/iconsets/transports/icq/32x32/not_in_roster.png
index ce89631e6..ce89631e6 100644
--- a/data/iconsets/transports/icq/32x32/not_in_roster.png
+++ b/gajim/data/iconsets/transports/icq/32x32/not_in_roster.png
diff --git a/data/iconsets/transports/icq/32x32/offline.png b/gajim/data/iconsets/transports/icq/32x32/offline.png
index 25b8d50c8..25b8d50c8 100644
--- a/data/iconsets/transports/icq/32x32/offline.png
+++ b/gajim/data/iconsets/transports/icq/32x32/offline.png
diff --git a/data/iconsets/transports/icq/32x32/online.png b/gajim/data/iconsets/transports/icq/32x32/online.png
index 1023343a2..1023343a2 100644
--- a/data/iconsets/transports/icq/32x32/online.png
+++ b/gajim/data/iconsets/transports/icq/32x32/online.png
diff --git a/data/iconsets/transports/icq/32x32/xa.png b/gajim/data/iconsets/transports/icq/32x32/xa.png
index 0be3ad515..0be3ad515 100644
--- a/data/iconsets/transports/icq/32x32/xa.png
+++ b/gajim/data/iconsets/transports/icq/32x32/xa.png
diff --git a/data/iconsets/transports/icq/48x48/offline.png b/gajim/data/iconsets/transports/icq/48x48/offline.png
index 81c58cccc..81c58cccc 100644
--- a/data/iconsets/transports/icq/48x48/offline.png
+++ b/gajim/data/iconsets/transports/icq/48x48/offline.png
diff --git a/data/iconsets/transports/icq/48x48/online.png b/gajim/data/iconsets/transports/icq/48x48/online.png
index 43d01ae73..43d01ae73 100644
--- a/data/iconsets/transports/icq/48x48/online.png
+++ b/gajim/data/iconsets/transports/icq/48x48/online.png
diff --git a/data/iconsets/transports/irc/16x16/away.png b/gajim/data/iconsets/transports/irc/16x16/away.png
index ed526a197..ed526a197 100644
--- a/data/iconsets/transports/irc/16x16/away.png
+++ b/gajim/data/iconsets/transports/irc/16x16/away.png
diff --git a/data/iconsets/transports/irc/16x16/chat.png b/gajim/data/iconsets/transports/irc/16x16/chat.png
index 24f1cac31..24f1cac31 100644
--- a/data/iconsets/transports/irc/16x16/chat.png
+++ b/gajim/data/iconsets/transports/irc/16x16/chat.png
diff --git a/data/iconsets/transports/irc/16x16/dnd.png b/gajim/data/iconsets/transports/irc/16x16/dnd.png
index 850c47f47..850c47f47 100644
--- a/data/iconsets/transports/irc/16x16/dnd.png
+++ b/gajim/data/iconsets/transports/irc/16x16/dnd.png
diff --git a/data/iconsets/transports/irc/16x16/not_in_roster.png b/gajim/data/iconsets/transports/irc/16x16/not_in_roster.png
index 5748a71c2..5748a71c2 100644
--- a/data/iconsets/transports/irc/16x16/not_in_roster.png
+++ b/gajim/data/iconsets/transports/irc/16x16/not_in_roster.png
diff --git a/data/iconsets/transports/irc/16x16/offline.png b/gajim/data/iconsets/transports/irc/16x16/offline.png
index 52a441fa3..52a441fa3 100644
--- a/data/iconsets/transports/irc/16x16/offline.png
+++ b/gajim/data/iconsets/transports/irc/16x16/offline.png
diff --git a/data/iconsets/transports/irc/16x16/online.png b/gajim/data/iconsets/transports/irc/16x16/online.png
index 00647bba6..00647bba6 100644
--- a/data/iconsets/transports/irc/16x16/online.png
+++ b/gajim/data/iconsets/transports/irc/16x16/online.png
diff --git a/data/iconsets/transports/irc/16x16/xa.png b/gajim/data/iconsets/transports/irc/16x16/xa.png
index 61d0271c0..61d0271c0 100644
--- a/data/iconsets/transports/irc/16x16/xa.png
+++ b/gajim/data/iconsets/transports/irc/16x16/xa.png
diff --git a/data/iconsets/transports/irc/32x32/away.png b/gajim/data/iconsets/transports/irc/32x32/away.png
index c27716fd9..c27716fd9 100644
--- a/data/iconsets/transports/irc/32x32/away.png
+++ b/gajim/data/iconsets/transports/irc/32x32/away.png
diff --git a/data/iconsets/transports/irc/32x32/chat.png b/gajim/data/iconsets/transports/irc/32x32/chat.png
index 33d05687c..33d05687c 100644
--- a/data/iconsets/transports/irc/32x32/chat.png
+++ b/gajim/data/iconsets/transports/irc/32x32/chat.png
diff --git a/data/iconsets/transports/irc/32x32/dnd.png b/gajim/data/iconsets/transports/irc/32x32/dnd.png
index b689fd275..b689fd275 100644
--- a/data/iconsets/transports/irc/32x32/dnd.png
+++ b/gajim/data/iconsets/transports/irc/32x32/dnd.png
diff --git a/data/iconsets/transports/irc/32x32/not_in_roster.png b/gajim/data/iconsets/transports/irc/32x32/not_in_roster.png
index 348d896f6..348d896f6 100644
--- a/data/iconsets/transports/irc/32x32/not_in_roster.png
+++ b/gajim/data/iconsets/transports/irc/32x32/not_in_roster.png
diff --git a/data/iconsets/transports/irc/32x32/offline.png b/gajim/data/iconsets/transports/irc/32x32/offline.png
index 2bdfc7c59..2bdfc7c59 100644
--- a/data/iconsets/transports/irc/32x32/offline.png
+++ b/gajim/data/iconsets/transports/irc/32x32/offline.png
diff --git a/data/iconsets/transports/irc/32x32/online.png b/gajim/data/iconsets/transports/irc/32x32/online.png
index 471742a86..471742a86 100644
--- a/data/iconsets/transports/irc/32x32/online.png
+++ b/gajim/data/iconsets/transports/irc/32x32/online.png
diff --git a/data/iconsets/transports/irc/32x32/xa.png b/gajim/data/iconsets/transports/irc/32x32/xa.png
index 947c78ccf..947c78ccf 100644
--- a/data/iconsets/transports/irc/32x32/xa.png
+++ b/gajim/data/iconsets/transports/irc/32x32/xa.png
diff --git a/data/iconsets/transports/mrim/16x16/away.png b/gajim/data/iconsets/transports/mrim/16x16/away.png
index 5160f03f3..5160f03f3 100644
--- a/data/iconsets/transports/mrim/16x16/away.png
+++ b/gajim/data/iconsets/transports/mrim/16x16/away.png
diff --git a/data/iconsets/transports/mrim/16x16/chat.png b/gajim/data/iconsets/transports/mrim/16x16/chat.png
index 0daf86b8c..0daf86b8c 100644
--- a/data/iconsets/transports/mrim/16x16/chat.png
+++ b/gajim/data/iconsets/transports/mrim/16x16/chat.png
diff --git a/data/iconsets/transports/mrim/16x16/dnd.png b/gajim/data/iconsets/transports/mrim/16x16/dnd.png
index 656e7ab18..656e7ab18 100644
--- a/data/iconsets/transports/mrim/16x16/dnd.png
+++ b/gajim/data/iconsets/transports/mrim/16x16/dnd.png
diff --git a/data/iconsets/transports/mrim/16x16/not_in_roster.png b/gajim/data/iconsets/transports/mrim/16x16/not_in_roster.png
index defe9ba3d..defe9ba3d 100644
--- a/data/iconsets/transports/mrim/16x16/not_in_roster.png
+++ b/gajim/data/iconsets/transports/mrim/16x16/not_in_roster.png
diff --git a/data/iconsets/transports/mrim/16x16/offline.png b/gajim/data/iconsets/transports/mrim/16x16/offline.png
index 5516c86dc..5516c86dc 100644
--- a/data/iconsets/transports/mrim/16x16/offline.png
+++ b/gajim/data/iconsets/transports/mrim/16x16/offline.png
diff --git a/data/iconsets/transports/mrim/16x16/online.png b/gajim/data/iconsets/transports/mrim/16x16/online.png
index 36fc00474..36fc00474 100644
--- a/data/iconsets/transports/mrim/16x16/online.png
+++ b/gajim/data/iconsets/transports/mrim/16x16/online.png
diff --git a/data/iconsets/transports/mrim/16x16/xa.png b/gajim/data/iconsets/transports/mrim/16x16/xa.png
index f0f7720cf..f0f7720cf 100644
--- a/data/iconsets/transports/mrim/16x16/xa.png
+++ b/gajim/data/iconsets/transports/mrim/16x16/xa.png
diff --git a/data/iconsets/transports/mrim/32x32/away.png b/gajim/data/iconsets/transports/mrim/32x32/away.png
index fc7c88cc4..fc7c88cc4 100644
--- a/data/iconsets/transports/mrim/32x32/away.png
+++ b/gajim/data/iconsets/transports/mrim/32x32/away.png
diff --git a/data/iconsets/transports/mrim/32x32/chat.png b/gajim/data/iconsets/transports/mrim/32x32/chat.png
index 8fef576d7..8fef576d7 100644
--- a/data/iconsets/transports/mrim/32x32/chat.png
+++ b/gajim/data/iconsets/transports/mrim/32x32/chat.png
diff --git a/data/iconsets/transports/mrim/32x32/dnd.png b/gajim/data/iconsets/transports/mrim/32x32/dnd.png
index d1061f293..d1061f293 100644
--- a/data/iconsets/transports/mrim/32x32/dnd.png
+++ b/gajim/data/iconsets/transports/mrim/32x32/dnd.png
diff --git a/data/iconsets/transports/mrim/32x32/not_in_roster.png b/gajim/data/iconsets/transports/mrim/32x32/not_in_roster.png
index 8f14082c8..8f14082c8 100644
--- a/data/iconsets/transports/mrim/32x32/not_in_roster.png
+++ b/gajim/data/iconsets/transports/mrim/32x32/not_in_roster.png
diff --git a/data/iconsets/transports/mrim/32x32/offline.png b/gajim/data/iconsets/transports/mrim/32x32/offline.png
index d06e576d8..d06e576d8 100644
--- a/data/iconsets/transports/mrim/32x32/offline.png
+++ b/gajim/data/iconsets/transports/mrim/32x32/offline.png
diff --git a/data/iconsets/transports/mrim/32x32/online.png b/gajim/data/iconsets/transports/mrim/32x32/online.png
index f1d8c4766..f1d8c4766 100644
--- a/data/iconsets/transports/mrim/32x32/online.png
+++ b/gajim/data/iconsets/transports/mrim/32x32/online.png
diff --git a/data/iconsets/transports/mrim/32x32/xa.png b/gajim/data/iconsets/transports/mrim/32x32/xa.png
index 05be9a3ce..05be9a3ce 100644
--- a/data/iconsets/transports/mrim/32x32/xa.png
+++ b/gajim/data/iconsets/transports/mrim/32x32/xa.png
diff --git a/data/iconsets/transports/mrim/48x48/offline.png b/gajim/data/iconsets/transports/mrim/48x48/offline.png
index 9c91ddd66..9c91ddd66 100644
--- a/data/iconsets/transports/mrim/48x48/offline.png
+++ b/gajim/data/iconsets/transports/mrim/48x48/offline.png
diff --git a/data/iconsets/transports/mrim/48x48/online.png b/gajim/data/iconsets/transports/mrim/48x48/online.png
index 3eab34880..3eab34880 100644
--- a/data/iconsets/transports/mrim/48x48/online.png
+++ b/gajim/data/iconsets/transports/mrim/48x48/online.png
diff --git a/data/iconsets/transports/msn/16x16/away.png b/gajim/data/iconsets/transports/msn/16x16/away.png
index 1f278893b..1f278893b 100644
--- a/data/iconsets/transports/msn/16x16/away.png
+++ b/gajim/data/iconsets/transports/msn/16x16/away.png
diff --git a/data/iconsets/transports/msn/16x16/chat.png b/gajim/data/iconsets/transports/msn/16x16/chat.png
index 86b225441..86b225441 100644
--- a/data/iconsets/transports/msn/16x16/chat.png
+++ b/gajim/data/iconsets/transports/msn/16x16/chat.png
diff --git a/data/iconsets/transports/msn/16x16/dnd.png b/gajim/data/iconsets/transports/msn/16x16/dnd.png
index c60153a12..c60153a12 100644
--- a/data/iconsets/transports/msn/16x16/dnd.png
+++ b/gajim/data/iconsets/transports/msn/16x16/dnd.png
diff --git a/data/iconsets/transports/msn/16x16/not_in_roster.png b/gajim/data/iconsets/transports/msn/16x16/not_in_roster.png
index 8707367da..8707367da 100644
--- a/data/iconsets/transports/msn/16x16/not_in_roster.png
+++ b/gajim/data/iconsets/transports/msn/16x16/not_in_roster.png
diff --git a/data/iconsets/transports/msn/16x16/offline.png b/gajim/data/iconsets/transports/msn/16x16/offline.png
index f9d0c6848..f9d0c6848 100644
--- a/data/iconsets/transports/msn/16x16/offline.png
+++ b/gajim/data/iconsets/transports/msn/16x16/offline.png
diff --git a/data/iconsets/transports/msn/16x16/online.png b/gajim/data/iconsets/transports/msn/16x16/online.png
index 52bc0953e..52bc0953e 100644
--- a/data/iconsets/transports/msn/16x16/online.png
+++ b/gajim/data/iconsets/transports/msn/16x16/online.png
diff --git a/data/iconsets/transports/msn/16x16/xa.png b/gajim/data/iconsets/transports/msn/16x16/xa.png
index 3814e1103..3814e1103 100644
--- a/data/iconsets/transports/msn/16x16/xa.png
+++ b/gajim/data/iconsets/transports/msn/16x16/xa.png
diff --git a/data/iconsets/transports/msn/32x32/away.png b/gajim/data/iconsets/transports/msn/32x32/away.png
index 3a2ab5ae6..3a2ab5ae6 100644
--- a/data/iconsets/transports/msn/32x32/away.png
+++ b/gajim/data/iconsets/transports/msn/32x32/away.png
diff --git a/data/iconsets/transports/msn/32x32/chat.png b/gajim/data/iconsets/transports/msn/32x32/chat.png
index 9a2056b9a..9a2056b9a 100644
--- a/data/iconsets/transports/msn/32x32/chat.png
+++ b/gajim/data/iconsets/transports/msn/32x32/chat.png
diff --git a/data/iconsets/transports/msn/32x32/dnd.png b/gajim/data/iconsets/transports/msn/32x32/dnd.png
index f967ce6f9..f967ce6f9 100644
--- a/data/iconsets/transports/msn/32x32/dnd.png
+++ b/gajim/data/iconsets/transports/msn/32x32/dnd.png
diff --git a/data/iconsets/transports/msn/32x32/not_in_roster.png b/gajim/data/iconsets/transports/msn/32x32/not_in_roster.png
index 9b076db99..9b076db99 100644
--- a/data/iconsets/transports/msn/32x32/not_in_roster.png
+++ b/gajim/data/iconsets/transports/msn/32x32/not_in_roster.png
diff --git a/data/iconsets/transports/msn/32x32/offline.png b/gajim/data/iconsets/transports/msn/32x32/offline.png
index 83ac0529b..83ac0529b 100644
--- a/data/iconsets/transports/msn/32x32/offline.png
+++ b/gajim/data/iconsets/transports/msn/32x32/offline.png
diff --git a/data/iconsets/transports/msn/32x32/online.png b/gajim/data/iconsets/transports/msn/32x32/online.png
index 3306144b9..3306144b9 100644
--- a/data/iconsets/transports/msn/32x32/online.png
+++ b/gajim/data/iconsets/transports/msn/32x32/online.png
diff --git a/data/iconsets/transports/msn/32x32/xa.png b/gajim/data/iconsets/transports/msn/32x32/xa.png
index fe3b9528b..fe3b9528b 100644
--- a/data/iconsets/transports/msn/32x32/xa.png
+++ b/gajim/data/iconsets/transports/msn/32x32/xa.png
diff --git a/data/iconsets/transports/msn/48x48/offline.png b/gajim/data/iconsets/transports/msn/48x48/offline.png
index 018fa6e33..018fa6e33 100644
--- a/data/iconsets/transports/msn/48x48/offline.png
+++ b/gajim/data/iconsets/transports/msn/48x48/offline.png
diff --git a/data/iconsets/transports/msn/48x48/online.png b/gajim/data/iconsets/transports/msn/48x48/online.png
index 3a5a199d3..3a5a199d3 100644
--- a/data/iconsets/transports/msn/48x48/online.png
+++ b/gajim/data/iconsets/transports/msn/48x48/online.png
diff --git a/data/iconsets/transports/sms/16x16/away.png b/gajim/data/iconsets/transports/sms/16x16/away.png
index ccb1c4426..ccb1c4426 100644
--- a/data/iconsets/transports/sms/16x16/away.png
+++ b/gajim/data/iconsets/transports/sms/16x16/away.png
diff --git a/data/iconsets/transports/sms/16x16/chat.png b/gajim/data/iconsets/transports/sms/16x16/chat.png
index ccb1c4426..ccb1c4426 100644
--- a/data/iconsets/transports/sms/16x16/chat.png
+++ b/gajim/data/iconsets/transports/sms/16x16/chat.png
diff --git a/data/iconsets/transports/sms/16x16/dnd.png b/gajim/data/iconsets/transports/sms/16x16/dnd.png
index e398aad30..e398aad30 100644
--- a/data/iconsets/transports/sms/16x16/dnd.png
+++ b/gajim/data/iconsets/transports/sms/16x16/dnd.png
diff --git a/data/iconsets/transports/sms/16x16/offline.png b/gajim/data/iconsets/transports/sms/16x16/offline.png
index eadd36dea..eadd36dea 100644
--- a/data/iconsets/transports/sms/16x16/offline.png
+++ b/gajim/data/iconsets/transports/sms/16x16/offline.png
diff --git a/data/iconsets/transports/sms/16x16/online.png b/gajim/data/iconsets/transports/sms/16x16/online.png
index ccb1c4426..ccb1c4426 100644
--- a/data/iconsets/transports/sms/16x16/online.png
+++ b/gajim/data/iconsets/transports/sms/16x16/online.png
diff --git a/data/iconsets/transports/sms/16x16/xa.png b/gajim/data/iconsets/transports/sms/16x16/xa.png
index ccb1c4426..ccb1c4426 100644
--- a/data/iconsets/transports/sms/16x16/xa.png
+++ b/gajim/data/iconsets/transports/sms/16x16/xa.png
diff --git a/data/iconsets/transports/sms/32x32/away.png b/gajim/data/iconsets/transports/sms/32x32/away.png
index 3baf205c4..3baf205c4 100644
--- a/data/iconsets/transports/sms/32x32/away.png
+++ b/gajim/data/iconsets/transports/sms/32x32/away.png
diff --git a/data/iconsets/transports/sms/32x32/chat.png b/gajim/data/iconsets/transports/sms/32x32/chat.png
index 3baf205c4..3baf205c4 100644
--- a/data/iconsets/transports/sms/32x32/chat.png
+++ b/gajim/data/iconsets/transports/sms/32x32/chat.png
diff --git a/data/iconsets/transports/sms/32x32/dnd.png b/gajim/data/iconsets/transports/sms/32x32/dnd.png
index a147ec652..a147ec652 100644
--- a/data/iconsets/transports/sms/32x32/dnd.png
+++ b/gajim/data/iconsets/transports/sms/32x32/dnd.png
diff --git a/data/iconsets/transports/sms/32x32/offline.png b/gajim/data/iconsets/transports/sms/32x32/offline.png
index 6a66ba384..6a66ba384 100644
--- a/data/iconsets/transports/sms/32x32/offline.png
+++ b/gajim/data/iconsets/transports/sms/32x32/offline.png
diff --git a/data/iconsets/transports/sms/32x32/online.png b/gajim/data/iconsets/transports/sms/32x32/online.png
index 3baf205c4..3baf205c4 100644
--- a/data/iconsets/transports/sms/32x32/online.png
+++ b/gajim/data/iconsets/transports/sms/32x32/online.png
diff --git a/data/iconsets/transports/sms/32x32/xa.png b/gajim/data/iconsets/transports/sms/32x32/xa.png
index 3baf205c4..3baf205c4 100644
--- a/data/iconsets/transports/sms/32x32/xa.png
+++ b/gajim/data/iconsets/transports/sms/32x32/xa.png
diff --git a/data/iconsets/transports/tlen/16x16/away.png b/gajim/data/iconsets/transports/tlen/16x16/away.png
index 7baa11d20..7baa11d20 100644
--- a/data/iconsets/transports/tlen/16x16/away.png
+++ b/gajim/data/iconsets/transports/tlen/16x16/away.png
diff --git a/data/iconsets/transports/tlen/16x16/chat.png b/gajim/data/iconsets/transports/tlen/16x16/chat.png
index 76bfc48d4..76bfc48d4 100644
--- a/data/iconsets/transports/tlen/16x16/chat.png
+++ b/gajim/data/iconsets/transports/tlen/16x16/chat.png
diff --git a/data/iconsets/transports/tlen/16x16/dnd.png b/gajim/data/iconsets/transports/tlen/16x16/dnd.png
index 4a466184b..4a466184b 100644
--- a/data/iconsets/transports/tlen/16x16/dnd.png
+++ b/gajim/data/iconsets/transports/tlen/16x16/dnd.png
diff --git a/data/iconsets/transports/tlen/16x16/not_in_roster.png b/gajim/data/iconsets/transports/tlen/16x16/not_in_roster.png
index bda1f6fd1..bda1f6fd1 100644
--- a/data/iconsets/transports/tlen/16x16/not_in_roster.png
+++ b/gajim/data/iconsets/transports/tlen/16x16/not_in_roster.png
diff --git a/data/iconsets/transports/tlen/16x16/offline.png b/gajim/data/iconsets/transports/tlen/16x16/offline.png
index cd62e302a..cd62e302a 100644
--- a/data/iconsets/transports/tlen/16x16/offline.png
+++ b/gajim/data/iconsets/transports/tlen/16x16/offline.png
diff --git a/data/iconsets/transports/tlen/16x16/online.png b/gajim/data/iconsets/transports/tlen/16x16/online.png
index 0c3210669..0c3210669 100644
--- a/data/iconsets/transports/tlen/16x16/online.png
+++ b/gajim/data/iconsets/transports/tlen/16x16/online.png
diff --git a/data/iconsets/transports/tlen/16x16/xa.png b/gajim/data/iconsets/transports/tlen/16x16/xa.png
index 8b2e335d2..8b2e335d2 100644
--- a/data/iconsets/transports/tlen/16x16/xa.png
+++ b/gajim/data/iconsets/transports/tlen/16x16/xa.png
diff --git a/data/iconsets/transports/tlen/32x32/away.png b/gajim/data/iconsets/transports/tlen/32x32/away.png
index a6a65ba14..a6a65ba14 100644
--- a/data/iconsets/transports/tlen/32x32/away.png
+++ b/gajim/data/iconsets/transports/tlen/32x32/away.png
diff --git a/data/iconsets/transports/tlen/32x32/chat.png b/gajim/data/iconsets/transports/tlen/32x32/chat.png
index 84e696f5e..84e696f5e 100644
--- a/data/iconsets/transports/tlen/32x32/chat.png
+++ b/gajim/data/iconsets/transports/tlen/32x32/chat.png
diff --git a/data/iconsets/transports/tlen/32x32/dnd.png b/gajim/data/iconsets/transports/tlen/32x32/dnd.png
index 292162e9e..292162e9e 100644
--- a/data/iconsets/transports/tlen/32x32/dnd.png
+++ b/gajim/data/iconsets/transports/tlen/32x32/dnd.png
diff --git a/data/iconsets/transports/tlen/32x32/not_in_roster.png b/gajim/data/iconsets/transports/tlen/32x32/not_in_roster.png
index fb0330fdb..fb0330fdb 100644
--- a/data/iconsets/transports/tlen/32x32/not_in_roster.png
+++ b/gajim/data/iconsets/transports/tlen/32x32/not_in_roster.png
diff --git a/data/iconsets/transports/tlen/32x32/offline.png b/gajim/data/iconsets/transports/tlen/32x32/offline.png
index 225e5082e..225e5082e 100644
--- a/data/iconsets/transports/tlen/32x32/offline.png
+++ b/gajim/data/iconsets/transports/tlen/32x32/offline.png
diff --git a/data/iconsets/transports/tlen/32x32/online.png b/gajim/data/iconsets/transports/tlen/32x32/online.png
index 2ac24cc60..2ac24cc60 100644
--- a/data/iconsets/transports/tlen/32x32/online.png
+++ b/gajim/data/iconsets/transports/tlen/32x32/online.png
diff --git a/data/iconsets/transports/tlen/32x32/xa.png b/gajim/data/iconsets/transports/tlen/32x32/xa.png
index 413abfadc..413abfadc 100644
--- a/data/iconsets/transports/tlen/32x32/xa.png
+++ b/gajim/data/iconsets/transports/tlen/32x32/xa.png
diff --git a/data/iconsets/transports/tlen/48x48/offline.png b/gajim/data/iconsets/transports/tlen/48x48/offline.png
index 763a68246..763a68246 100644
--- a/data/iconsets/transports/tlen/48x48/offline.png
+++ b/gajim/data/iconsets/transports/tlen/48x48/offline.png
diff --git a/data/iconsets/transports/tlen/48x48/online.png b/gajim/data/iconsets/transports/tlen/48x48/online.png
index ed22fb503..ed22fb503 100644
--- a/data/iconsets/transports/tlen/48x48/online.png
+++ b/gajim/data/iconsets/transports/tlen/48x48/online.png
diff --git a/data/iconsets/transports/weather/16x16/away.png b/gajim/data/iconsets/transports/weather/16x16/away.png
index 0c7d671e9..0c7d671e9 100644
--- a/data/iconsets/transports/weather/16x16/away.png
+++ b/gajim/data/iconsets/transports/weather/16x16/away.png
diff --git a/data/iconsets/transports/weather/16x16/chat.png b/gajim/data/iconsets/transports/weather/16x16/chat.png
index 3bd001c4d..3bd001c4d 100644
--- a/data/iconsets/transports/weather/16x16/chat.png
+++ b/gajim/data/iconsets/transports/weather/16x16/chat.png
diff --git a/data/iconsets/transports/weather/16x16/dnd.png b/gajim/data/iconsets/transports/weather/16x16/dnd.png
index f4d3256b2..f4d3256b2 100644
--- a/data/iconsets/transports/weather/16x16/dnd.png
+++ b/gajim/data/iconsets/transports/weather/16x16/dnd.png
diff --git a/data/iconsets/transports/weather/16x16/offline.png b/gajim/data/iconsets/transports/weather/16x16/offline.png
index a7d04ebcc..a7d04ebcc 100644
--- a/data/iconsets/transports/weather/16x16/offline.png
+++ b/gajim/data/iconsets/transports/weather/16x16/offline.png
diff --git a/data/iconsets/transports/weather/16x16/online.png b/gajim/data/iconsets/transports/weather/16x16/online.png
index 192aa1c88..192aa1c88 100644
--- a/data/iconsets/transports/weather/16x16/online.png
+++ b/gajim/data/iconsets/transports/weather/16x16/online.png
diff --git a/data/iconsets/transports/weather/16x16/xa.png b/gajim/data/iconsets/transports/weather/16x16/xa.png
index 09b06fbd3..09b06fbd3 100644
--- a/data/iconsets/transports/weather/16x16/xa.png
+++ b/gajim/data/iconsets/transports/weather/16x16/xa.png
diff --git a/data/iconsets/transports/weather/32x32/away.png b/gajim/data/iconsets/transports/weather/32x32/away.png
index 40f6466ad..40f6466ad 100644
--- a/data/iconsets/transports/weather/32x32/away.png
+++ b/gajim/data/iconsets/transports/weather/32x32/away.png
diff --git a/data/iconsets/transports/weather/32x32/chat.png b/gajim/data/iconsets/transports/weather/32x32/chat.png
index 683684fc0..683684fc0 100644
--- a/data/iconsets/transports/weather/32x32/chat.png
+++ b/gajim/data/iconsets/transports/weather/32x32/chat.png
diff --git a/data/iconsets/transports/weather/32x32/dnd.png b/gajim/data/iconsets/transports/weather/32x32/dnd.png
index 444dd189b..444dd189b 100644
--- a/data/iconsets/transports/weather/32x32/dnd.png
+++ b/gajim/data/iconsets/transports/weather/32x32/dnd.png
diff --git a/data/iconsets/transports/weather/32x32/offline.png b/gajim/data/iconsets/transports/weather/32x32/offline.png
index 1c0a72e81..1c0a72e81 100644
--- a/data/iconsets/transports/weather/32x32/offline.png
+++ b/gajim/data/iconsets/transports/weather/32x32/offline.png
diff --git a/data/iconsets/transports/weather/32x32/online.png b/gajim/data/iconsets/transports/weather/32x32/online.png
index 40f6466ad..40f6466ad 100644
--- a/data/iconsets/transports/weather/32x32/online.png
+++ b/gajim/data/iconsets/transports/weather/32x32/online.png
diff --git a/data/iconsets/transports/weather/32x32/xa.png b/gajim/data/iconsets/transports/weather/32x32/xa.png
index a870125b2..a870125b2 100644
--- a/data/iconsets/transports/weather/32x32/xa.png
+++ b/gajim/data/iconsets/transports/weather/32x32/xa.png
diff --git a/data/iconsets/transports/yahoo/16x16/away.png b/gajim/data/iconsets/transports/yahoo/16x16/away.png
index f7647ac35..f7647ac35 100644
--- a/data/iconsets/transports/yahoo/16x16/away.png
+++ b/gajim/data/iconsets/transports/yahoo/16x16/away.png
diff --git a/data/iconsets/transports/yahoo/16x16/chat.png b/gajim/data/iconsets/transports/yahoo/16x16/chat.png
index 2f0747269..2f0747269 100644
--- a/data/iconsets/transports/yahoo/16x16/chat.png
+++ b/gajim/data/iconsets/transports/yahoo/16x16/chat.png
diff --git a/data/iconsets/transports/yahoo/16x16/dnd.png b/gajim/data/iconsets/transports/yahoo/16x16/dnd.png
index cda1d8e14..cda1d8e14 100644
--- a/data/iconsets/transports/yahoo/16x16/dnd.png
+++ b/gajim/data/iconsets/transports/yahoo/16x16/dnd.png
diff --git a/data/iconsets/transports/yahoo/16x16/not_in_roster.png b/gajim/data/iconsets/transports/yahoo/16x16/not_in_roster.png
index e5d0fed8b..e5d0fed8b 100644
--- a/data/iconsets/transports/yahoo/16x16/not_in_roster.png
+++ b/gajim/data/iconsets/transports/yahoo/16x16/not_in_roster.png
diff --git a/data/iconsets/transports/yahoo/16x16/offline.png b/gajim/data/iconsets/transports/yahoo/16x16/offline.png
index f0b768eb9..f0b768eb9 100644
--- a/data/iconsets/transports/yahoo/16x16/offline.png
+++ b/gajim/data/iconsets/transports/yahoo/16x16/offline.png
diff --git a/data/iconsets/transports/yahoo/16x16/online.png b/gajim/data/iconsets/transports/yahoo/16x16/online.png
index fb4579b83..fb4579b83 100644
--- a/data/iconsets/transports/yahoo/16x16/online.png
+++ b/gajim/data/iconsets/transports/yahoo/16x16/online.png
diff --git a/data/iconsets/transports/yahoo/16x16/xa.png b/gajim/data/iconsets/transports/yahoo/16x16/xa.png
index 524a5023c..524a5023c 100644
--- a/data/iconsets/transports/yahoo/16x16/xa.png
+++ b/gajim/data/iconsets/transports/yahoo/16x16/xa.png
diff --git a/data/iconsets/transports/yahoo/32x32/away.png b/gajim/data/iconsets/transports/yahoo/32x32/away.png
index 41eeaf325..41eeaf325 100644
--- a/data/iconsets/transports/yahoo/32x32/away.png
+++ b/gajim/data/iconsets/transports/yahoo/32x32/away.png
diff --git a/data/iconsets/transports/yahoo/32x32/chat.png b/gajim/data/iconsets/transports/yahoo/32x32/chat.png
index 69f4918cb..69f4918cb 100644
--- a/data/iconsets/transports/yahoo/32x32/chat.png
+++ b/gajim/data/iconsets/transports/yahoo/32x32/chat.png
diff --git a/data/iconsets/transports/yahoo/32x32/dnd.png b/gajim/data/iconsets/transports/yahoo/32x32/dnd.png
index 8a5c3a30e..8a5c3a30e 100644
--- a/data/iconsets/transports/yahoo/32x32/dnd.png
+++ b/gajim/data/iconsets/transports/yahoo/32x32/dnd.png
diff --git a/data/iconsets/transports/yahoo/32x32/not_in_roster.png b/gajim/data/iconsets/transports/yahoo/32x32/not_in_roster.png
index aa01b2871..aa01b2871 100644
--- a/data/iconsets/transports/yahoo/32x32/not_in_roster.png
+++ b/gajim/data/iconsets/transports/yahoo/32x32/not_in_roster.png
diff --git a/data/iconsets/transports/yahoo/32x32/offline.png b/gajim/data/iconsets/transports/yahoo/32x32/offline.png
index 691798d9f..691798d9f 100644
--- a/data/iconsets/transports/yahoo/32x32/offline.png
+++ b/gajim/data/iconsets/transports/yahoo/32x32/offline.png
diff --git a/data/iconsets/transports/yahoo/32x32/online.png b/gajim/data/iconsets/transports/yahoo/32x32/online.png
index 63ef8ae60..63ef8ae60 100644
--- a/data/iconsets/transports/yahoo/32x32/online.png
+++ b/gajim/data/iconsets/transports/yahoo/32x32/online.png
diff --git a/data/iconsets/transports/yahoo/32x32/xa.png b/gajim/data/iconsets/transports/yahoo/32x32/xa.png
index 6c5848f1b..6c5848f1b 100644
--- a/data/iconsets/transports/yahoo/32x32/xa.png
+++ b/gajim/data/iconsets/transports/yahoo/32x32/xa.png
diff --git a/data/iconsets/transports/yahoo/48x48/offline.png b/gajim/data/iconsets/transports/yahoo/48x48/offline.png
index 9da04cc8e..9da04cc8e 100644
--- a/data/iconsets/transports/yahoo/48x48/offline.png
+++ b/gajim/data/iconsets/transports/yahoo/48x48/offline.png
diff --git a/data/iconsets/transports/yahoo/48x48/online.png b/gajim/data/iconsets/transports/yahoo/48x48/online.png
index 8a9816fb3..8a9816fb3 100644
--- a/data/iconsets/transports/yahoo/48x48/online.png
+++ b/gajim/data/iconsets/transports/yahoo/48x48/online.png
diff --git a/data/iconsets/wroop/16x16/away.png b/gajim/data/iconsets/wroop/16x16/away.png
index ab3643812..ab3643812 100644
--- a/data/iconsets/wroop/16x16/away.png
+++ b/gajim/data/iconsets/wroop/16x16/away.png
diff --git a/data/iconsets/wroop/16x16/chat.png b/gajim/data/iconsets/wroop/16x16/chat.png
index a9a0962b0..a9a0962b0 100644
--- a/data/iconsets/wroop/16x16/chat.png
+++ b/gajim/data/iconsets/wroop/16x16/chat.png
diff --git a/data/iconsets/wroop/16x16/closed.png b/gajim/data/iconsets/wroop/16x16/closed.png
index 2cded1ea8..2cded1ea8 100644
--- a/data/iconsets/wroop/16x16/closed.png
+++ b/gajim/data/iconsets/wroop/16x16/closed.png
diff --git a/data/iconsets/wroop/16x16/connecting.gif b/gajim/data/iconsets/wroop/16x16/connecting.gif
index 3d113c71f..3d113c71f 100644
--- a/data/iconsets/wroop/16x16/connecting.gif
+++ b/gajim/data/iconsets/wroop/16x16/connecting.gif
diff --git a/data/iconsets/wroop/16x16/dnd.png b/gajim/data/iconsets/wroop/16x16/dnd.png
index 93f03b92f..93f03b92f 100644
--- a/data/iconsets/wroop/16x16/dnd.png
+++ b/gajim/data/iconsets/wroop/16x16/dnd.png
diff --git a/data/iconsets/wroop/16x16/error.png b/gajim/data/iconsets/wroop/16x16/error.png
index a28a58d89..a28a58d89 100644
--- a/data/iconsets/wroop/16x16/error.png
+++ b/gajim/data/iconsets/wroop/16x16/error.png
diff --git a/data/iconsets/wroop/16x16/event.gif b/gajim/data/iconsets/wroop/16x16/event.gif
index 5f77fc25c..5f77fc25c 100644
--- a/data/iconsets/wroop/16x16/event.gif
+++ b/gajim/data/iconsets/wroop/16x16/event.gif
diff --git a/data/iconsets/wroop/16x16/invisible.png b/gajim/data/iconsets/wroop/16x16/invisible.png
index 433ed39f3..433ed39f3 100644
--- a/data/iconsets/wroop/16x16/invisible.png
+++ b/gajim/data/iconsets/wroop/16x16/invisible.png
diff --git a/data/iconsets/wroop/16x16/muc_active.png b/gajim/data/iconsets/wroop/16x16/muc_active.png
index 5d3f505fc..5d3f505fc 100644
--- a/data/iconsets/wroop/16x16/muc_active.png
+++ b/gajim/data/iconsets/wroop/16x16/muc_active.png
diff --git a/data/iconsets/wroop/16x16/muc_inactive.png b/gajim/data/iconsets/wroop/16x16/muc_inactive.png
index 552069b19..552069b19 100644
--- a/data/iconsets/wroop/16x16/muc_inactive.png
+++ b/gajim/data/iconsets/wroop/16x16/muc_inactive.png
diff --git a/data/iconsets/wroop/16x16/not_in_roster.png b/gajim/data/iconsets/wroop/16x16/not_in_roster.png
index c346512a1..c346512a1 100644
--- a/data/iconsets/wroop/16x16/not_in_roster.png
+++ b/gajim/data/iconsets/wroop/16x16/not_in_roster.png
diff --git a/data/iconsets/wroop/16x16/offline.png b/gajim/data/iconsets/wroop/16x16/offline.png
index 58acbec80..58acbec80 100644
--- a/data/iconsets/wroop/16x16/offline.png
+++ b/gajim/data/iconsets/wroop/16x16/offline.png
diff --git a/data/iconsets/wroop/16x16/online.png b/gajim/data/iconsets/wroop/16x16/online.png
index d868f9a2e..d868f9a2e 100644
--- a/data/iconsets/wroop/16x16/online.png
+++ b/gajim/data/iconsets/wroop/16x16/online.png
diff --git a/data/iconsets/wroop/16x16/opened.png b/gajim/data/iconsets/wroop/16x16/opened.png
index 6fb917004..6fb917004 100644
--- a/data/iconsets/wroop/16x16/opened.png
+++ b/gajim/data/iconsets/wroop/16x16/opened.png
diff --git a/data/iconsets/wroop/16x16/requested.png b/gajim/data/iconsets/wroop/16x16/requested.png
index ab3643812..ab3643812 100644
--- a/data/iconsets/wroop/16x16/requested.png
+++ b/gajim/data/iconsets/wroop/16x16/requested.png
diff --git a/data/iconsets/wroop/16x16/xa.png b/gajim/data/iconsets/wroop/16x16/xa.png
index ab3643812..ab3643812 100644
--- a/data/iconsets/wroop/16x16/xa.png
+++ b/gajim/data/iconsets/wroop/16x16/xa.png
diff --git a/data/iconsets/wroop/32x32/away.png b/gajim/data/iconsets/wroop/32x32/away.png
index 2e37e9cd5..2e37e9cd5 100644
--- a/data/iconsets/wroop/32x32/away.png
+++ b/gajim/data/iconsets/wroop/32x32/away.png
diff --git a/data/iconsets/wroop/32x32/chat.png b/gajim/data/iconsets/wroop/32x32/chat.png
index 11eba7c63..11eba7c63 100644
--- a/data/iconsets/wroop/32x32/chat.png
+++ b/gajim/data/iconsets/wroop/32x32/chat.png
diff --git a/data/iconsets/wroop/32x32/dnd.png b/gajim/data/iconsets/wroop/32x32/dnd.png
index 3c28fc49a..3c28fc49a 100644
--- a/data/iconsets/wroop/32x32/dnd.png
+++ b/gajim/data/iconsets/wroop/32x32/dnd.png
diff --git a/data/iconsets/wroop/32x32/error.png b/gajim/data/iconsets/wroop/32x32/error.png
index 4b6c6661e..4b6c6661e 100644
--- a/data/iconsets/wroop/32x32/error.png
+++ b/gajim/data/iconsets/wroop/32x32/error.png
diff --git a/data/iconsets/wroop/32x32/invisible.png b/gajim/data/iconsets/wroop/32x32/invisible.png
index a5aea01e4..a5aea01e4 100644
--- a/data/iconsets/wroop/32x32/invisible.png
+++ b/gajim/data/iconsets/wroop/32x32/invisible.png
diff --git a/data/iconsets/wroop/32x32/muc_active.png b/gajim/data/iconsets/wroop/32x32/muc_active.png
index e0544aa56..e0544aa56 100644
--- a/data/iconsets/wroop/32x32/muc_active.png
+++ b/gajim/data/iconsets/wroop/32x32/muc_active.png
diff --git a/data/iconsets/wroop/32x32/muc_inactive.png b/gajim/data/iconsets/wroop/32x32/muc_inactive.png
index 80e31bf31..80e31bf31 100644
--- a/data/iconsets/wroop/32x32/muc_inactive.png
+++ b/gajim/data/iconsets/wroop/32x32/muc_inactive.png
diff --git a/data/iconsets/wroop/32x32/not_in_roster.png b/gajim/data/iconsets/wroop/32x32/not_in_roster.png
index d3214410c..d3214410c 100644
--- a/data/iconsets/wroop/32x32/not_in_roster.png
+++ b/gajim/data/iconsets/wroop/32x32/not_in_roster.png
diff --git a/data/iconsets/wroop/32x32/offline.png b/gajim/data/iconsets/wroop/32x32/offline.png
index 6eb60c95a..6eb60c95a 100644
--- a/data/iconsets/wroop/32x32/offline.png
+++ b/gajim/data/iconsets/wroop/32x32/offline.png
diff --git a/data/iconsets/wroop/32x32/online.png b/gajim/data/iconsets/wroop/32x32/online.png
index 013102b23..013102b23 100644
--- a/data/iconsets/wroop/32x32/online.png
+++ b/gajim/data/iconsets/wroop/32x32/online.png
diff --git a/data/iconsets/wroop/32x32/requested.png b/gajim/data/iconsets/wroop/32x32/requested.png
index 2e37e9cd5..2e37e9cd5 100644
--- a/data/iconsets/wroop/32x32/requested.png
+++ b/gajim/data/iconsets/wroop/32x32/requested.png
diff --git a/data/iconsets/wroop/32x32/xa.png b/gajim/data/iconsets/wroop/32x32/xa.png
index 2e37e9cd5..2e37e9cd5 100644
--- a/data/iconsets/wroop/32x32/xa.png
+++ b/gajim/data/iconsets/wroop/32x32/xa.png
diff --git a/data/iconsets/wroop/48x48/away.png b/gajim/data/iconsets/wroop/48x48/away.png
index 2b2846c25..2b2846c25 100644
--- a/data/iconsets/wroop/48x48/away.png
+++ b/gajim/data/iconsets/wroop/48x48/away.png
diff --git a/data/iconsets/wroop/48x48/chat.png b/gajim/data/iconsets/wroop/48x48/chat.png
index 8e1b4213c..8e1b4213c 100644
--- a/data/iconsets/wroop/48x48/chat.png
+++ b/gajim/data/iconsets/wroop/48x48/chat.png
diff --git a/data/iconsets/wroop/48x48/dnd.png b/gajim/data/iconsets/wroop/48x48/dnd.png
index 81954c0e5..81954c0e5 100644
--- a/data/iconsets/wroop/48x48/dnd.png
+++ b/gajim/data/iconsets/wroop/48x48/dnd.png
diff --git a/data/iconsets/wroop/48x48/error.png b/gajim/data/iconsets/wroop/48x48/error.png
index 72a706aaf..72a706aaf 100644
--- a/data/iconsets/wroop/48x48/error.png
+++ b/gajim/data/iconsets/wroop/48x48/error.png
diff --git a/data/iconsets/wroop/48x48/invisible.png b/gajim/data/iconsets/wroop/48x48/invisible.png
index d6993e576..d6993e576 100644
--- a/data/iconsets/wroop/48x48/invisible.png
+++ b/gajim/data/iconsets/wroop/48x48/invisible.png
diff --git a/data/iconsets/wroop/48x48/muc_active.png b/gajim/data/iconsets/wroop/48x48/muc_active.png
index a6aa8c3ba..a6aa8c3ba 100644
--- a/data/iconsets/wroop/48x48/muc_active.png
+++ b/gajim/data/iconsets/wroop/48x48/muc_active.png
diff --git a/data/iconsets/wroop/48x48/muc_inactive.png b/gajim/data/iconsets/wroop/48x48/muc_inactive.png
index 1ef4c9947..1ef4c9947 100644
--- a/data/iconsets/wroop/48x48/muc_inactive.png
+++ b/gajim/data/iconsets/wroop/48x48/muc_inactive.png
diff --git a/data/iconsets/wroop/48x48/not_in_roster.png b/gajim/data/iconsets/wroop/48x48/not_in_roster.png
index d219b272f..d219b272f 100644
--- a/data/iconsets/wroop/48x48/not_in_roster.png
+++ b/gajim/data/iconsets/wroop/48x48/not_in_roster.png
diff --git a/data/iconsets/wroop/48x48/offline.png b/gajim/data/iconsets/wroop/48x48/offline.png
index ca40bb48c..ca40bb48c 100644
--- a/data/iconsets/wroop/48x48/offline.png
+++ b/gajim/data/iconsets/wroop/48x48/offline.png
diff --git a/data/iconsets/wroop/48x48/online.png b/gajim/data/iconsets/wroop/48x48/online.png
index 35a6b9e04..35a6b9e04 100644
--- a/data/iconsets/wroop/48x48/online.png
+++ b/gajim/data/iconsets/wroop/48x48/online.png
diff --git a/data/iconsets/wroop/48x48/requested.png b/gajim/data/iconsets/wroop/48x48/requested.png
index 2b2846c25..2b2846c25 100644
--- a/data/iconsets/wroop/48x48/requested.png
+++ b/gajim/data/iconsets/wroop/48x48/requested.png
diff --git a/data/iconsets/wroop/48x48/xa.png b/gajim/data/iconsets/wroop/48x48/xa.png
index 2b2846c25..2b2846c25 100644
--- a/data/iconsets/wroop/48x48/xa.png
+++ b/gajim/data/iconsets/wroop/48x48/xa.png
diff --git a/data/moods/Makefile.am b/gajim/data/moods/Makefile.am
index 174466374..2e579b47d 100644
--- a/data/moods/Makefile.am
+++ b/gajim/data/moods/Makefile.am
@@ -1,4 +1,4 @@
-moodsdir = $(pkgdatadir)/data/moods
+moodsdir = $(gajim_srcdir)/data/moods
 nobase_dist_moods_DATA = $(srcdir)/*/*
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/data/moods/default/afraid.png b/gajim/data/moods/default/afraid.png
index 9b2e2aa25..9b2e2aa25 100644
--- a/data/moods/default/afraid.png
+++ b/gajim/data/moods/default/afraid.png
diff --git a/data/moods/default/amazed.png b/gajim/data/moods/default/amazed.png
index 1ceaa603b..1ceaa603b 100644
--- a/data/moods/default/amazed.png
+++ b/gajim/data/moods/default/amazed.png
diff --git a/data/moods/default/amorous.png b/gajim/data/moods/default/amorous.png
index 742105e11..742105e11 100644
--- a/data/moods/default/amorous.png
+++ b/gajim/data/moods/default/amorous.png
diff --git a/data/moods/default/angry.png b/gajim/data/moods/default/angry.png
index 46c0e6dca..46c0e6dca 100644
--- a/data/moods/default/angry.png
+++ b/gajim/data/moods/default/angry.png
diff --git a/data/moods/default/annoyed.png b/gajim/data/moods/default/annoyed.png
index 76616aec5..76616aec5 100644
--- a/data/moods/default/annoyed.png
+++ b/gajim/data/moods/default/annoyed.png
diff --git a/data/moods/default/anxious.png b/gajim/data/moods/default/anxious.png
index 59a496071..59a496071 100644
--- a/data/moods/default/anxious.png
+++ b/gajim/data/moods/default/anxious.png
diff --git a/data/moods/default/aroused.png b/gajim/data/moods/default/aroused.png
index 1f022d783..1f022d783 100644
--- a/data/moods/default/aroused.png
+++ b/gajim/data/moods/default/aroused.png
diff --git a/data/moods/default/ashamed.png b/gajim/data/moods/default/ashamed.png
index 9139a706f..9139a706f 100644
--- a/data/moods/default/ashamed.png
+++ b/gajim/data/moods/default/ashamed.png
diff --git a/data/moods/default/bored.png b/gajim/data/moods/default/bored.png
index b0b562abe..b0b562abe 100644
--- a/data/moods/default/bored.png
+++ b/gajim/data/moods/default/bored.png
diff --git a/data/moods/default/brave.png b/gajim/data/moods/default/brave.png
index 9351a2583..9351a2583 100644
--- a/data/moods/default/brave.png
+++ b/gajim/data/moods/default/brave.png
diff --git a/data/moods/default/calm.png b/gajim/data/moods/default/calm.png
index 4b5d0baa1..4b5d0baa1 100644
--- a/data/moods/default/calm.png
+++ b/gajim/data/moods/default/calm.png
diff --git a/data/moods/default/cautious.png b/gajim/data/moods/default/cautious.png
index 293fab7f0..293fab7f0 100644
--- a/data/moods/default/cautious.png
+++ b/gajim/data/moods/default/cautious.png
diff --git a/data/moods/default/cold.png b/gajim/data/moods/default/cold.png
index c52f65dfb..c52f65dfb 100644
--- a/data/moods/default/cold.png
+++ b/gajim/data/moods/default/cold.png
diff --git a/data/moods/default/confident.png b/gajim/data/moods/default/confident.png
index c0da5932d..c0da5932d 100644
--- a/data/moods/default/confident.png
+++ b/gajim/data/moods/default/confident.png
diff --git a/data/moods/default/confused.png b/gajim/data/moods/default/confused.png
index 4121aec4f..4121aec4f 100644
--- a/data/moods/default/confused.png
+++ b/gajim/data/moods/default/confused.png
diff --git a/data/moods/default/contemplative.png b/gajim/data/moods/default/contemplative.png
index f78b5e90e..f78b5e90e 100644
--- a/data/moods/default/contemplative.png
+++ b/gajim/data/moods/default/contemplative.png
diff --git a/data/moods/default/contented.png b/gajim/data/moods/default/contented.png
index ad6ba86ec..ad6ba86ec 100644
--- a/data/moods/default/contented.png
+++ b/gajim/data/moods/default/contented.png
diff --git a/data/moods/default/cranky.png b/gajim/data/moods/default/cranky.png
index 08dccb7fd..08dccb7fd 100644
--- a/data/moods/default/cranky.png
+++ b/gajim/data/moods/default/cranky.png
diff --git a/data/moods/default/crazy.png b/gajim/data/moods/default/crazy.png
index 6390d50f5..6390d50f5 100644
--- a/data/moods/default/crazy.png
+++ b/gajim/data/moods/default/crazy.png
diff --git a/data/moods/default/creative.png b/gajim/data/moods/default/creative.png
index 321576d08..321576d08 100644
--- a/data/moods/default/creative.png
+++ b/gajim/data/moods/default/creative.png
diff --git a/data/moods/default/curious.png b/gajim/data/moods/default/curious.png
index 2fc236394..2fc236394 100644
--- a/data/moods/default/curious.png
+++ b/gajim/data/moods/default/curious.png
diff --git a/data/moods/default/dejected.png b/gajim/data/moods/default/dejected.png
index 987636b72..987636b72 100644
--- a/data/moods/default/dejected.png
+++ b/gajim/data/moods/default/dejected.png
diff --git a/data/moods/default/depressed.png b/gajim/data/moods/default/depressed.png
index 86f5dcd32..86f5dcd32 100644
--- a/data/moods/default/depressed.png
+++ b/gajim/data/moods/default/depressed.png
diff --git a/data/moods/default/disappointed.png b/gajim/data/moods/default/disappointed.png
index bd7557def..bd7557def 100644
--- a/data/moods/default/disappointed.png
+++ b/gajim/data/moods/default/disappointed.png
diff --git a/data/moods/default/disgusted.png b/gajim/data/moods/default/disgusted.png
index 14f426cb4..14f426cb4 100644
--- a/data/moods/default/disgusted.png
+++ b/gajim/data/moods/default/disgusted.png
diff --git a/data/moods/default/dismayed.png b/gajim/data/moods/default/dismayed.png
index bbd7eea64..bbd7eea64 100644
--- a/data/moods/default/dismayed.png
+++ b/gajim/data/moods/default/dismayed.png
diff --git a/data/moods/default/distracted.png b/gajim/data/moods/default/distracted.png
index 9fc9586cd..9fc9586cd 100644
--- a/data/moods/default/distracted.png
+++ b/gajim/data/moods/default/distracted.png
diff --git a/data/moods/default/embarrassed.png b/gajim/data/moods/default/embarrassed.png
index a44225140..a44225140 100644
--- a/data/moods/default/embarrassed.png
+++ b/gajim/data/moods/default/embarrassed.png
diff --git a/data/moods/default/envious.png b/gajim/data/moods/default/envious.png
index 456b71e6e..456b71e6e 100644
--- a/data/moods/default/envious.png
+++ b/gajim/data/moods/default/envious.png
diff --git a/data/moods/default/excited.png b/gajim/data/moods/default/excited.png
index c7c0ba2ba..c7c0ba2ba 100644
--- a/data/moods/default/excited.png
+++ b/gajim/data/moods/default/excited.png
diff --git a/data/moods/default/flirtatious.png b/gajim/data/moods/default/flirtatious.png
index f4ecf1129..f4ecf1129 100644
--- a/data/moods/default/flirtatious.png
+++ b/gajim/data/moods/default/flirtatious.png
diff --git a/data/moods/default/frustrated.png b/gajim/data/moods/default/frustrated.png
index 2d2b0b642..2d2b0b642 100644
--- a/data/moods/default/frustrated.png
+++ b/gajim/data/moods/default/frustrated.png
diff --git a/data/moods/default/grateful.png b/gajim/data/moods/default/grateful.png
index 902166cc9..902166cc9 100644
--- a/data/moods/default/grateful.png
+++ b/gajim/data/moods/default/grateful.png
diff --git a/data/moods/default/grieving.png b/gajim/data/moods/default/grieving.png
index 097264877..097264877 100644
--- a/data/moods/default/grieving.png
+++ b/gajim/data/moods/default/grieving.png
diff --git a/data/moods/default/grumpy.png b/gajim/data/moods/default/grumpy.png
index 3fec5d171..3fec5d171 100644
--- a/data/moods/default/grumpy.png
+++ b/gajim/data/moods/default/grumpy.png
diff --git a/data/moods/default/guilty.png b/gajim/data/moods/default/guilty.png
index 1c43b9470..1c43b9470 100644
--- a/data/moods/default/guilty.png
+++ b/gajim/data/moods/default/guilty.png
diff --git a/data/moods/default/happy.png b/gajim/data/moods/default/happy.png
index 09e2d5265..09e2d5265 100644
--- a/data/moods/default/happy.png
+++ b/gajim/data/moods/default/happy.png
diff --git a/data/moods/default/hopeful.png b/gajim/data/moods/default/hopeful.png
index 14ab9312e..14ab9312e 100644
--- a/data/moods/default/hopeful.png
+++ b/gajim/data/moods/default/hopeful.png
diff --git a/data/moods/default/hot.png b/gajim/data/moods/default/hot.png
index 121e9117c..121e9117c 100644
--- a/data/moods/default/hot.png
+++ b/gajim/data/moods/default/hot.png
diff --git a/data/moods/default/humbled.png b/gajim/data/moods/default/humbled.png
index a519b3d8f..a519b3d8f 100644
--- a/data/moods/default/humbled.png
+++ b/gajim/data/moods/default/humbled.png
diff --git a/data/moods/default/humiliated.png b/gajim/data/moods/default/humiliated.png
index e4476b9b3..e4476b9b3 100644
--- a/data/moods/default/humiliated.png
+++ b/gajim/data/moods/default/humiliated.png
diff --git a/data/moods/default/hungry.png b/gajim/data/moods/default/hungry.png
index 3546c7a28..3546c7a28 100644
--- a/data/moods/default/hungry.png
+++ b/gajim/data/moods/default/hungry.png
diff --git a/data/moods/default/hurt.png b/gajim/data/moods/default/hurt.png
index 74ea88a5f..74ea88a5f 100644
--- a/data/moods/default/hurt.png
+++ b/gajim/data/moods/default/hurt.png
diff --git a/data/moods/default/impressed.png b/gajim/data/moods/default/impressed.png
index 9e89936d0..9e89936d0 100644
--- a/data/moods/default/impressed.png
+++ b/gajim/data/moods/default/impressed.png
diff --git a/data/moods/default/in_awe.png b/gajim/data/moods/default/in_awe.png
index c67192f25..c67192f25 100644
--- a/data/moods/default/in_awe.png
+++ b/gajim/data/moods/default/in_awe.png
diff --git a/data/moods/default/in_love.png b/gajim/data/moods/default/in_love.png
index ea6f4ac39..ea6f4ac39 100644
--- a/data/moods/default/in_love.png
+++ b/gajim/data/moods/default/in_love.png
diff --git a/data/moods/default/indignant.png b/gajim/data/moods/default/indignant.png
index 9b12cb202..9b12cb202 100644
--- a/data/moods/default/indignant.png
+++ b/gajim/data/moods/default/indignant.png
diff --git a/data/moods/default/interested.png b/gajim/data/moods/default/interested.png
index e5ac625c9..e5ac625c9 100644
--- a/data/moods/default/interested.png
+++ b/gajim/data/moods/default/interested.png
diff --git a/data/moods/default/intoxicated.png b/gajim/data/moods/default/intoxicated.png
index 89d6fe435..89d6fe435 100644
--- a/data/moods/default/intoxicated.png
+++ b/gajim/data/moods/default/intoxicated.png
diff --git a/data/moods/default/invincible.png b/gajim/data/moods/default/invincible.png
index 59bc5b305..59bc5b305 100644
--- a/data/moods/default/invincible.png
+++ b/gajim/data/moods/default/invincible.png
diff --git a/data/moods/default/jealous.png b/gajim/data/moods/default/jealous.png
index 74bc20cc1..74bc20cc1 100644
--- a/data/moods/default/jealous.png
+++ b/gajim/data/moods/default/jealous.png
diff --git a/data/moods/default/lonely.png b/gajim/data/moods/default/lonely.png
index cfbd8c66b..cfbd8c66b 100644
--- a/data/moods/default/lonely.png
+++ b/gajim/data/moods/default/lonely.png
diff --git a/data/moods/default/lost.png b/gajim/data/moods/default/lost.png
index 54609d9f5..54609d9f5 100644
--- a/data/moods/default/lost.png
+++ b/gajim/data/moods/default/lost.png
diff --git a/data/moods/default/lucky.png b/gajim/data/moods/default/lucky.png
index 8997947dc..8997947dc 100644
--- a/data/moods/default/lucky.png
+++ b/gajim/data/moods/default/lucky.png
diff --git a/data/moods/default/mean.png b/gajim/data/moods/default/mean.png
index 2bf5350ce..2bf5350ce 100644
--- a/data/moods/default/mean.png
+++ b/gajim/data/moods/default/mean.png
diff --git a/data/moods/default/moody.png b/gajim/data/moods/default/moody.png
index 8f4643177..8f4643177 100644
--- a/data/moods/default/moody.png
+++ b/gajim/data/moods/default/moody.png
diff --git a/data/moods/default/nervous.png b/gajim/data/moods/default/nervous.png
index 70ff2f03f..70ff2f03f 100644
--- a/data/moods/default/nervous.png
+++ b/gajim/data/moods/default/nervous.png
diff --git a/data/moods/default/neutral.png b/gajim/data/moods/default/neutral.png
index 2892d4846..2892d4846 100644
--- a/data/moods/default/neutral.png
+++ b/gajim/data/moods/default/neutral.png
diff --git a/data/moods/default/offended.png b/gajim/data/moods/default/offended.png
index 0cb495046..0cb495046 100644
--- a/data/moods/default/offended.png
+++ b/gajim/data/moods/default/offended.png
diff --git a/data/moods/default/outraged.png b/gajim/data/moods/default/outraged.png
index 141380cb4..141380cb4 100644
--- a/data/moods/default/outraged.png
+++ b/gajim/data/moods/default/outraged.png
diff --git a/data/moods/default/playful.png b/gajim/data/moods/default/playful.png
index 2c52f07f0..2c52f07f0 100644
--- a/data/moods/default/playful.png
+++ b/gajim/data/moods/default/playful.png
diff --git a/data/moods/default/proud.png b/gajim/data/moods/default/proud.png
index 788df04af..788df04af 100644
--- a/data/moods/default/proud.png
+++ b/gajim/data/moods/default/proud.png
diff --git a/data/moods/default/relaxed.png b/gajim/data/moods/default/relaxed.png
index 1e596492a..1e596492a 100644
--- a/data/moods/default/relaxed.png
+++ b/gajim/data/moods/default/relaxed.png
diff --git a/data/moods/default/relieved.png b/gajim/data/moods/default/relieved.png
index 9d0eb7884..9d0eb7884 100644
--- a/data/moods/default/relieved.png
+++ b/gajim/data/moods/default/relieved.png
diff --git a/data/moods/default/remorseful.png b/gajim/data/moods/default/remorseful.png
index b5d060453..b5d060453 100644
--- a/data/moods/default/remorseful.png
+++ b/gajim/data/moods/default/remorseful.png
diff --git a/data/moods/default/restless.png b/gajim/data/moods/default/restless.png
index 89276398f..89276398f 100644
--- a/data/moods/default/restless.png
+++ b/gajim/data/moods/default/restless.png
diff --git a/data/moods/default/sad.png b/gajim/data/moods/default/sad.png
index 14006836c..14006836c 100644
--- a/data/moods/default/sad.png
+++ b/gajim/data/moods/default/sad.png
diff --git a/data/moods/default/sarcastic.png b/gajim/data/moods/default/sarcastic.png
index 5a28d210e..5a28d210e 100644
--- a/data/moods/default/sarcastic.png
+++ b/gajim/data/moods/default/sarcastic.png
diff --git a/data/moods/default/satisfied.png b/gajim/data/moods/default/satisfied.png
index 4ee971e44..4ee971e44 100644
--- a/data/moods/default/satisfied.png
+++ b/gajim/data/moods/default/satisfied.png
diff --git a/data/moods/default/serious.png b/gajim/data/moods/default/serious.png
index ae5fe589b..ae5fe589b 100644
--- a/data/moods/default/serious.png
+++ b/gajim/data/moods/default/serious.png
diff --git a/data/moods/default/shocked.png b/gajim/data/moods/default/shocked.png
index 3e335cffa..3e335cffa 100644
--- a/data/moods/default/shocked.png
+++ b/gajim/data/moods/default/shocked.png
diff --git a/data/moods/default/shy.png b/gajim/data/moods/default/shy.png
index 9409f81df..9409f81df 100644
--- a/data/moods/default/shy.png
+++ b/gajim/data/moods/default/shy.png
diff --git a/data/moods/default/sick.png b/gajim/data/moods/default/sick.png
index 5e3b41ac9..5e3b41ac9 100644
--- a/data/moods/default/sick.png
+++ b/gajim/data/moods/default/sick.png
diff --git a/data/moods/default/sleepy.png b/gajim/data/moods/default/sleepy.png
index 47bed8847..47bed8847 100644
--- a/data/moods/default/sleepy.png
+++ b/gajim/data/moods/default/sleepy.png
diff --git a/data/moods/default/spontaneous.png b/gajim/data/moods/default/spontaneous.png
index 75be43203..75be43203 100644
--- a/data/moods/default/spontaneous.png
+++ b/gajim/data/moods/default/spontaneous.png
diff --git a/data/moods/default/stressed.png b/gajim/data/moods/default/stressed.png
index 92b47782a..92b47782a 100644
--- a/data/moods/default/stressed.png
+++ b/gajim/data/moods/default/stressed.png
diff --git a/data/moods/default/strong.png b/gajim/data/moods/default/strong.png
index 044a1c83a..044a1c83a 100644
--- a/data/moods/default/strong.png
+++ b/gajim/data/moods/default/strong.png
diff --git a/data/moods/default/surprised.png b/gajim/data/moods/default/surprised.png
index c1f5f1799..c1f5f1799 100644
--- a/data/moods/default/surprised.png
+++ b/gajim/data/moods/default/surprised.png
diff --git a/data/moods/default/thankful.png b/gajim/data/moods/default/thankful.png
index e01ffe614..e01ffe614 100644
--- a/data/moods/default/thankful.png
+++ b/gajim/data/moods/default/thankful.png
diff --git a/data/moods/default/thirsty.png b/gajim/data/moods/default/thirsty.png
index 9b0fc962a..9b0fc962a 100644
--- a/data/moods/default/thirsty.png
+++ b/gajim/data/moods/default/thirsty.png
diff --git a/data/moods/default/tired.png b/gajim/data/moods/default/tired.png
index 60bcc5b48..60bcc5b48 100644
--- a/data/moods/default/tired.png
+++ b/gajim/data/moods/default/tired.png
diff --git a/data/moods/default/undefined.png b/gajim/data/moods/default/undefined.png
index bc3d8b173..bc3d8b173 100644
--- a/data/moods/default/undefined.png
+++ b/gajim/data/moods/default/undefined.png
diff --git a/data/moods/default/unknown.png b/gajim/data/moods/default/unknown.png
index 6a50436be..6a50436be 100644
--- a/data/moods/default/unknown.png
+++ b/gajim/data/moods/default/unknown.png
diff --git a/data/moods/default/weak.png b/gajim/data/moods/default/weak.png
index b353131a9..b353131a9 100644
--- a/data/moods/default/weak.png
+++ b/gajim/data/moods/default/weak.png
diff --git a/data/moods/default/worried.png b/gajim/data/moods/default/worried.png
index 5499458cc..5499458cc 100644
--- a/data/moods/default/worried.png
+++ b/gajim/data/moods/default/worried.png
diff --git a/data/other/cacerts.pem b/gajim/data/other/cacerts.pem
index b84848519..b84848519 100644
--- a/data/other/cacerts.pem
+++ b/gajim/data/other/cacerts.pem
diff --git a/data/other/dh4096.pem b/gajim/data/other/dh4096.pem
index 90ef68283..90ef68283 100644
--- a/data/other/dh4096.pem
+++ b/gajim/data/other/dh4096.pem
diff --git a/data/other/servers.xml b/gajim/data/other/servers.xml
index be35c0357..be35c0357 100644
--- a/data/other/servers.xml
+++ b/gajim/data/other/servers.xml
diff --git a/data/sounds/attention.wav b/gajim/data/sounds/attention.wav
index 16c221182..16c221182 100644
--- a/data/sounds/attention.wav
+++ b/gajim/data/sounds/attention.wav
diff --git a/data/sounds/bounce.wav b/gajim/data/sounds/bounce.wav
index 6de5fe69f..6de5fe69f 100644
--- a/data/sounds/bounce.wav
+++ b/gajim/data/sounds/bounce.wav
diff --git a/data/sounds/connected.wav b/gajim/data/sounds/connected.wav
index 641b25850..641b25850 100644
--- a/data/sounds/connected.wav
+++ b/gajim/data/sounds/connected.wav
diff --git a/data/sounds/disconnected.wav b/gajim/data/sounds/disconnected.wav
index fcd111786..fcd111786 100644
--- a/data/sounds/disconnected.wav
+++ b/gajim/data/sounds/disconnected.wav
diff --git a/data/sounds/gc_message1.wav b/gajim/data/sounds/gc_message1.wav
index 707cf18f4..707cf18f4 100644
--- a/data/sounds/gc_message1.wav
+++ b/gajim/data/sounds/gc_message1.wav
diff --git a/data/sounds/gc_message2.wav b/gajim/data/sounds/gc_message2.wav
index 3292deadf..3292deadf 100644
--- a/data/sounds/gc_message2.wav
+++ b/gajim/data/sounds/gc_message2.wav
diff --git a/data/sounds/message1.wav b/gajim/data/sounds/message1.wav
index 707cf18f4..707cf18f4 100644
--- a/data/sounds/message1.wav
+++ b/gajim/data/sounds/message1.wav
diff --git a/data/sounds/message2.wav b/gajim/data/sounds/message2.wav
index 3292deadf..3292deadf 100644
--- a/data/sounds/message2.wav
+++ b/gajim/data/sounds/message2.wav
diff --git a/data/sounds/sent.wav b/gajim/data/sounds/sent.wav
index b274bfe64..b274bfe64 100644
--- a/data/sounds/sent.wav
+++ b/gajim/data/sounds/sent.wav
diff --git a/data/style/gajim.css b/gajim/data/style/gajim.css
index 62c782586..62c782586 100644
--- a/data/style/gajim.css
+++ b/gajim/data/style/gajim.css
diff --git a/test/lib/__init__.py b/test/lib/__init__.py
index b8c60c8fe..78a2602c2 100644
--- a/test/lib/__init__.py
+++ b/test/lib/__init__.py
@@ -46,13 +46,13 @@ def setup_env():
     import logging
     logging.basicConfig()
 
-    app.DATA_DIR = gajim_root + '/data'
+    app.DATA_DIR = gajim_root + '/gajim/data'
     app.use_x = use_x
     app.contacts = LegacyContactsAPI()
     app.connections = {}
 
     if use_x:
         from gajim import gtkgui_helpers
-        gtkgui_helpers.GUI_DIR = gajim_root + '/data/gui'
+        gtkgui_helpers.GUI_DIR = gajim_root + '/gajim/data/gui'
         from gajim.gajim import GajimApplication
         app.app = GajimApplication()
diff --git a/test/test_pluginmanager.py b/test/test_pluginmanager.py
index 71f99d987..50b9c0392 100644
--- a/test/test_pluginmanager.py
+++ b/test/test_pluginmanager.py
@@ -55,7 +55,7 @@ gajim.common.configpaths.gajimpaths.init(configdir)
 # for some reason common.app needs to be imported before xmpppy?
 from gajim.common import app
 
-app.DATA_DIR = gajim_root + '/data'
+app.DATA_DIR = gajim_root + '/gajim/data'
 
 from common.stanza_session import StanzaSession