diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt
index 294e64424..64e1cb197 100644
--- a/builtin/settingtypes.txt
+++ b/builtin/settingtypes.txt
@@ -625,11 +625,6 @@ secondstage_gamma (Gamma) float 1.6 1.0 5.0
 #   Requires: enable_post_processing
 enable_color_grading (Color grading) bool false
 
-#   Apply vignette effect to darken the edges of the screen.
-#
-#   Requires: enable_post_processing
-enable_vignette (Vignette) bool false
-
 #    Apply dithering to reduce color banding artifacts.
 #    Dithering significantly increases the size of losslessly-compressed
 #    screenshots and it works incorrectly if the display or operating system
diff --git a/client/shaders/nodes_shader/opengl_fragment.glsl b/client/shaders/nodes_shader/opengl_fragment.glsl
index f8f5f4d57..a8e5e1768 100644
--- a/client/shaders/nodes_shader/opengl_fragment.glsl
+++ b/client/shaders/nodes_shader/opengl_fragment.glsl
@@ -546,7 +546,7 @@ void main(void)
 		col.rgb += reflection_color * pow(fresnel_factor, 2.0) * 0.5 * brightness_factor;
 
 		vec3 water_reflect_color = 
-			6.0 * sunTint * dayLight * fresnel_factor * f_adj_shadow_strength * max(1.0 - shadow_uncorrected, 0.0) * 
+			6.0 * sunTint * dayLight * fresnel_factor * f_adj_shadow_strength * max(1.0 - shadow_uncorrected, 0.0) *
 			mtsmoothstep(0.85, 0.9, pow(clamp(dot(reflect_ray, viewVec), 0.0, 1.0), 32.0));
 
 		// We clip the reflection color if it gets too bright
diff --git a/client/shaders/second_stage/opengl_fragment.glsl b/client/shaders/second_stage/opengl_fragment.glsl
index ecfe94cf6..89cea2a2e 100644
--- a/client/shaders/second_stage/opengl_fragment.glsl
+++ b/client/shaders/second_stage/opengl_fragment.glsl
@@ -150,7 +150,7 @@ void main(void)
 #endif
 	{
 
-		color.rgb *= (vignette_bright - vignette_dark) * (1.0 - pow(length(uv - vec2(0.5)) * 1.4, vignette_power)) + vignette_dark;
+	color.rgb *= (vignette_bright - vignette_dark) * (1.0 - pow(length(uv - vec2(0.5)) * 1.4, vignette_power)) + vignette_dark;
 
 #if ENABLE_TONE_MAPPING
 		color = applyToneMapping(color);
diff --git a/src/client/game.cpp b/src/client/game.cpp
index 8d5460f7c..b27db749b 100644
--- a/src/client/game.cpp
+++ b/src/client/game.cpp
@@ -548,12 +548,10 @@ public:
 		float gamma = m_gamma;
 		m_gamma_pixel.set(&gamma, services);
 
-		if (g_settings->getBool("enable_vignette")) {
-			const Vignette &vignette_params = lighting.vignette;
-			m_vignette_dark_pixel.set(&vignette_params.dark, services);
-			m_vignette_bright_pixel.set(&vignette_params.bright, services);
-			m_vignette_power_pixel.set(&vignette_params.power, services);
-		}
+		const Vignette &vignette_params = lighting.vignette;
+		m_vignette_dark_pixel.set(&vignette_params.dark, services);
+		m_vignette_bright_pixel.set(&vignette_params.bright, services);
+		m_vignette_power_pixel.set(&vignette_params.power, services);
 
 		if (g_settings->getBool("enable_color_grading")) {
 			const ColorDecisionList& cdl_params = lighting.cdl;