diff --git a/imgsrc/generate.py b/imgsrc/generate.py
index 8ed7d15e42..c0d41a639d 100755
--- a/imgsrc/generate.py
+++ b/imgsrc/generate.py
@@ -25,8 +25,6 @@ skip = {'calibre'}
 j = os.path.join
 base = os.path.dirname(os.path.abspath(__file__))
 output_base = j(os.path.dirname(base), 'resources', 'images')
-dark_output_base = j(os.path.dirname(output_base), 'icon-themes', 'calibre-default-dark', 'base')
-light_output_base = j(os.path.dirname(output_base), 'icon-themes', 'calibre-default-light', 'base')
 hash_path = j(os.path.dirname(base), '.build-cache', 'imgsrc-gen.json')
 if os.path.exists(hash_path):
     with open(hash_path, 'rb') as f:
@@ -45,14 +43,7 @@ def iterfiles(only=()):
         if not only and h == hashes.get(name):
             continue
         output_names = [n for n in [name] + duplicates.get(name, []) if n not in skip]
-        obase = output_base
-        if name.endswith('-for-dark-theme'):
-            obase = dark_output_base
-            output_names = [x.replace('-for-dark-theme', '') for x in output_names]
-        elif name.endswith('-for-light-theme'):
-            obase = light_output_base
-            output_names = [x.replace('-for-light-theme', '') for x in output_names]
-        output_files = [j(obase, n) + '.png' for n in output_names]
+        output_files = [j(output_base, n) + '.png' for n in output_names]
         if output_files:
             yield src, output_files
 
diff --git a/resources/icon-themes/calibre-default-dark/index.theme b/resources/icon-themes/calibre-default-dark/index.theme
deleted file mode 100644
index 72fc6819af..0000000000
--- a/resources/icon-themes/calibre-default-dark/index.theme
+++ /dev/null
@@ -1,23 +0,0 @@
-[Icon Theme]
-Name=calibre default light icons
-Comment=icons for calibre in light mode
-
-[base]
-Size=128
-MinSize=16
-MaxSize=256
-
-[base/devices]
-Size=128
-MinSize=16
-MaxSize=256
-
-[base/plugins]
-Size=128
-MinSize=16
-MaxSize=256
-
-[base/mimetypes]
-Size=128
-MinSize=16
-MaxSize=256
diff --git a/resources/icon-themes/calibre-default-light/index.theme b/resources/icon-themes/calibre-default-light/index.theme
deleted file mode 100644
index 72fc6819af..0000000000
--- a/resources/icon-themes/calibre-default-light/index.theme
+++ /dev/null
@@ -1,23 +0,0 @@
-[Icon Theme]
-Name=calibre default light icons
-Comment=icons for calibre in light mode
-
-[base]
-Size=128
-MinSize=16
-MaxSize=256
-
-[base/devices]
-Size=128
-MinSize=16
-MaxSize=256
-
-[base/plugins]
-Size=128
-MinSize=16
-MaxSize=256
-
-[base/mimetypes]
-Size=128
-MinSize=16
-MaxSize=256
diff --git a/resources/icon-themes/calibre-default-dark/base/close.png b/resources/images/close-for-dark-theme.png
similarity index 100%
rename from resources/icon-themes/calibre-default-dark/base/close.png
rename to resources/images/close-for-dark-theme.png
diff --git a/resources/icon-themes/calibre-default-light/base/close.png b/resources/images/close-for-light-theme.png
similarity index 100%
rename from resources/icon-themes/calibre-default-light/base/close.png
rename to resources/images/close-for-light-theme.png
diff --git a/resources/icon-themes/calibre-default-dark/base/modified.png b/resources/images/modified-for-dark-theme.png
similarity index 100%
rename from resources/icon-themes/calibre-default-dark/base/modified.png
rename to resources/images/modified-for-dark-theme.png
diff --git a/resources/icon-themes/calibre-default-light/base/modified.png b/resources/images/modified-for-light-theme.png
similarity index 100%
rename from resources/icon-themes/calibre-default-light/base/modified.png
rename to resources/images/modified-for-light-theme.png