saw-jan · saw-jan · May 13, 2020 · May 13, 2020 · May 13, 2020
diff --git a/.gitignore b/.gitignore
@@ -22,5 +22,8 @@ Quelea/nbproject/*
 Quelea/.idea/*
 Quelea/.gradle/*
 Quelea/.nb-gradle/*
-
+Quelea/.settings/*
+Quelea/bin/*
+Quelea/.classpath
+Quelea/.project
 Thumbs.db
diff --git a/Quelea/icons/SMPTE Bars.png b/Quelea/icons/SMPTE Bars.png
diff --git a/Quelea/icons/about.png b/Quelea/icons/about.png
diff --git a/Quelea/icons/add audio.png b/Quelea/icons/add audio.png
diff --git a/Quelea/icons/add-light.png b/Quelea/icons/add-light.png
diff --git a/Quelea/icons/add.png b/Quelea/icons/add.png
diff --git a/Quelea/icons/add_item-light.png b/Quelea/icons/add_item-light.png
diff --git a/Quelea/icons/add_item.png b/Quelea/icons/add_item.png
diff --git a/Quelea/icons/add_pdf-light.png b/Quelea/icons/add_pdf-light.png
diff --git a/Quelea/icons/add_pdf.png b/Quelea/icons/add_pdf.png
diff --git a/Quelea/icons/add_pdfbig-light.png b/Quelea/icons/add_pdfbig-light.png
diff --git a/Quelea/icons/add_pdfbig.png b/Quelea/icons/add_pdfbig.png
diff --git a/Quelea/icons/audio preview.png b/Quelea/icons/audio preview.png
diff --git a/Quelea/icons/audio.png b/Quelea/icons/audio.png
diff --git a/Quelea/icons/audio30.png b/Quelea/icons/audio30.png
diff --git a/Quelea/icons/bible-light.png b/Quelea/icons/bible-light.png
diff --git a/Quelea/icons/bible.png b/Quelea/icons/bible.png
diff --git a/Quelea/icons/bridge-light.png b/Quelea/icons/bridge-light.png
diff --git a/Quelea/icons/bridge.png b/Quelea/icons/bridge.png
diff --git a/Quelea/icons/chorus-light.png b/Quelea/icons/chorus-light.png
diff --git a/Quelea/icons/chorus.png b/Quelea/icons/chorus.png
diff --git a/Quelea/icons/clearaudio.png b/Quelea/icons/clearaudio.png
diff --git a/Quelea/icons/colorbands.png b/Quelea/icons/colorbands.png
diff --git a/Quelea/icons/cross-light.png b/Quelea/icons/cross-light.png
diff --git a/Quelea/icons/cross.png b/Quelea/icons/cross.png
diff --git a/Quelea/icons/delete.png b/Quelea/icons/delete.png
diff --git a/Quelea/icons/dictionary.png b/Quelea/icons/dictionary.png
diff --git a/Quelea/icons/discuss.png b/Quelea/icons/discuss.png
diff --git a/Quelea/icons/down-light.png b/Quelea/icons/down-light.png
diff --git a/Quelea/icons/down.png b/Quelea/icons/down.png
diff --git a/Quelea/icons/dvd-light.png b/Quelea/icons/dvd-light.png
diff --git a/Quelea/icons/dvd.png b/Quelea/icons/dvd.png
diff --git a/Quelea/icons/easyslides.png b/Quelea/icons/easyslides.png
diff --git a/Quelea/icons/easyworship.png b/Quelea/icons/easyworship.png
diff --git a/Quelea/icons/edit.png b/Quelea/icons/edit.png
diff --git a/Quelea/icons/edit32.png b/Quelea/icons/edit32.png
diff --git a/Quelea/icons/elevanto.png b/Quelea/icons/elevanto.png
diff --git a/Quelea/icons/epicworship.png b/Quelea/icons/epicworship.png
diff --git a/Quelea/icons/exit.png b/Quelea/icons/exit.png
diff --git a/Quelea/icons/export.png b/Quelea/icons/export.png
diff --git a/Quelea/icons/facebook.png b/Quelea/icons/facebook.png
diff --git a/Quelea/icons/fileexport.png b/Quelea/icons/fileexport.png
diff --git a/Quelea/icons/filenew-light.png b/Quelea/icons/filenew-light.png
diff --git a/Quelea/icons/filenew.png b/Quelea/icons/filenew.png
diff --git a/Quelea/icons/filenewbig-light.png b/Quelea/icons/filenewbig-light.png
diff --git a/Quelea/icons/filenewbig.png b/Quelea/icons/filenewbig.png
diff --git a/Quelea/icons/fileopen-light.png b/Quelea/icons/fileopen-light.png
diff --git a/Quelea/icons/fileopen.png b/Quelea/icons/fileopen.png
diff --git a/Quelea/icons/fileopenbig-light.png b/Quelea/icons/fileopenbig-light.png
diff --git a/Quelea/icons/fileopenbig.png b/Quelea/icons/fileopenbig.png
diff --git a/Quelea/icons/fileprint-light.png b/Quelea/icons/fileprint-light.png
diff --git a/Quelea/icons/fileprint.png b/Quelea/icons/fileprint.png
diff --git a/Quelea/icons/fileprintbig-light.png b/Quelea/icons/fileprintbig-light.png
diff --git a/Quelea/icons/fileprintbig.png b/Quelea/icons/fileprintbig.png
diff --git a/Quelea/icons/filesave-light.png b/Quelea/icons/filesave-light.png
diff --git a/Quelea/icons/filesave.png b/Quelea/icons/filesave.png
diff --git a/Quelea/icons/filesaveas-light.png b/Quelea/icons/filesaveas-light.png
diff --git a/Quelea/icons/filesaveas.png b/Quelea/icons/filesaveas.png
diff --git a/Quelea/icons/filesavebig-light.png b/Quelea/icons/filesavebig-light.png
diff --git a/Quelea/icons/filesavebig.png b/Quelea/icons/filesavebig.png
diff --git a/Quelea/icons/freeworship.png b/Quelea/icons/freeworship.png
diff --git a/Quelea/icons/full logo.png b/Quelea/icons/full logo.png
diff --git a/Quelea/icons/gear.png b/Quelea/icons/gear.png
diff --git a/Quelea/icons/ic-add-large-light.png b/Quelea/icons/ic-add-large-light.png
diff --git a/Quelea/icons/ic-add-light.png b/Quelea/icons/ic-add-light.png
diff --git a/Quelea/icons/ic-add-pdf-light.png b/Quelea/icons/ic-add-pdf-light.png
diff --git a/Quelea/icons/ic-bible-light.png b/Quelea/icons/ic-bible-light.png
diff --git a/Quelea/icons/ic-bible-open-light.png b/Quelea/icons/ic-bible-open-light.png
diff --git a/Quelea/icons/ic-cancel-light.png b/Quelea/icons/ic-cancel-light.png
diff --git a/Quelea/icons/ic-discuss-light.png b/Quelea/icons/ic-discuss-light.png
diff --git a/Quelea/icons/ic-down-light.png b/Quelea/icons/ic-down-light.png
diff --git a/Quelea/icons/ic-dvd-light.png b/Quelea/icons/ic-dvd-light.png
diff --git a/Quelea/icons/ic-edit-light.png b/Quelea/icons/ic-edit-light.png
diff --git a/Quelea/icons/ic-exit-light.png b/Quelea/icons/ic-exit-light.png
diff --git a/Quelea/icons/ic-export-light.png b/Quelea/icons/ic-export-light.png
diff --git a/Quelea/icons/ic-export.png b/Quelea/icons/ic-export.png
diff --git a/Quelea/icons/ic-folder-light.png b/Quelea/icons/ic-folder-light.png
diff --git a/Quelea/icons/ic-foler-large-light.png b/Quelea/icons/ic-foler-large-light.png
diff --git a/Quelea/icons/ic-foler-large.png b/Quelea/icons/ic-foler-large.png
diff --git a/Quelea/icons/ic-golive-light.png b/Quelea/icons/ic-golive-light.png
diff --git a/Quelea/icons/ic-image-light.png b/Quelea/icons/ic-image-light.png
diff --git a/Quelea/icons/ic-import-gray.png b/Quelea/icons/ic-import-gray.png
diff --git a/Quelea/icons/ic-import-light.png b/Quelea/icons/ic-import-light.png
diff --git a/Quelea/icons/ic-import.png b/Quelea/icons/ic-import.png
diff --git a/Quelea/icons/ic-list-light.png b/Quelea/icons/ic-list-light.png
diff --git a/Quelea/icons/ic-livetext-light.png b/Quelea/icons/ic-livetext-light.png
diff --git a/Quelea/icons/ic-manual-light.png b/Quelea/icons/ic-manual-light.png
diff --git a/Quelea/icons/ic-newfile-large-light.png b/Quelea/icons/ic-newfile-large-light.png
diff --git a/Quelea/icons/ic-newfile-light.png b/Quelea/icons/ic-newfile-light.png
diff --git a/Quelea/icons/ic-newsong-large-light.png b/Quelea/icons/ic-newsong-large-light.png
diff --git a/Quelea/icons/ic-newsong-light.png b/Quelea/icons/ic-newsong-light.png
diff --git a/Quelea/icons/ic-notice-large-light.png b/Quelea/icons/ic-notice-large-light.png
diff --git a/Quelea/icons/ic-options-light.png b/Quelea/icons/ic-options-light.png
diff --git a/Quelea/icons/ic-pdf-large-light.png b/Quelea/icons/ic-pdf-large-light.png
diff --git a/Quelea/icons/ic-pdf-light.png b/Quelea/icons/ic-pdf-light.png
diff --git a/Quelea/icons/ic-powerpoint-light.png b/Quelea/icons/ic-powerpoint-light.png
diff --git a/Quelea/icons/ic-preview-light.png b/Quelea/icons/ic-preview-light.png
diff --git a/Quelea/icons/ic-print-large-light.png b/Quelea/icons/ic-print-large-light.png
diff --git a/Quelea/icons/ic-print-light.png b/Quelea/icons/ic-print-light.png
diff --git a/Quelea/icons/ic-save-large-light.png b/Quelea/icons/ic-save-large-light.png
diff --git a/Quelea/icons/ic-save-light.png b/Quelea/icons/ic-save-light.png
diff --git a/Quelea/icons/ic-saveas-light.png b/Quelea/icons/ic-saveas-light.png
diff --git a/Quelea/icons/ic-sch-audio-light.png b/Quelea/icons/ic-sch-audio-light.png
diff --git a/Quelea/icons/ic-sch-dvd-light.png b/Quelea/icons/ic-sch-dvd-light.png
diff --git a/Quelea/icons/ic-sch-image-light.png b/Quelea/icons/ic-sch-image-light.png
diff --git a/Quelea/icons/ic-sch-lyrics-light.png b/Quelea/icons/ic-sch-lyrics-light.png
diff --git a/Quelea/icons/ic-sch-lyricschord-light.png b/Quelea/icons/ic-sch-lyricschord-light.png
diff --git a/Quelea/icons/ic-sch-lyricscopy-light.png b/Quelea/icons/ic-sch-lyricscopy-light.png
diff --git a/Quelea/icons/ic-sch-presentation-light.png b/Quelea/icons/ic-sch-presentation-light.png
diff --git a/Quelea/icons/ic-sch-timer-light.png b/Quelea/icons/ic-sch-timer-light.png
diff --git a/Quelea/icons/ic-sch-video-light.png b/Quelea/icons/ic-sch-video-light.png
diff --git a/Quelea/icons/ic-sch-web-light.png b/Quelea/icons/ic-sch-web-light.png
diff --git a/Quelea/icons/ic-theme-light.png b/Quelea/icons/ic-theme-light.png
diff --git a/Quelea/icons/ic-timer-light.png b/Quelea/icons/ic-timer-light.png
diff --git a/Quelea/icons/ic-up-light.png b/Quelea/icons/ic-up-light.png
diff --git a/Quelea/icons/ic-update-light.png b/Quelea/icons/ic-update-light.png
diff --git a/Quelea/icons/ic-video-light.png b/Quelea/icons/ic-video-light.png
diff --git a/Quelea/icons/ic-web-light.png b/Quelea/icons/ic-web-light.png
diff --git a/Quelea/icons/image-group-schedule.png b/Quelea/icons/image-group-schedule.png
diff --git a/Quelea/icons/image-light.png b/Quelea/icons/image-light.png
diff --git a/Quelea/icons/image.png b/Quelea/icons/image.png
diff --git a/Quelea/icons/import.png b/Quelea/icons/import.png
diff --git a/Quelea/icons/importbw.png b/Quelea/icons/importbw.png
diff --git a/Quelea/icons/info-light.png b/Quelea/icons/info-light.png
diff --git a/Quelea/icons/info.png b/Quelea/icons/info.png
diff --git a/Quelea/icons/infobig-light.png b/Quelea/icons/infobig-light.png
diff --git a/Quelea/icons/infobig.png b/Quelea/icons/infobig.png
diff --git a/Quelea/icons/left.png b/Quelea/icons/left.png
diff --git a/Quelea/icons/lightning-light.png b/Quelea/icons/lightning-light.png
diff --git a/Quelea/icons/lightning.png b/Quelea/icons/lightning.png
diff --git a/Quelea/icons/lightningbig-light.png b/Quelea/icons/lightningbig-light.png
diff --git a/Quelea/icons/lightningbig.png b/Quelea/icons/lightningbig.png
diff --git a/Quelea/icons/list.png b/Quelea/icons/list.png
diff --git a/Quelea/icons/live_text-light.png b/Quelea/icons/live_text-light.png
diff --git a/Quelea/icons/live_text.png b/Quelea/icons/live_text.png
diff --git a/Quelea/icons/logo default.png b/Quelea/icons/logo default.png
diff --git a/Quelea/icons/loop_off.png b/Quelea/icons/loop_off.png
diff --git a/Quelea/icons/loop_on.png b/Quelea/icons/loop_on.png
diff --git a/Quelea/icons/lyrics.png b/Quelea/icons/lyrics.png
diff --git a/Quelea/icons/lyricsandchords.png b/Quelea/icons/lyricsandchords.png
diff --git a/Quelea/icons/lyricscopy.png b/Quelea/icons/lyricscopy.png
diff --git a/Quelea/icons/mediashout.png b/Quelea/icons/mediashout.png
diff --git a/Quelea/icons/missionpraise.png b/Quelea/icons/missionpraise.png
diff --git a/Quelea/icons/monitor.png b/Quelea/icons/monitor.png
diff --git a/Quelea/icons/multimedia-light.png b/Quelea/icons/multimedia-light.png
diff --git a/Quelea/icons/multimedia.png b/Quelea/icons/multimedia.png
diff --git a/Quelea/icons/multimedia_big.png b/Quelea/icons/multimedia_big.png
diff --git a/Quelea/icons/newsong-light.png b/Quelea/icons/newsong-light.png
diff --git a/Quelea/icons/newsong.png b/Quelea/icons/newsong.png
diff --git a/Quelea/icons/newsongbig-light.png b/Quelea/icons/newsongbig-light.png
diff --git a/Quelea/icons/newsongbig.png b/Quelea/icons/newsongbig.png
diff --git a/Quelea/icons/newsongdb-light.png b/Quelea/icons/newsongdb-light.png
diff --git a/Quelea/icons/newsongdb.png b/Quelea/icons/newsongdb.png
diff --git a/Quelea/icons/newstar.png b/Quelea/icons/newstar.png
diff --git a/Quelea/icons/next-light.png b/Quelea/icons/next-light.png
diff --git a/Quelea/icons/next.png b/Quelea/icons/next.png
diff --git a/Quelea/icons/nonbreakline.png b/Quelea/icons/nonbreakline.png
diff --git a/Quelea/icons/old-icons.zip b/Quelea/icons/old-icons.zip
diff --git a/Quelea/icons/openlp.png b/Quelea/icons/openlp.png
diff --git a/Quelea/icons/opensong.png b/Quelea/icons/opensong.png
diff --git a/Quelea/icons/options.png b/Quelea/icons/options.png
diff --git a/Quelea/icons/pause.png b/Quelea/icons/pause.png
diff --git a/Quelea/icons/pausedisable.png b/Quelea/icons/pausedisable.png
diff --git a/Quelea/icons/pdf-light.png b/Quelea/icons/pdf-light.png
diff --git a/Quelea/icons/pdf.png b/Quelea/icons/pdf.png
diff --git a/Quelea/icons/planningcenteronline.png b/Quelea/icons/planningcenteronline.png
diff --git a/Quelea/icons/play.png b/Quelea/icons/play.png
diff --git a/Quelea/icons/playdisable.png b/Quelea/icons/playdisable.png
diff --git a/Quelea/icons/pm.png b/Quelea/icons/pm.png
diff --git a/Quelea/icons/position calibrate.png b/Quelea/icons/position calibrate.png
diff --git a/Quelea/icons/powerpoint-light.png b/Quelea/icons/powerpoint-light.png
diff --git a/Quelea/icons/powerpoint.png b/Quelea/icons/powerpoint.png
diff --git a/Quelea/icons/powerpointbig.png b/Quelea/icons/powerpointbig.png
diff --git a/Quelea/icons/pre_chorus-light.png b/Quelea/icons/pre_chorus-light.png
diff --git a/Quelea/icons/pre_chorus.png b/Quelea/icons/pre_chorus.png
diff --git a/Quelea/icons/prev.png b/Quelea/icons/prev.png
diff --git a/Quelea/icons/previous-light.png b/Quelea/icons/previous-light.png
diff --git a/Quelea/icons/previous.png b/Quelea/icons/previous.png
diff --git a/Quelea/icons/projector.png b/Quelea/icons/projector.png
diff --git a/Quelea/icons/propresenter.png b/Quelea/icons/propresenter.png
diff --git a/Quelea/icons/record-light.png b/Quelea/icons/record-light.png
diff --git a/Quelea/icons/record.png b/Quelea/icons/record.png
diff --git a/Quelea/icons/record_stop.png b/Quelea/icons/record_stop.png
diff --git a/Quelea/icons/removedb-light.png b/Quelea/icons/removedb-light.png
diff --git a/Quelea/icons/removedb.png b/Quelea/icons/removedb.png
diff --git a/Quelea/icons/right.png b/Quelea/icons/right.png
diff --git a/Quelea/icons/settings.png b/Quelea/icons/settings.png
diff --git a/Quelea/icons/sm.png b/Quelea/icons/sm.png
diff --git a/Quelea/icons/sof.png b/Quelea/icons/sof.png
diff --git a/Quelea/icons/songbeamer.png b/Quelea/icons/songbeamer.png
diff --git a/Quelea/icons/songpro.png b/Quelea/icons/songpro.png
diff --git a/Quelea/icons/square wedges.png b/Quelea/icons/square wedges.png
diff --git a/Quelea/icons/stage.png b/Quelea/icons/stage.png
diff --git a/Quelea/icons/stop.png b/Quelea/icons/stop.png
diff --git a/Quelea/icons/stopdisable.png b/Quelea/icons/stopdisable.png
diff --git a/Quelea/icons/sundayplus.png b/Quelea/icons/sundayplus.png
diff --git a/Quelea/icons/tag_coda-light.png b/Quelea/icons/tag_coda-light.png
diff --git a/Quelea/icons/tag_coda.png b/Quelea/icons/tag_coda.png
diff --git a/Quelea/icons/testbars.png b/Quelea/icons/testbars.png
diff --git a/Quelea/icons/text.png b/Quelea/icons/text.png
diff --git a/Quelea/icons/theme.png b/Quelea/icons/theme.png
diff --git a/Quelea/icons/tick.png b/Quelea/icons/tick.png
diff --git a/Quelea/icons/timer-dark-light.png b/Quelea/icons/timer-dark-light.png
diff --git a/Quelea/icons/timer-dark.png b/Quelea/icons/timer-dark.png
diff --git a/Quelea/icons/timer-small-light.png b/Quelea/icons/timer-small-light.png
diff --git a/Quelea/icons/timer-small.png b/Quelea/icons/timer-small.png
diff --git a/Quelea/icons/timer.png b/Quelea/icons/timer.png
diff --git a/Quelea/icons/translate.png b/Quelea/icons/translate.png
diff --git a/Quelea/icons/translate_on.png b/Quelea/icons/translate_on.png
diff --git a/Quelea/icons/transpose.png b/Quelea/icons/transpose.png
diff --git a/Quelea/icons/up-light.png b/Quelea/icons/up-light.png
diff --git a/Quelea/icons/up.png b/Quelea/icons/up.png
diff --git a/Quelea/icons/update.png b/Quelea/icons/update.png
diff --git a/Quelea/icons/verse-light.png b/Quelea/icons/verse-light.png
diff --git a/Quelea/icons/verse.png b/Quelea/icons/verse.png
diff --git a/Quelea/icons/vid preview.png b/Quelea/icons/vid preview.png
diff --git a/Quelea/icons/video file big.png b/Quelea/icons/video file big.png
diff --git a/Quelea/icons/video file-light.png b/Quelea/icons/video file-light.png
diff --git a/Quelea/icons/video file.png b/Quelea/icons/video file.png
diff --git a/Quelea/icons/video.png b/Quelea/icons/video.png
diff --git a/Quelea/icons/web preview.png b/Quelea/icons/web preview.png
diff --git a/Quelea/icons/web-light.png b/Quelea/icons/web-light.png
diff --git a/Quelea/icons/web-schedule.png b/Quelea/icons/web-schedule.png
diff --git a/Quelea/icons/web-small-light.png b/Quelea/icons/web-small-light.png
diff --git a/Quelea/icons/web-small.png b/Quelea/icons/web-small.png
diff --git a/Quelea/icons/web.png b/Quelea/icons/web.png
diff --git a/Quelea/icons/website.png b/Quelea/icons/website.png
diff --git a/Quelea/icons/whitearrow.png b/Quelea/icons/whitearrow.png
diff --git a/Quelea/icons/wiki.png b/Quelea/icons/wiki.png
diff --git a/Quelea/icons/worshiphim.png b/Quelea/icons/worshiphim.png
diff --git a/Quelea/icons/zionworx.png b/Quelea/icons/zionworx.png
diff --git a/Quelea/src/main/java/org/quelea/services/importexport/ImportDialog.java b/Quelea/src/main/java/org/quelea/services/importexport/ImportDialog.java
@@ -94,7 +94,7 @@ public ImportDialog(String[] dialogLabels, ExtensionFilter fileFilter,
 		files = new ArrayList<>();
 		halt = false;
 		importedDialog = new SelectImportedSongsDialog();
-		importButton = new Button(LabelGrabber.INSTANCE.getLabel("import.button"), new ImageView(new Image("file:icons/ic-import.png", 16, 16, true, false)));
+		importButton = new Button(LabelGrabber.INSTANCE.getLabel("import.button"), new ImageView(new Image(QueleaProperties.get().getUseDarkTheme() ? "file:icons/ic-import-light.png" : "file:icons/ic-import.png", 16, 16, true, false)));
 
 		VBox mainPane = new VBox();
 		final FileChooser locationChooser = new FileChooser();

diff --git a/Quelea/src/main/java/org/quelea/windows/library/LibraryPopupMenu.java b/Quelea/src/main/java/org/quelea/windows/library/LibraryPopupMenu.java
@@ -27,6 +27,7 @@
 import org.quelea.data.displayable.SongDisplayable;
 import org.quelea.services.languages.LabelGrabber;
 import org.quelea.services.print.Printer;
+import org.quelea.services.utils.QueleaProperties;
 import org.quelea.windows.main.QueleaApp;
 import org.quelea.windows.main.actionhandlers.AddSongActionHandler;
 import org.quelea.windows.main.actionhandlers.EditSongDBActionHandler;
@@ -58,15 +59,15 @@ public LibraryPopupMenu() {
         addToSchedule.setOnAction(new AddSongActionHandler(true));
         copyToSchedule = new MenuItem(LabelGrabber.INSTANCE.getLabel("library.copy.to.schedule.text"), new ImageView(new Image("file:icons/ic-copy.png", 16, 16, false, true)));
         copyToSchedule.setOnAction(new AddSongActionHandler(false));
-        preview = new MenuItem(LabelGrabber.INSTANCE.getLabel("library.preview.song.text"), new ImageView(new Image("file:icons/ic-preview.png", 16, 16, false, true)));
+        preview = new MenuItem(LabelGrabber.INSTANCE.getLabel("library.preview.song.text"), new ImageView(new Image(QueleaProperties.get().getUseDarkTheme() ? "file:icons/ic-preview-light.png" :"file:icons/ic-preview.png", 16, 16, false, true)));
         preview.setOnAction(new PreviewSongActionHandler());
-        editDB = new MenuItem(LabelGrabber.INSTANCE.getLabel("library.edit.song.text"), new ImageView(new Image("file:icons/ic-edit.png", 16, 16, false, true)));
+        editDB = new MenuItem(LabelGrabber.INSTANCE.getLabel("library.edit.song.text"), new ImageView(new Image(QueleaProperties.get().getUseDarkTheme() ? "file:icons/ic-edit-light.png" :"file:icons/ic-edit.png", 16, 16, false, true)));
         editDB.setOnAction(new EditSongDBActionHandler());
         removeFromDB = new MenuItem(LabelGrabber.INSTANCE.getLabel("library.remove.song.text"), new ImageView(new Image("file:icons/ic-delete-gray.png", 16, 16, false, true)));
         removeFromDB.setOnAction(new RemoveSongDBActionHandler());
         exportToPDF = new MenuItem(LabelGrabber.INSTANCE.getLabel("export.pdf.button"), new ImageView(new Image("file:icons/ic-pdf.png", 16, 16, false, true)));
         exportToPDF.setOnAction(new ExportPDFSongActionHandler());
-        print = new MenuItem(LabelGrabber.INSTANCE.getLabel("library.print.song.text"), new ImageView(new Image("file:icons/ic-print.png", 16, 16, false, true)));
+        print = new MenuItem(LabelGrabber.INSTANCE.getLabel("library.print.song.text"), new ImageView(new Image(QueleaProperties.get().getUseDarkTheme() ? "file:icons/ic-print-light.png" :"file:icons/ic-print.png", 16, 16, false, true)));
         print.setOnAction(new EventHandler<ActionEvent>() {
 
             @Override

diff --git a/Quelea/src/main/java/org/quelea/windows/main/ThemePreviewPanel.java b/Quelea/src/main/java/org/quelea/windows/main/ThemePreviewPanel.java
@@ -46,6 +46,7 @@
 import org.quelea.data.ThemeDTO;
 import org.quelea.services.languages.LabelGrabber;
 import org.quelea.services.utils.LoggerUtils;
+import org.quelea.services.utils.QueleaProperties;
 import org.quelea.windows.lyrics.LyricDrawer;
 import org.quelea.windows.main.DisplayCanvas.Priority;
 import org.quelea.windows.main.schedule.ScheduleThemeNode;
@@ -105,7 +106,7 @@ public void updateCallback() {
         songSelectButton = new RadioButton(LabelGrabber.INSTANCE.getLabel("song.default.theme.label"));
         bibleSelectButton = new RadioButton(LabelGrabber.INSTANCE.getLabel("bible.default.theme.label"));
         if (theme != ThemeDTO.DEFAULT_THEME) {
-            editButton = new Button("", new ImageView(new Image("file:icons/ic-edit.png", 16, 16, false, true)));
+            editButton = new Button("", new ImageView(new Image(QueleaProperties.get().getUseDarkTheme() ? "file:icons/ic-edit-light.png" : "file:icons/ic-edit.png", 16, 16, false, true)));
             editButton.setTooltip(new Tooltip(LabelGrabber.INSTANCE.getLabel("edit.theme.tooltip")));
             editButton.setOnAction(new EventHandler<javafx.event.ActionEvent>() {
                 @Override

diff --git a/Quelea/src/main/java/org/quelea/windows/main/menus/ExportMenu.java b/Quelea/src/main/java/org/quelea/windows/main/menus/ExportMenu.java
@@ -40,6 +40,7 @@
 import org.quelea.services.importexport.SongListExporter;
 import org.quelea.services.languages.LabelGrabber;
 import org.quelea.services.utils.FileFilters;
+import org.quelea.services.utils.QueleaProperties;
 import org.quelea.windows.main.QueleaApp;
 
 /**
@@ -58,7 +59,7 @@ public class ExportMenu extends Menu {
      * Create the export menu.
      */
     public ExportMenu() {
-        super(LabelGrabber.INSTANCE.getLabel("export.heading"), new ImageView(new Image("file:icons/ic-export.png", 16, 16, false, true)));
+        super(LabelGrabber.INSTANCE.getLabel("export.heading"), new ImageView(new Image(QueleaProperties.get().getUseDarkTheme() ? "file:icons/ic-export-light.png" : "file:icons/ic-export.png", 16, 16, false, true)));
 
         qspItem = new MenuItem(LabelGrabber.INSTANCE.getLabel("qsp.button"), new ImageView(new Image("file:icons/logo16.png", 16, 16, false, true)));
         qspItem.setOnAction(evt -> {
@@ -87,7 +88,7 @@ public ExportMenu() {
 		});
         getItems().add(pdfItem);
 
-        listItem = new MenuItem(LabelGrabber.INSTANCE.getLabel("song.list"), new ImageView(new Image("file:icons/ic-list.png", 16, 16, false, true)));
+        listItem = new MenuItem(LabelGrabber.INSTANCE.getLabel("song.list"), new ImageView(new Image(QueleaProperties.get().getUseDarkTheme() ? "file:icons/ic-list-light.png" :"file:icons/ic-list.png", 16, 16, false, true)));
         listItem.setOnAction(evt -> {
 			FileChooser fc = new FileChooser();
 			fc.getExtensionFilters().add(FileFilters.CSV);

diff --git a/Quelea/src/main/java/org/quelea/windows/main/menus/FileMenu.java b/Quelea/src/main/java/org/quelea/windows/main/menus/FileMenu.java
@@ -91,7 +91,7 @@ public FileMenu() {
 
         exportToPDFItem = new MenuItem(LabelGrabber.INSTANCE.getLabel("export.schedule.pdf.button"));
         if(!Utils.isMac()) {
-            exportToPDFItem.setGraphic(new ImageView(new Image("file:icons/ic-pdf.png", 20, 20, true, false)));
+            exportToPDFItem.setGraphic(getImage("file:icons/ic-pdf.png"));
         }
         exportToPDFItem.setOnAction(new ExportPDFScheduleActionHandler());
         getItems().add(exportToPDFItem);
@@ -106,7 +106,7 @@ public FileMenu() {
 
         exitItem = new MenuItem(LabelGrabber.INSTANCE.getLabel("exit.button"));
         if(!Utils.isMac()) {
-            exitItem.setGraphic(new ImageView(new Image("file:icons/ic-exit.png", 20, 20, true, false)));
+            exitItem.setGraphic(getImage("file:icons/ic-exit.png"));
         }
         exitItem.setOnAction(new ExitActionHandler());
         getItems().add(exitItem);

diff --git a/Quelea/src/main/java/org/quelea/windows/main/menus/HelpMenu.java b/Quelea/src/main/java/org/quelea/windows/main/menus/HelpMenu.java
@@ -64,12 +64,12 @@ public HelpMenu() {
                 launchPage(QueleaProperties.get().getFacebookPageLocation());
             });
             getItems().add(queleaFacebook);
-            queleaDiscuss = new MenuItem(LabelGrabber.INSTANCE.getLabel("help.menu.discussion"), new ImageView(new Image("file:icons/ic-discuss.png", 16, 16, false, true)));
+            queleaDiscuss = new MenuItem(LabelGrabber.INSTANCE.getLabel("help.menu.discussion"), new ImageView(new Image(QueleaProperties.get().getUseDarkTheme() ?"file:icons/ic-discuss-light.png":"file:icons/ic-discuss.png", 16, 16, false, true)));
             queleaDiscuss.setOnAction(t -> {
                 launchPage(QueleaProperties.get().getDiscussLocation());
             });
             getItems().add(queleaDiscuss);
-            queleaWiki = new MenuItem(LabelGrabber.INSTANCE.getLabel("help.menu.wiki"), new ImageView(new Image("file:icons/ic-manual.png", 16, 16, false, true)));
+            queleaWiki = new MenuItem(LabelGrabber.INSTANCE.getLabel("help.menu.wiki"), new ImageView(new Image(QueleaProperties.get().getUseDarkTheme() ?"file:icons/ic-manual-light.png":"file:icons/ic-manual.png", 16, 16, false, true)));
             queleaWiki.setOnAction(t -> {
                 launchPage(QueleaProperties.get().getWikiPageLocation());
             });
@@ -79,7 +79,7 @@ public HelpMenu() {
             queleaFacebook = null;
             queleaWiki = null;
         }
-        updateCheck = new MenuItem(LabelGrabber.INSTANCE.getLabel("help.menu.update"), new ImageView(new Image("file:icons/ic-update.png", 16, 16, false, true)));
+        updateCheck = new MenuItem(LabelGrabber.INSTANCE.getLabel("help.menu.update"), new ImageView(new Image(QueleaProperties.get().getUseDarkTheme() ?"file:icons/ic-update-light.png":"file:icons/ic-update.png", 16, 16, false, true)));
         updateCheck.setOnAction(t -> {
             new UpdateChecker().checkUpdate(true, true, true);
         });

diff --git a/Quelea/src/main/java/org/quelea/windows/main/menus/ImportMenu.java b/Quelea/src/main/java/org/quelea/windows/main/menus/ImportMenu.java
@@ -54,6 +54,7 @@
 import org.quelea.services.importexport.ScreenMonkeyImportDialog;
 import org.quelea.services.importexport.WorshipHimImportDialog;
 import org.quelea.services.languages.LabelGrabber;
+import org.quelea.services.utils.QueleaProperties;
 import org.quelea.services.utils.Utils;
 
 /**
@@ -118,7 +119,7 @@ public class ImportMenu extends Menu {
      * Create the import menu.
      */
     public ImportMenu() {
-        super(LabelGrabber.INSTANCE.getLabel("import.heading"), new ImageView(new Image("file:icons/ic-import.png", 16, 16, false, true)));
+        super(LabelGrabber.INSTANCE.getLabel("import.heading"), new ImageView(new Image(QueleaProperties.get().getUseDarkTheme() ? "file:icons/ic-import-light.png" : "file:icons/ic-import.png", 16, 16, false, true)));
 
         qspImportDialog = new QSPImportDialog();
         openSongImportDialog = new OpenSongImportDialog();

diff --git a/Quelea/src/main/java/org/quelea/windows/main/menus/ToolsMenu.java b/Quelea/src/main/java/org/quelea/windows/main/menus/ToolsMenu.java
@@ -91,7 +91,7 @@ public void handle(ActionEvent t) {
         }
         getItems().add(liveTextItem);
 
-        optionsItem = new MenuItem(LabelGrabber.INSTANCE.getLabel("options.button"), new ImageView(new Image("file:icons/ic-options.png", 20, 20, false, true)));
+        optionsItem = new MenuItem(LabelGrabber.INSTANCE.getLabel("options.button"), new ImageView(new Image(darkTheme ? "file:icons/ic-options-light.png" : "file:icons/ic-options.png", 20, 20, false, true)));
         optionsItem.setAccelerator(new KeyCodeCombination(KeyCode.T, KeyCombination.SHORTCUT_DOWN));
         optionsItem.setOnAction(new ShowOptionsActionHandler());
 

diff --git a/Quelea/src/main/java/org/quelea/windows/main/schedule/ScheduleListNode.java b/Quelea/src/main/java/org/quelea/windows/main/schedule/ScheduleListNode.java
@@ -30,6 +30,7 @@
 import org.quelea.data.displayable.Displayable;
 import org.quelea.data.displayable.TextDisplayable;
 import org.quelea.data.displayable.TimerDisplayable;
+import org.quelea.services.utils.QueleaProperties;
 import org.quelea.services.utils.Utils;
 import org.quelea.windows.main.actionhandlers.EditThemeScheduleActionHandler;
 import org.quelea.windows.main.actionhandlers.EditTimerThemeActionHandler;
@@ -47,7 +48,7 @@ public ScheduleListNode(Displayable displayable) {
         super(10);
         setAlignment(Pos.CENTER_LEFT);
         ImageView icon = displayable.getPreviewIcon();
-        liveIcon = new ImageView(new Image("file:icons/ic-livedot.png"));
+        liveIcon = new ImageView(new Image("file:icons/ic-livedot.png",16,16,false,true));
         liveIcon.setFitHeight(10);
         liveIcon.setFitWidth(10);
         liveIcon.setVisible(false);
@@ -56,7 +57,7 @@ public ScheduleListNode(Displayable displayable) {
         getChildren().add(liveIcon);
 
         if (displayable instanceof TextDisplayable || displayable instanceof TimerDisplayable) {
-            themeButton = new Button("", new ImageView(new Image("file:icons/ic-theme-small.png", 16, 16, false, true)));
+            themeButton = new Button("", new ImageView(new Image(QueleaProperties.get().getUseDarkTheme() ? "file:icons/ic-theme-light.png" :"file:icons/ic-theme.png", 16, 16, false, true)));
             if (displayable instanceof TextDisplayable) {
                 themeButton.setOnAction(new EditThemeScheduleActionHandler((TextDisplayable) displayable));
             } else {

diff --git a/Quelea/src/main/java/org/quelea/windows/main/schedule/SchedulePanel.java b/Quelea/src/main/java/org/quelea/windows/main/schedule/SchedulePanel.java
@@ -77,7 +77,7 @@ public class SchedulePanel extends BorderPane {
      */
     public SchedulePanel() {
         boolean darkTheme = QueleaProperties.get().getUseDarkTheme();
-        ImageView themeButtonIcon = new ImageView(new Image("file:icons/ic-theme.png"));
+        ImageView themeButtonIcon = new ImageView(new Image(QueleaProperties.get().getUseDarkTheme() ? "file:icons/ic-theme-light.png" : "file:icons/ic-theme.png"));
         themeButtonIcon.setFitWidth(16);
         themeButtonIcon.setFitHeight(16);
         themeButton = new Button("", themeButtonIcon);

diff --git a/Quelea/src/main/java/org/quelea/windows/main/schedule/SchedulePopupMenu.java b/Quelea/src/main/java/org/quelea/windows/main/schedule/SchedulePopupMenu.java
@@ -28,6 +28,7 @@
 import org.quelea.data.displayable.SongDisplayable;
 import org.quelea.data.displayable.TimerDisplayable;
 import org.quelea.services.languages.LabelGrabber;
+import org.quelea.services.utils.QueleaProperties;
 import org.quelea.windows.main.QueleaApp;
 import org.quelea.windows.main.actionhandlers.EditSongScheduleActionHandler;
 import org.quelea.windows.main.actionhandlers.EditThemeScheduleActionHandler;
@@ -43,12 +44,12 @@
  */
 public class SchedulePopupMenu extends ContextMenu {
 
-    private final MenuItem editSong = new MenuItem(LabelGrabber.INSTANCE.getLabel("edit.song.text"), new ImageView(new Image("file:icons/ic-edit.png", 16, 16, false, true)));
-    private final MenuItem editTheme = new MenuItem(LabelGrabber.INSTANCE.getLabel("edit.theme.text"), new ImageView(new Image("file:icons/ic-edit.png", 16, 16, false, true)));
+    private final MenuItem editSong = new MenuItem(LabelGrabber.INSTANCE.getLabel("edit.song.text"), new ImageView(new Image(QueleaProperties.get().getUseDarkTheme() ? "file:icons/ic-edit-light.png" : "file:icons/ic-edit.png", 16, 16, false, true)));
+    private final MenuItem editTheme = new MenuItem(LabelGrabber.INSTANCE.getLabel("edit.theme.text"), new ImageView(new Image(QueleaProperties.get().getUseDarkTheme() ? "file:icons/ic-edit-light.png" :"file:icons/ic-edit.png", 16, 16, false, true)));
     private final MenuItem changeBibleVersion = new MenuItem(LabelGrabber.INSTANCE.getLabel("change.bible.version.text"), new ImageView(new Image("file:icons/ic-bible.png", 16, 16, false, true)));
     private final MenuItem translationChoice = new MenuItem(LabelGrabber.INSTANCE.getLabel("choose.translations.text"), new ImageView(new Image("file:icons/ic-translate.png", 16, 16, false, true)));
-    private final MenuItem editTimer = new MenuItem(LabelGrabber.INSTANCE.getLabel("edit.timer.text"), new ImageView(new Image("file:icons/timer-dark.png", 16, 16, false, true)));
-    private final MenuItem editTimerTheme = new MenuItem(LabelGrabber.INSTANCE.getLabel("edit.theme.text"), new ImageView(new Image("file:icons/ic-theme-small.png", 16, 16, false, true)));
+    private final MenuItem editTimer = new MenuItem(LabelGrabber.INSTANCE.getLabel("edit.timer.text"), new ImageView(new Image(QueleaProperties.get().getUseDarkTheme() ? "file:icons/ic-timer-light.png" :"file:icons/ic-timer.png", 16, 16, false, true)));
+    private final MenuItem editTimerTheme = new MenuItem(LabelGrabber.INSTANCE.getLabel("edit.theme.text"), new ImageView(new Image(QueleaProperties.get().getUseDarkTheme() ? "file:icons/ic-theme-light.png" :"file:icons/ic-theme.png", 16, 16, false, true)));
 
 
     public SchedulePopupMenu(Displayable item) {

diff --git a/Quelea/src/main/java/org/quelea/windows/main/toolbars/MainToolbar.java b/Quelea/src/main/java/org/quelea/windows/main/toolbars/MainToolbar.java
@@ -214,7 +214,7 @@ public MainToolbar() {
         if (Utils.isMac()) {
             dvdIV = new ImageView(new Image("file:icons/ic-sch-dvd.png",24,24,false,true));
         } else {
-            dvdIV = new ImageView(new Image(QueleaProperties.get().getUseDarkTheme() ? "file:icons/ic-sch-dvd-light.png" : "file:icons/ic-sch-dvd.png", 24, 24, false, true));
+            dvdIV = new ImageView(new Image("file:icons/ic-sch-dvd.png", 24, 24, false, true));
         }
         dvdIV.setFitWidth(24);
         dvdIV.setFitHeight(24);
@@ -344,7 +344,7 @@ private ToggleButton getToggleButtonFromImage(String uri) {
     }
 
     private Button getButtonFromImage(String uri, int width, int height, boolean preserveRatio, boolean smooth) {
-        ImageView iv = new ImageView(new Image(uri, width, height, preserveRatio, smooth));
+        ImageView iv = new ImageView(new Image(QueleaProperties.get().getUseDarkTheme() ? uri.replace(".png", "-light.png") : uri, width, height, preserveRatio, smooth));
         iv.setSmooth(true);
         iv.setFitWidth(24);
         iv.setFitHeight(24);

diff --git a/Quelea/src/main/java/org/quelea/windows/newsong/BasicSongPanel.java b/Quelea/src/main/java/org/quelea/windows/newsong/BasicSongPanel.java
@@ -273,7 +273,7 @@ private Button getTitleButton(String fileName, String label, String titleName) {
      * @return the sequence button
      */
     private Button getSequenceButton() {
-        Button ret = new Button("", new ImageView(new Image("file:icons/ic-edit.png", 20, 20, false, true)));
+        Button ret = new Button("", new ImageView(new Image(QueleaProperties.get().getUseDarkTheme() ? "file:icons/ic-edit-light.png" :"file:icons/ic-edit.png", 20, 20, false, true)));
         ret.setTooltip(new Tooltip(LabelGrabber.INSTANCE.getLabel("sequence.tooltip")));
         ret.setOnAction((event) -> {
             SequenceSelectionDialog sequenceSelectionDialog = new SequenceSelectionDialog();