6 files changed, 15 insertions, 13 deletions
diff --git a/sonar-server/src/main/less/ui.less b/sonar-server/src/main/less/ui.less
index bac0f968c9a..79503d988f9 100644
--- a/sonar-server/src/main/less/ui.less
+++ b/sonar-server/src/main/less/ui.less
@@ -1,29 +1,31 @@
 @import "variables";
 @import "mixins";
 
+
+
 @font-face {
-  font-family: 'Titillium Web';
-  font-style: normal;
-  font-weight: 300;
-  src: url('../fonts/tw-300.woff') format('woff');
-}
-@font-face {
-  font-family: 'Titillium Web';
+  font-family: 'Open Sans';
   font-style: normal;
   font-weight: 400;
-  src: url('../fonts/tw-400.woff') format('woff');
+  src: url('../fonts/os-400.woff') format('woff');
 }
+
 @font-face {
-  font-family: 'Titillium Web';
+  font-family: 'Open Sans';
   font-style: normal;
-  font-weight: 600;
-  src: url('../fonts/tw-600.woff') format('woff');
+  font-weight: 700;
+  src: url('../fonts/os-700.woff') format('woff');
 }
 
+
 body {
-  font-family: 'Titillium Web', 'Helvetica Neue', Helvetica, Arial, sans-serif;
+  font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;
 }
 
+select, input, button, textarea {
+  font-size: 99%;
+  font-family: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;
+}
 
 /*
  * Common
@@ -235,4 +237,4 @@ input[type=button] {
     margin: 0 8px;
     font-size: @smallFontSize;
   }
-}
-\ No newline at end of file
+}
diff --git a/sonar-server/src/main/webapp/fonts/os-400.woff b/sonar-server/src/main/webapp/fonts/os-400.woff
new file mode 100644
index 00000000000..dbd2afc9944
--- /dev/null
+++ b/sonar-server/src/main/webapp/fonts/os-400.woff
diff --git a/sonar-server/src/main/webapp/fonts/os-700.woff b/sonar-server/src/main/webapp/fonts/os-700.woff
new file mode 100644
index 00000000000..04916f862fa
--- /dev/null
+++ b/sonar-server/src/main/webapp/fonts/os-700.woff
diff --git a/sonar-server/src/main/webapp/fonts/tw-300.woff b/sonar-server/src/main/webapp/fonts/tw-300.woff
deleted file mode 100644
index 1057950a6ed..00000000000
--- a/sonar-server/src/main/webapp/fonts/tw-300.woff
+++ /dev/null
diff --git a/sonar-server/src/main/webapp/fonts/tw-400.woff b/sonar-server/src/main/webapp/fonts/tw-400.woff
deleted file mode 100644
index 5d2527aeac5..00000000000
--- a/sonar-server/src/main/webapp/fonts/tw-400.woff
+++ /dev/null
diff --git a/sonar-server/src/main/webapp/fonts/tw-600.woff b/sonar-server/src/main/webapp/fonts/tw-600.woff
deleted file mode 100644
index 52c66548a02..00000000000
--- a/sonar-server/src/main/webapp/fonts/tw-600.woff
+++ /dev/null