diff --git a/index.html b/index.html
index 1071d774..4e1e33d1 100644
--- a/index.html
+++ b/index.html
@@ -103,6 +103,9 @@
                 chatPlaceholder: 'Type your chat message here...',
                 chatErrorUnknown: 'Unexpected error while sending chat message',
                 chatErrorDisabled: 'Chat is not enabled',
+                day: "Day",
+                night: "Night",
+                nightDay: "Night and Day",
             	serversHeading: 'Servers',
                 markersHeading: 'Markers',
                 markersSearchPlaceholder: 'Search markers...',
diff --git a/messages.ts b/messages.ts
index 4df4318c..e48d0d46 100644
--- a/messages.ts
+++ b/messages.ts
@@ -74,6 +74,9 @@ export const globalMessages = [
 	'logoutSuccess',
 	'closeTitle',
 	'showMore',
+	'day',
+	'night',
+	'nightDay',
 ] as const;
 
 export const serverMessages = [
diff --git a/src/assets/icons/day.svg b/src/assets/icons/day.svg
new file mode 100644
index 00000000..8660da84
--- /dev/null
+++ b/src/assets/icons/day.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="358.44" height="355.373"><path d="M252.36.995a11.212 11.212 0 0 1 6.655 8.25l13.796 74.802 74.802 13.727a11.212 11.212 0 0 1 8.25 6.655c1.456 3.467 1.04 7.418-1.109 10.538l-43.19 62.67 43.19 62.602c2.15 3.12 2.565 7.071 1.11 10.537a11.212 11.212 0 0 1-8.25 6.656l-74.803 13.796-13.796 74.802a11.212 11.212 0 0 1-6.656 8.25c-3.466 1.456-7.417 1.04-10.537-1.109l-62.601-43.19-62.602 43.19c-3.12 2.15-7.071 2.565-10.537 1.11a11.212 11.212 0 0 1-6.656-8.25L85.63 271.227l-74.802-13.796a11.212 11.212 0 0 1-8.25-6.656c-1.456-3.466-1.04-7.417 1.11-10.537l43.19-62.601-43.19-62.602c-2.15-3.12-2.566-7.071-1.11-10.537a11.212 11.212 0 0 1 8.25-6.656L85.63 84.047 99.426 9.245a11.212 11.212 0 0 1 6.656-8.25c3.466-1.456 7.418-1.04 10.537 1.11l62.602 43.19 62.6-43.19c3.12-2.15 7.072-2.566 10.538-1.11zM112.667 177.638c0-36.757 29.796-66.553 66.553-66.553 36.756 0 66.553 29.796 66.553 66.553 0 36.756-29.797 66.553-66.553 66.553-36.757 0-66.553-29.797-66.553-66.553zm155.29 0c0-49.008-39.73-88.738-88.737-88.738-49.008 0-88.738 39.73-88.738 88.738s39.73 88.737 88.738 88.737 88.737-39.73 88.737-88.737z"/></svg>
\ No newline at end of file
diff --git a/src/assets/icons/night.svg b/src/assets/icons/night.svg
new file mode 100644
index 00000000..3a9b8c57
--- /dev/null
+++ b/src/assets/icons/night.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="358.44" height="355.373"><path d="M203.928.187c-97.863 0-177.104 79.479-177.104 177.5s79.241 177.5 177.104 177.5c48.02 0 91.523-19.177 123.457-50.239 3.962-3.883 4.992-9.905 2.457-14.818-2.536-4.913-8.004-7.686-13.471-6.736a139.07 139.07 0 0 1-23.852 2.06c-76.784 0-139.068-62.441-139.068-139.463 0-52.141 28.527-97.546 70.762-121.477 4.834-2.773 7.29-8.32 6.102-13.709-1.189-5.388-5.785-9.43-11.332-9.905C213.991.504 209 .266 203.928.266z"/></svg>
\ No newline at end of file
diff --git a/src/assets/icons/night_day.svg b/src/assets/icons/night_day.svg
new file mode 100644
index 00000000..c5296f1f
--- /dev/null
+++ b/src/assets/icons/night_day.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="358.44" height="355.373"><path d="M177.104 0C79.24 0 0 79.48 0 177.5S79.241 355 177.104 355c48.02 0 91.523-19.177 123.457-50.239 3.962-3.883 4.992-9.905 2.457-14.818-2.536-4.913-8.004-7.686-13.471-6.736a139.07 139.07 0 0 1-23.852 2.06c-76.784 0-139.068-62.441-139.068-139.463 0-52.141 28.527-97.546 70.762-121.477 4.834-2.773 7.29-8.32 6.102-13.709-1.189-5.388-5.785-9.43-11.332-9.905-4.992-.396-9.984-.634-15.055-.634z"/><path d="M299.493 47.947a6.291 6.291 0 0 1 3.735 4.629l7.741 41.973 41.973 7.702a6.291 6.291 0 0 1 4.63 3.735 6.18 6.18 0 0 1-.623 5.912l-24.235 35.166 24.235 35.127a6.18 6.18 0 0 1 .622 5.913 6.291 6.291 0 0 1-4.629 3.734l-41.973 7.741-7.741 41.973a6.291 6.291 0 0 1-3.735 4.63 6.18 6.18 0 0 1-5.912-.623l-35.127-24.235-35.127 24.235a6.18 6.18 0 0 1-5.913.622 6.291 6.291 0 0 1-3.734-4.629l-7.741-41.973-41.973-7.741a6.291 6.291 0 0 1-4.63-3.734 6.18 6.18 0 0 1 .623-5.913l24.235-35.127-24.235-35.127a6.18 6.18 0 0 1-.622-5.912 6.291 6.291 0 0 1 4.629-3.735l41.973-7.741 7.741-41.973a6.291 6.291 0 0 1 3.734-4.63 6.18 6.18 0 0 1 5.913.623l35.127 24.235 35.127-24.235a6.18 6.18 0 0 1 5.912-.622zm-78.383 99.117c0-20.625 16.72-37.344 37.344-37.344 20.625 0 37.344 16.72 37.344 37.344 0 20.625-16.72 37.344-37.344 37.344-20.625 0-37.344-16.72-37.344-37.344zm87.136 0c0-27.5-22.293-49.792-49.792-49.792-27.5 0-49.792 22.293-49.792 49.792 0 27.5 22.293 49.792 49.792 49.792 27.5 0 49.792-22.293 49.792-49.792z"/></svg>
\ No newline at end of file
diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue
index 71c03f3b..177895de 100644
--- a/src/components/Sidebar.vue
+++ b/src/components/Sidebar.vue
@@ -17,6 +17,13 @@
 <template>
 	<section class="sidebar" role="none" ref="sidebar">
 		<header class="sidebar__buttons">
+			<button ref="nightDay-button" v-if="nightDay" type="button"
+              class="button--night-day"
+              :title="nightDayMode === 'night' ? messageNight : nightDayMode === 'day' ? messageDay : messageNightDay"
+              :aria-label="nightDayMode === 'night' ? messageNight : nightDayMode === 'day' ? messageDay : messageNightDay"
+              @click="handleNightDayClick">
+			<SvgIcon :name="nightDayMode"></SvgIcon>
+			</button>
 			<button ref="maps-button" v-if="mapCount > 1 || serverCount > 1" type="button"
               class="button--maps" data-section="maps"
               :title="mapCount > 1 ? messageWorlds : messageServers"
@@ -67,6 +74,9 @@ import "@/assets/icons/players.svg";
 import "@/assets/icons/maps.svg";
 import "@/assets/icons/servers.svg";
 import "@/assets/icons/marker_point.svg";
+import "@/assets/icons/day.svg";
+import "@/assets/icons/night.svg";
+import "@/assets/icons/night_day.svg";
 
 export default defineComponent({
 	components: {
@@ -90,11 +100,17 @@ export default defineComponent({
 			serverCount = computed(() => store.state.servers.size),
 			following = computed(() => store.state.followTarget),
 
+			nightDay = computed(() => store.state.currentMap?.nightAndDay),
+			nightDayMode = computed(() => store.state.components.nightDay.mode),
+			
 			messageWorlds = computed(() => store.state.messages.worldsHeading),
 			messageServers = computed(() => store.state.messages.serversHeading),
 			messageMarkers = computed(() => store.state.messages.markersHeading),
 			messagePlayers = computed(() => store.getters.playersHeading),
-
+			messageDay = computed(() => store.state.messages.day),
+			messageNight = computed(() => store.state.messages.night),
+			messageNightDay = computed(() => store.state.messages.nightDay),
+			
 			markerUIEnabled = computed(() => store.getters.markerUIEnabled),
 			playerMakersEnabled = computed(() => store.getters.playerMarkersEnabled),
 
@@ -142,6 +158,14 @@ export default defineComponent({
 			}
 		}
 
+		const handleNightDayClick = () => {
+			const modes = ['day', 'night', 'night_day'],
+				currentMode = modes.indexOf(nightDayMode.value),
+				nextMode = modes[(currentMode + 1) % modes.length];
+
+			store.state.components.nightDay.mode = nextMode;
+		}
+
 		//Move focus when sidebar sections become visible
 		const focusSection = (section: LiveAtlasSidebarSection) => focus(`[data-section=${section}] .section__heading button`);
 
@@ -157,10 +181,16 @@ export default defineComponent({
 			serverCount,
 			following,
 
+			nightDay,
+			nightDayMode,
+
 			messageWorlds,
 			messageServers,
 			messageMarkers,
 			messagePlayers,
+			messageDay,
+			messageNight,
+			messageNightDay,
 
 			previouslyVisible,
 			playersVisible,
@@ -173,6 +203,7 @@ export default defineComponent({
 			handleSidebarKeydown,
 			handleSectionKeydown,
 			handleSectionClick,
+			handleNightDayClick
 		}
 	},
 });
diff --git a/src/index.d.ts b/src/index.d.ts
index f7964de0..a0a236ed 100644
--- a/src/index.d.ts
+++ b/src/index.d.ts
@@ -274,6 +274,10 @@ interface LiveAtlasComponentConfig {
 	markers: {
 		showLabels: boolean;
 	};
+	nightDay: {
+		mode: string;
+		value: number;
+	};
 	players: {
 		markers?: LiveAtlasPlayerMarkerConfig;
 		showImages: boolean;
diff --git a/src/leaflet/tileLayer/DynmapTileLayer.ts b/src/leaflet/tileLayer/DynmapTileLayer.ts
index f2252a3b..d588a7c2 100644
--- a/src/leaflet/tileLayer/DynmapTileLayer.ts
+++ b/src/leaflet/tileLayer/DynmapTileLayer.ts
@@ -32,6 +32,7 @@ export class DynmapTileLayer extends LiveAtlasTileLayer {
 	private readonly _store: Store = useStore();
 
 	private readonly _night: ComputedRef<boolean>;
+	private readonly _nightDayMode: ComputedRef<string>;
 	private readonly _pendingUpdates: ComputedRef<boolean>;
 	private _nightUnwatch: WatchStopHandle | null = null;
 	private _updateUnwatch: WatchStopHandle | null = null;
@@ -42,7 +43,8 @@ export class DynmapTileLayer extends LiveAtlasTileLayer {
 
 		this._namedTiles = Object.seal(new Map());
 		this._pendingUpdates = computed(() => !!this._store.state.pendingTileUpdates.length);
-		this._night = computed(() => this._store.getters.night);
+		this._nightDayMode = computed(() => this._store.state.components.nightDay.mode);
+		this._night = computed(() => this._nightDayMode.value === "night_day" ? this._store.getters.night : this._nightDayMode.value === "night");
 	}
 
 	onAdd(map: LeafletMap) {
diff --git a/src/providers/OverviewerMapProvider.ts b/src/providers/OverviewerMapProvider.ts
index c6989443..303f7f09 100644
--- a/src/providers/OverviewerMapProvider.ts
+++ b/src/providers/OverviewerMapProvider.ts
@@ -243,6 +243,11 @@ export default class OverviewerMapProvider extends MapProvider {
 				showLabels: false,
 			},
 
+			nightDay: {
+				mode: "night_day",
+				value: -1
+			},
+
 			//Not used by Overviewer
 			players: {
 				markers: undefined,
diff --git a/src/providers/Pl3xmapMapProvider.ts b/src/providers/Pl3xmapMapProvider.ts
index 30d302cc..b6293551 100644
--- a/src/providers/Pl3xmapMapProvider.ts
+++ b/src/providers/Pl3xmapMapProvider.ts
@@ -231,6 +231,11 @@ export default class Pl3xmapMapProvider extends MapProvider {
 				showLabels: false,
 			},
 
+			nightDay: {
+				mode: "night_day",
+				value: -1
+			},
+
 			//Not used by pl3xmap
 			chatBox: undefined,
 			chatBalloons: false,
diff --git a/src/store/state.ts b/src/store/state.ts
index ff6a359a..7619fa45 100644
--- a/src/store/state.ts
+++ b/src/store/state.ts
@@ -152,7 +152,10 @@ export const state: State = {
 		markers: {
 			showLabels: false,
 		},
-
+		nightDay: {
+			mode: "night_day",
+			value: -1
+		},
 		// Settings for player related UI elements and markers
 		players: {
 			// Settings for online player markers
diff --git a/src/util/dynmap.ts b/src/util/dynmap.ts
index 3e5a744c..694ef983 100644
--- a/src/util/dynmap.ts
+++ b/src/util/dynmap.ts
@@ -170,6 +170,10 @@ export function buildComponents(response: Configuration, config: DynmapUrlConfig
 		markers: {
 			showLabels: false,
 		},
+		nightDay: {
+			mode: "night_day",
+			value: -1
+		},
 		chatBox: undefined,
 		chatBalloons: false,
 		players: {