diff --git a/app/styles/app/modules/icons.sass b/app/styles/app/modules/icons.sass
index e58075d7..0a763a32 100644
--- a/app/styles/app/modules/icons.sass
+++ b/app/styles/app/modules/icons.sass
@@ -14,6 +14,10 @@
 .icon--clock
   background-image: inline-image('svg/duration-icon.svg')
 
+.icon-clock-dark,
+.icon--clock-dark
+  background-image: inline-image('svg/duration-icon-dark.svg')
+
 .icon-github,
 .icon--github
   background-image: inline-image('svg/commit-icon.svg')
@@ -29,6 +33,10 @@
 .icon--hash
   background-image: inline-image('svg/build-number-icon.svg')
 
+.icon-hash-dark,
+.icon--hash-dark
+  background-image: inline-image('svg/build-number-icon-dark.svg')
+
 .icon-cog,
 .icon--cog
   background-image: inline-image('icons/settings.svg')
@@ -87,7 +95,7 @@
 
 
 .icon--env
-  background-image: inline-image('svg/icon-environment.svg')
+  background-image: inline-image('svg/icon-environment-dark.svg')
 .icon--cross-red,
 .icon--job.failed
   background-image: inline-image('svg/icon-job-failed.svg')
@@ -107,14 +115,14 @@
   background-image: inline-image('svg/icon-job-canceled.svg')
 
 .icon--lang
-  background-image: inline-image('svg/icon-language.svg')
+  background-image: inline-image('svg/icon-language-dark.svg')
 .icon--linux,
 .icon.linux
-  background-image: inline-image('svg/icon-linux.svg')
+  background-image: inline-image('svg/icon-linux-dark.svg')
 .icon--mac,
 .icon.mac
 .icon.osx
-  background-image: inline-image('svg/icon-mac.svg')
+  background-image: inline-image('svg/icon-mac-dark.svg')
 .icon--eye
   background-image: inline-image('svg/icon-showmore.svg')
 .icon--question
diff --git a/app/templates/jobs.hbs b/app/templates/jobs.hbs
index 0c3d14aa..8c9fc3a2 100644
--- a/app/templates/jobs.hbs
+++ b/app/templates/jobs.hbs
@@ -23,7 +23,7 @@
               </div>
 
               <p class="job-id jobs-item build-status">
