diff --git a/src/fe-gtk/fe-gtk.c b/src/fe-gtk/fe-gtk.c
index 46678e74..c75bc748 100644
--- a/src/fe-gtk/fe-gtk.c
+++ b/src/fe-gtk/fe-gtk.c
@@ -180,7 +180,6 @@ win32_configure_icon_theme (void)
 	GtkIconTheme *theme;
 	char *base_path;
 	char *icons_path;
-	char *adwaita_path;
 
 	theme = gtk_icon_theme_get_default ();
 	if (!theme)
@@ -191,17 +190,10 @@ win32_configure_icon_theme (void)
 		return;
 
 	icons_path = g_build_filename (base_path, "share", "icons", NULL);
-	adwaita_path = g_build_filename (icons_path, "Adwaita", NULL);
 
 	if (g_file_test (icons_path, G_FILE_TEST_IS_DIR))
 		gtk_icon_theme_append_search_path (theme, icons_path);
 
-	/* GtkEntry's emoji chooser uses symbolic category/menu icons only present in
-	 * Adwaita in our Windows bundle. Force it when available. */
-	if (g_file_test (adwaita_path, G_FILE_TEST_IS_DIR))
-		gtk_icon_theme_set_custom_theme (theme, "Adwaita");
-
-	g_free (adwaita_path);
 	g_free (icons_path);
 	g_free (base_path);
 }
diff --git a/win32/copy/copy.vcxproj b/win32/copy/copy.vcxproj
index f0d1b972..3ef04afe 100644
--- a/win32/copy/copy.vcxproj
+++ b/win32/copy/copy.vcxproj
@@ -88,7 +88,6 @@
       <DepsRootDocs Include="$(DepsRoot)\share\doc\**\*" />
       <Locale Include="$(ZoiteChatBin)locale\**\*;$(DepsRoot)\share\locale\**\*" />
       <MSWindowsTheme Include="$(DepsRoot)\share\themes\MS-Windows\**\*" />
-      <AdwaitaIcons Include="$(DepsRoot)\share\icons\Adwaita\**\*" />
     </ItemGroup>
 
     <Copy SourceFiles="@(None)" DestinationFolder="$(ZoiteChatRel)" />
@@ -102,7 +101,6 @@
     <Copy SourceFiles="@(EnchantProviders)" DestinationFolder="$(ZoiteChatRel)\lib\enchant" />
     <Copy SourceFiles="@(Locale)" DestinationFiles="@(Locale->'$(ZoiteChatRel)\share\locale\%(RecursiveDir)%(Filename)%(Extension)')" />
     <Copy SourceFiles="@(MSWindowsTheme)" DestinationFiles="@(MSWindowsTheme->'$(ZoiteChatRel)\share\themes\MS-Windows\%(RecursiveDir)%(Filename)%(Extension)')" />
-    <Copy SourceFiles="@(AdwaitaIcons)" DestinationFiles="@(AdwaitaIcons->'$(ZoiteChatRel)\share\icons\Adwaita\%(RecursiveDir)%(Filename)%(Extension)')" />
     <Copy SourceFiles="@(LuaShare)" DestinationFiles="@(LuaShare->'$(ZoiteChatRel)\share\lua\%(RecursiveDir)%(Filename)%(Extension)')" />
     <Copy SourceFiles="@(LuaLib)" DestinationFiles="@(LuaLib->'$(ZoiteChatRel)\lib\lua\%(RecursiveDir)%(Filename)%(Extension)')" />
     <Copy SourceFiles="@(Typelib)" DestinationFiles="@(Typelib->'$(ZoiteChatRel)\lib\girepository-1.0\%(Filename)%(Extension)')" />
diff --git a/win32/installer/zoitechat.iss.tt b/win32/installer/zoitechat.iss.tt
index ff17bf6a..c06df2e4 100644
--- a/win32/installer/zoitechat.iss.tt
+++ b/win32/installer/zoitechat.iss.tt
@@ -114,7 +114,6 @@ Source: "cert.pem"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
 Source: "share\xml\*"; DestDir: "{app}\share\xml"; Flags: ignoreversion createallsubdirs recursesubdirs; Components: libs
 Source: "share\doc\*"; DestDir: "{app}\share\doc"; Flags: ignoreversion createallsubdirs recursesubdirs; Components: libs
 Source: "share\themes\MS-Windows\*"; DestDir: "{app}\share\themes\MS-Windows"; Flags: ignoreversion createallsubdirs recursesubdirs skipifsourcedoesntexist; Components: libs
-Source: "share\icons\Adwaita\*"; DestDir: "{app}\share\icons\Adwaita"; Flags: ignoreversion createallsubdirs recursesubdirs skipifsourcedoesntexist; Components: libs
 Source: "share\glib-2.0\schemas\*"; DestDir: "{app}\share\glib-2.0\schemas"; Flags: ignoreversion createallsubdirs recursesubdirs skipifsourcedoesntexist; Components: libs
 Source: "share\locale\*"; DestDir: "{app}\share\locale"; Flags: ignoreversion createallsubdirs recursesubdirs; Components: translations
 Source: "etc\fonts\*"; DestDir: "{app}\etc\fonts"; Flags: ignoreversion createallsubdirs recursesubdirs; Components: libs