diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0559a4dd4d..7bcc7d88b4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Allow spawning individual pet species, not just generic body kinds.
 - Configurable fonts
 - Tanslation status tracking
+- Added gamma setting
 
 ### Changed
 
diff --git a/assets/voxygen/i18n/en.ron b/assets/voxygen/i18n/en.ron
index e09f419d0a..f13969a9b5 100644
--- a/assets/voxygen/i18n/en.ron
+++ b/assets/voxygen/i18n/en.ron
@@ -208,6 +208,7 @@ Enjoy your stay in the World of Veloren."#,
         "hud.settings.view_distance": "View Distance",
         "hud.settings.maximum_fps": "Maximum FPS",
         "hud.settings.fov": "Field of View (deg)",
+        "hud.settings.gamma": "Gamma",
         "hud.settings.antialiasing_mode": "AntiAliasing Mode",
         "hud.settings.cloud_rendering_mode": "Cloud Rendering Mode",
         "hud.settings.fluid_rendering_mode": "Fluid Rendering Mode",
diff --git a/assets/voxygen/shaders/include/globals.glsl b/assets/voxygen/shaders/include/globals.glsl
index 471320a7ef..e0e97949e2 100644
--- a/assets/voxygen/shaders/include/globals.glsl
+++ b/assets/voxygen/shaders/include/globals.glsl
@@ -12,4 +12,5 @@ uniform u_globals {
 	uvec4 light_shadow_count;
 	uvec4 medium;
 	ivec4 select_pos;
+	vec4 gamma;
 };
diff --git a/assets/voxygen/shaders/postprocess-frag.glsl b/assets/voxygen/shaders/postprocess-frag.glsl
index bec1c991ef..cd0c87a772 100644
--- a/assets/voxygen/shaders/postprocess-frag.glsl
+++ b/assets/voxygen/shaders/postprocess-frag.glsl
@@ -44,8 +44,6 @@ void main() {
 	//hsva_color.z *= 0.85;
 	//hsva_color.z = 1.0 - 1.0 / (1.0 * hsva_color.z + 1.0);
 	//vec4 final_color = vec4(hsv2rgb(hsva_color.rgb), hsva_color.a);
-
-    vec4 gamma = vec4(1.0);
 	
 	vec4 final_color = pow(aa_color, gamma);
 
diff --git a/voxygen/src/hud/settings_window.rs b/voxygen/src/hud/settings_window.rs
index 52a4205bab..1c63978804 100644
--- a/voxygen/src/hud/settings_window.rs
+++ b/voxygen/src/hud/settings_window.rs
@@ -1566,10 +1566,10 @@ impl<'a> Widget for SettingsWindow<'a> {
                 .color(TEXT_COLOR)
                 .set(state.ids.gamma_text, ui);
 
-            if let Some(new_val) = ImageSlider::continuous(
-                self.global_state.settings.graphics.gamma,
-                0.5,
-                2.0,
+            if let Some(new_val) = ImageSlider::discrete(
+                (self.global_state.settings.graphics.gamma.log2() * 8.0).round() as i32,
+                8,
+                -8,
                 self.imgs.slider_indicator,
                 self.imgs.slider,
             )
@@ -1580,7 +1580,7 @@ impl<'a> Widget for SettingsWindow<'a> {
             .pad_track((5.0, 5.0))
             .set(state.ids.gamma_slider, ui)
             {
-                events.push(Event::AdjustGamma(new_val));
+                events.push(Event::AdjustGamma(2.0f32.powf(new_val as f32 / 8.0)));
             }
 
             Text::new(&format!("{}", self.global_state.settings.graphics.gamma))
diff --git a/voxygen/src/menu/char_selection/mod.rs b/voxygen/src/menu/char_selection/mod.rs
index a3691c3bea..6dc28fb820 100644
--- a/voxygen/src/menu/char_selection/mod.rs
+++ b/voxygen/src/menu/char_selection/mod.rs
@@ -99,6 +99,7 @@ impl PlayState for CharSelectionState {
                 global_state.window.renderer_mut(),
                 &self.client.borrow(),
                 humanoid_body.clone(),
+                global_state.settings.graphics.gamma,
             );
 
             // Render the scene.
diff --git a/voxygen/src/menu/char_selection/scene.rs b/voxygen/src/menu/char_selection/scene.rs
index a28d502dfd..c09f794013 100644
--- a/voxygen/src/menu/char_selection/scene.rs
+++ b/voxygen/src/menu/char_selection/scene.rs
@@ -119,6 +119,7 @@ impl Scene {
         renderer: &mut Renderer,
         client: &Client,
         body: Option<humanoid::Body>,
+        gamma: f32,
     ) {
         self.camera.set_focus_pos(Vec3::unit_z() * 1.5);
         self.camera.update(client.state().get_time());
@@ -142,6 +143,7 @@ impl Scene {
             0,
             BlockKind::Air,
             None,
+            gamma,
         )]) {
             error!("Renderer failed to update: {:?}", err);
         }
diff --git a/voxygen/src/render/pipelines/mod.rs b/voxygen/src/render/pipelines/mod.rs
index c797fcd96e..4e6fd5b282 100644
--- a/voxygen/src/render/pipelines/mod.rs
+++ b/voxygen/src/render/pipelines/mod.rs
@@ -26,6 +26,7 @@ gfx_defines! {
         light_shadow_count: [u32; 4] = "light_shadow_count",
         medium: [u32; 4] = "medium",
         select_pos: [i32; 4] = "select_pos",
+        gamma: [f32; 4] = "gamma",
     }
 
     constant Light {
@@ -53,6 +54,7 @@ impl Globals {
         shadow_count: usize,
         medium: BlockKind,
         select_pos: Option<Vec3<i32>>,
+        gamma: f32,
     ) -> Self {
         Self {
             view_mat: arr_to_mat(view_mat.into_col_array()),
@@ -70,6 +72,7 @@ impl Globals {
                 .map(|sp| Vec4::from(sp) + Vec4::unit_w())
                 .unwrap_or(Vec4::zero())
                 .into_array(),
+            gamma: [gamma; 4],
         }
     }
 }
@@ -89,6 +92,7 @@ impl Default for Globals {
             0,
             BlockKind::Air,
             None,
+            1.0,
         )
     }
 }
diff --git a/voxygen/src/scene/mod.rs b/voxygen/src/scene/mod.rs
index fd54ae6b62..6653a75e8e 100644
--- a/voxygen/src/scene/mod.rs
+++ b/voxygen/src/scene/mod.rs
@@ -149,6 +149,7 @@ impl Scene {
         renderer: &mut Renderer,
         audio: &mut AudioFrontend,
         client: &Client,
+        gamma: f32,
     ) {
         // Get player position.
         let player_pos = client
@@ -296,6 +297,7 @@ impl Scene {
                     .map(|b| b.kind())
                     .unwrap_or(BlockKind::Air),
                 self.select_pos,
+                gamma,
             )])
             .expect("Failed to update global constants");
 
diff --git a/voxygen/src/session.rs b/voxygen/src/session.rs
index 2ed836bdaa..a45ab1ad0f 100644
--- a/voxygen/src/session.rs
+++ b/voxygen/src/session.rs
@@ -614,6 +614,7 @@ impl PlayState for SessionState {
                 global_state.window.renderer_mut(),
                 &mut global_state.audio,
                 &self.client.borrow(),
+                global_state.settings.graphics.gamma,
             );
 
             // Render the session.