-                <span class="icon icon--hash"></span>
+                <span class="icon icon--hash-dark"></span>
                 {{#if job.id}}
                   {{#if job.repo.slug}}
                     {{number}}
@@ -62,7 +62,7 @@
               {{/if}}
 
               <p class="job-duration jobs-item" {{bind-attr title="startedAt"}}>
-                <span class="icon icon--clock"></span>
+                <span class="icon icon--clock-dark"></span>
                 {{format-duration duration}}
               </p>
 
diff --git a/public/images/svg/build-number-icon-dark.svg b/public/images/svg/build-number-icon-dark.svg
new file mode 100644
index 00000000..5d928619
--- /dev/null
+++ b/public/images/svg/build-number-icon-dark.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 16.0.4, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="16.96px" height="16.15px" viewBox="0 0 16.96 16.15" enable-background="new 0 0 16.96 16.15" xml:space="preserve">
+<path fill="#808080" d="M15.748,6.406c0.668,0,1.213-0.542,1.213-1.21c0-0.669-0.545-1.212-1.213-1.212h-3.172l0.209-2.678
+	c0.051-0.667-0.445-1.249-1.115-1.303c-0.666-0.051-1.248,0.447-1.299,1.113l-0.228,2.867H7.454l0.212-2.678
+	C7.72,0.639,7.22,0.057,6.553,0.003C5.886-0.048,5.303,0.45,5.25,1.117L5.024,3.984H2.02c-0.67,0-1.212,0.542-1.212,1.212
+	c0,0.668,0.542,1.21,1.212,1.21h2.815L4.602,9.371H1.211C0.542,9.371,0,9.913,0,10.583s0.542,1.212,1.211,1.212h3.2l-0.239,3.049
+	c-0.053,0.667,0.446,1.25,1.112,1.303C5.317,16.15,5.35,16.15,5.381,16.15c0.626,0,1.157-0.481,1.207-1.116l0.253-3.239H9.53
+	l-0.239,3.049c-0.053,0.667,0.447,1.25,1.112,1.303c0.032,0.005,0.063,0.005,0.097,0.005c0.627,0,1.154-0.481,1.209-1.116
+	l0.254-3.239h2.977c0.67,0,1.211-0.542,1.211-1.212s-0.541-1.212-1.211-1.212h-2.787l0.232-2.965L15.748,6.406L15.748,6.406z
+	 M9.722,9.371h-2.69l0.232-2.965h2.688L9.722,9.371z"/>
+</svg>
diff --git a/public/images/svg/duration-icon-dark.svg b/public/images/svg/duration-icon-dark.svg
new file mode 100644
index 00000000..ae93dcf9
--- /dev/null
+++ b/public/images/svg/duration-icon-dark.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 16.0.4, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="15.375px" height="15.372px" viewBox="0 0 15.375 15.372" enable-background="new 0 0 15.375 15.372" xml:space="preserve">
+<g>
+	<path fill="#808080" d="M7.7,0.2c-4.142,0-7.5,3.358-7.5,7.5c0,4.14,3.358,7.5,7.5,7.5c4.143,0,7.5-3.359,7.5-7.5
+		C15.201,3.558,11.843,0.2,7.7,0.2z M7.7,13.327c-3.102,0-5.625-2.523-5.625-5.625S4.599,2.075,7.7,2.075
+		c3.1,0,5.625,2.523,5.625,5.625C13.326,10.801,10.802,13.327,7.7,13.327z"/>
+	<path fill="#808080" d="M11.339,9.381L8.373,7.377V3.928c0-0.083-0.033-0.163-0.092-0.221C8.223,3.648,8.142,3.615,8.06,3.615H7.24
+		c-0.083,0-0.163,0.034-0.221,0.092C6.96,3.765,6.927,3.845,6.927,3.928v4.074c0,0.082,0.033,0.162,0.092,0.221
+		c0.023,0.023,0.051,0.043,0.08,0.059l3.457,2.315c0.052,0.034,0.111,0.053,0.173,0.053c0.022,0,0.045-0.002,0.065-0.008
+		c0.084-0.017,0.154-0.065,0.199-0.14l0.437-0.694C11.519,9.665,11.479,9.475,11.339,9.381z"/>
+</g>
+</svg>
diff --git a/public/images/svg/icon-environment-dark.svg b/public/images/svg/icon-environment-dark.svg
new file mode 100644
index 00000000..1dd16373
--- /dev/null
+++ b/public/images/svg/icon-environment-dark.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 16.0.4, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="16px" height="16px" viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<path fill="#808080" d="M15.312,2.454C15.312,2.453,15.312,2.453,15.312,2.454l-0.006-0.002c-0.013-0.004-0.024-0.008-0.039-0.011
+	L8.2,0.528c-0.132-0.036-0.271-0.036-0.402,0L0.686,2.453C0.369,2.539,0.15,2.816,0.126,3.14C0.123,3.154,0.121,3.169,0.118,3.184
+	c0,0.005-0.001,0.009-0.001,0.013c0,0.001,0,0.002,0,0.003C0.112,3.235,0.106,3.271,0.106,3.309v8.534
+	c0,0.312,0.188,0.595,0.476,0.712l6.995,2.889c0.095,0.039,0.194,0.059,0.294,0.059c0.022,0,0.044-0.004,0.067-0.006
+	c0.02,0.002,0.04,0.006,0.061,0.006c0.188,0,0.357-0.068,0.491-0.182l6.904-2.629c0.299-0.113,0.496-0.399,0.496-0.719V3.196
+	C15.891,2.838,15.645,2.539,15.312,2.454z M7.999,2.069l4.166,1.127L7.999,4.323L3.833,3.196L7.999,2.069z M1.646,4.2l5.583,1.51
+	v7.923l-5.583-2.305V4.2z M8.77,13.564V5.71l5.582-1.51v7.239L8.77,13.564z"/>
+</svg>
diff --git a/public/images/svg/icon-language-dark.svg b/public/images/svg/icon-language-dark.svg
new file mode 100644
index 00000000..ddcdbf00
--- /dev/null
+++ b/public/images/svg/icon-language-dark.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 16.0.4, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="21.104px" height="12.938px" viewBox="0 0 21.104 12.938" enable-background="new 0 0 21.104 12.938" xml:space="preserve">
+<g>
+	<polygon fill="#808080" points="6.703,3.362 5.008,2 0,6.775 5.055,11.551 6.75,10.189 3.113,6.775 	"/>
+	<polygon fill="#808080" points="15.958,2 14.263,3.361 17.899,6.775 14.31,10.189 16.005,11.551 21.013,6.775 	"/>
+	<polygon fill="#808080" points="8.075,12.917 10.032,12.917 13.163,0 11.208,0 	"/>
+</g>
+</svg>
diff --git a/public/images/svg/icon-linux-dark.svg b/public/images/svg/icon-linux-dark.svg
new file mode 100644
index 00000000..65b33d04
--- /dev/null
+++ b/public/images/svg/icon-linux-dark.svg
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 16.0.4, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="13.604px" height="16.021px" viewBox="0 0 13.604 16.021" enable-background="new 0 0 13.604 16.021" xml:space="preserve">
+<g>
+	<g>
+		<g>
+			<path fill="#808080" d="M13.163,12.911c-0.048-0.018-0.095-0.045-0.139-0.072c-0.302-0.175-0.502-0.413-0.485-0.791
+				c0.01-0.265-0.083-0.508-0.24-0.715c-0.094-0.13-0.113-0.242-0.078-0.396c0.215-1.01,0.043-1.94-0.509-2.828
+				c-0.509-0.822-1.038-1.627-1.6-2.408C9.761,5.208,9.598,4.665,9.57,4.06c-0.021-0.5-0.021-1.007-0.108-1.503
+				C9.255,1.4,8.812,0.431,7.535,0.12c-0.328,0-0.657,0-0.985,0C6.49,0.137,6.431,0.152,6.371,0.167
+				C5.72,0.347,5.134,0.61,4.861,1.303C4.682,1.76,4.633,2.24,4.649,2.723C4.67,3.346,4.722,3.971,4.753,4.593
+				c0.031,0.612-0.142,1.109-0.526,1.582C3.688,6.833,3.198,7.53,2.941,8.364c-0.163,0.531-0.367,1.045-0.603,1.55
+				c-0.072,0.158-0.136,0.327-0.118,0.503c0.035,0.308-0.063,0.54-0.242,0.802c-0.263,0.394-0.586,0.616-1.027,0.711
+				c-0.101,0.023-0.2,0.045-0.297,0.077c-0.34,0.118-0.499,0.336-0.407,0.688c0.128,0.487,0.075,0.945-0.082,1.411
+				c-0.117,0.352,0,0.565,0.341,0.715c0.199,0.085,0.407,0.15,0.621,0.175c0.813,0.08,1.576,0.354,2.339,0.633
+				c0.261,0.096,0.53,0.159,0.805,0.194c0.313,0.04,0.622-0.035,0.81-0.282c0.208-0.273,0.476-0.326,0.771-0.363
+				c0.104-0.014,0.204-0.025,0.305-0.04c0.841-0.11,1.675-0.098,2.507,0.08c0.114,0.026,0.215,0.049,0.274,0.165
+				c0.358,0.689,1.361,0.668,1.849,0.221c0.386-0.357,0.824-0.641,1.284-0.896c0.396-0.218,0.802-0.423,1.177-0.671
+				C13.769,13.687,13.687,13.1,13.163,12.911z M7.406,2.135c0.314-0.341,0.796-0.322,1.095,0.026
+				c0.312,0.365,0.374,0.957,0.14,1.375C8.566,3.668,8.485,3.809,8.307,3.833C8.251,3.704,8.352,3.635,8.384,3.554
+				c0.047-0.13,0.07-0.261,0.055-0.397C8.404,2.854,8.186,2.613,7.942,2.601C7.69,2.589,7.51,2.797,7.436,3.131
+				C7.411,3.239,7.534,3.445,7.319,3.447c-0.178,0-0.188-0.188-0.212-0.336C7.046,2.734,7.151,2.405,7.406,2.135z M6.468,3.841
+				c0.417,0.11,0.82,0.258,1.2,0.461C7.824,4.385,7.849,4.51,7.684,4.606c-0.41,0.23-0.791,0.509-1.233,0.682
+				C6.396,5.31,6.335,5.321,6.296,5.333C6.073,5.329,5.46,4.873,5.374,4.674c-0.042-0.098,0.01-0.155,0.074-0.207
+				c0.229-0.185,0.465-0.369,0.699-0.551C6.241,3.849,6.354,3.812,6.468,3.841z M5.426,2.11c0.19-0.098,0.361-0.062,0.507,0.077
+				c0.294,0.283,0.375,0.646,0.334,1.04C6.253,3.354,6.159,3.409,6.019,3.445C5.971,3.243,5.98,3.056,5.879,2.896
+				C5.779,2.746,5.654,2.62,5.462,2.649c-0.181,0.022-0.255,0.17-0.299,0.332C5.076,3.296,5.177,3.554,5.407,3.773
+				c0.048,0.044,0.138,0.093,0.047,0.172C5.394,3.994,5.339,3.944,5.291,3.909C4.793,3.557,4.88,2.396,5.426,2.11z M4.622,15.083
+				c-0.138,0.145-0.291,0.213-0.493,0.192c-0.258-0.029-0.507-0.091-0.74-0.192c-0.728-0.319-1.489-0.51-2.272-0.627
+				c-0.181-0.026-0.411-0.031-0.407-0.338c0.006-0.038,0.006-0.104,0.024-0.159c0.116-0.377,0.204-0.749,0.104-1.144
+				C0.78,12.588,0.88,12.434,1.12,12.39c0.081-0.016,0.158-0.044,0.238-0.058c0.43-0.07,0.753-0.263,0.937-0.69
+				c0.155-0.364,0.349-0.379,0.64-0.115c0.193,0.177,0.341,0.383,0.473,0.604c0.374,0.627,0.753,1.245,1.203,1.819
+				C4.957,14.391,4.939,14.744,4.622,15.083z M8.833,11.749c-0.039,0.33-0.051,0.654-0.045,0.983
+				c0.005,0.151-0.053,0.265-0.152,0.378c-0.569,0.64-1.294,0.907-2.13,0.925c-0.107,0.003-0.216-0.016-0.318,0.004
+				c-0.458,0.089-0.728-0.164-0.965-0.5c-0.064-0.092-0.068-0.135,0.027-0.208c0.265-0.213,0.282-0.476,0.05-0.732
+				c-0.245-0.273-0.533-0.499-0.83-0.705c-0.659-0.461-0.832-1.062-0.626-1.814c0.074-0.267,0.146-0.53,0.282-0.771
+				C4.35,8.912,4.47,8.473,4.632,8.049c0.077-0.198,0.165-0.391,0.29-0.563C5.174,7.13,5.325,6.738,5.366,6.246
+				c0.177,0.157,0.316,0.293,0.479,0.397C6.1,6.804,6.352,6.83,6.624,6.677c0.361-0.202,0.733-0.39,1.103-0.586
+				C7.855,6.023,7.95,6.023,8.028,6.177c0.57,1.114,1.08,2.257,1.408,3.468c0.133,0.49,0.107,0.999,0.02,1.504
+				c-0.024,0.128-0.062,0.187-0.218,0.188C8.934,11.346,8.87,11.442,8.833,11.749z M12.727,13.726
+				c-0.267,0.152-0.541,0.293-0.812,0.437c-0.371,0.198-0.729,0.416-1.024,0.726c-0.148,0.154-0.337,0.267-0.533,0.356
+				c-0.388,0.179-0.746-0.009-0.824-0.436c-0.021-0.11-0.018-0.227-0.021-0.305c0.021-0.51,0.174-0.959,0.22-1.429
+				c0.028-0.288,0.051-0.571,0-0.858c-0.025-0.15-0.026-0.306-0.008-0.459c0.008-0.062,0.037-0.125,0.109-0.129
+				c0.087-0.002,0.08,0.075,0.092,0.131c0.015,0.092,0.023,0.185,0.047,0.271c0.108,0.404,0.387,0.602,0.801,0.542
+				c0.405-0.06,0.781-0.184,1.016-0.559c0.035-0.06,0.066-0.148,0.152-0.128c0.085,0.018,0.076,0.108,0.085,0.178
+				c0.02,0.121,0.032,0.243,0.059,0.365c0.057,0.271,0.188,0.495,0.428,0.647c0.07,0.046,0.145,0.081,0.212,0.124
+				C13.073,13.421,13.075,13.521,12.727,13.726z"/>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/public/images/svg/icon-mac-dark.svg b/public/images/svg/icon-mac-dark.svg
new file mode 100644
index 00000000..6d2c5570
--- /dev/null
+++ b/public/images/svg/icon-mac-dark.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 16.0.4, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="13.604px" height="16.021px" viewBox="0 0 13.604 16.021" enable-background="new 0 0 13.604 16.021" xml:space="preserve">
+<g>
+	<path fill="#808080" d="M13.386,5.884c-2.124,1.462-2.068,4.633,0.076,6.041c-0.505,1.263-1.088,2.472-2.174,3.357
+		c-0.573,0.468-1.21,0.591-1.912,0.352c-0.315-0.106-0.63-0.22-0.946-0.341c-0.93-0.364-1.851-0.335-2.769,0.033
+		c-0.264,0.104-0.523,0.213-0.789,0.306c-0.629,0.229-1.216,0.131-1.756-0.26c-0.524-0.373-0.931-0.854-1.272-1.392
+		c-0.949-1.495-1.514-3.129-1.695-4.885C0.054,8.172,0.193,7.269,0.586,6.417c0.862-1.871,2.79-2.719,4.791-2.119
+		C5.615,4.371,5.852,4.441,6.085,4.53c0.724,0.282,1.438,0.258,2.166,0C8.69,4.374,9.145,4.22,9.605,4.151
+		c1.448-0.21,2.893,0.361,3.763,1.681C13.379,5.845,13.382,5.868,13.386,5.884z"/>
+	<path fill="#808080" d="M6.81,4.222c-0.058-2.288,2.165-4.194,4.1-4.081C11.013,2.093,9.085,4.284,6.81,4.222z"/>
+</g>
+</svg>