diff --git a/libraries.txt b/libraries.txt
index 32effda4..fc24479f 100644
--- a/libraries.txt
+++ b/libraries.txt
@@ -33,4 +33,6 @@ Unit (Length)       d8e6237        MIT          https://github.com/heygrady/Unit
 Natural Sort        9565816        MIT          https://github.com/javve/natural-sort/blob/master/index.js
 SlickGrid           2.3.7-8ff6814  MIT          https://github.com/6pac/SlickGrid
 jQuery-UI           1.11.3         MIT          https://jqueryui.com/
-BigNumber           3.0.1          MIT          http://mikemcl.github.io/bignumber.js
\ No newline at end of file
+BigNumber           3.0.1          MIT          http://mikemcl.github.io/bignumber.js
+Source Code Pro     1.1            SIL OFL      https://fonts.googleapis.com/css?family=Source+Code+Pro:400,700
+Open Sans           2.0            AL           https://fonts.googleapis.com/css?family=Open+Sans:400,400i,600,700
\ No newline at end of file
diff --git a/web/pgadmin/browser/static/css/browser.css b/web/pgadmin/browser/static/css/browser.css
index b1648608..2fffd649 100644
--- a/web/pgadmin/browser/static/css/browser.css
+++ b/web/pgadmin/browser/static/css/browser.css
@@ -1,9 +1,9 @@
 /* Styles for the main browser */
 .browser-pane-container {
-    position: absolute; 
-    top: 50px; 
-    left: 0px; 
-    width: 100%; 
+    position: absolute;
+    top: 50px;
+    left: 0px;
+    width: 100%;
     height: calc(100% - 50px); /* Offset for the nav bar */
     z-index: -1;
 }
@@ -13,19 +13,19 @@
 }
 
 .browser-inner-pane {
-    padding: 0px; 
+    padding: 0px;
     overflow: hidden;
 }
 
 .browser-center-pane {
-    overflow: hidden; 
-    padding: 0px; 
+    overflow: hidden;
+    padding: 0px;
     padding-bottom: 50px /* Offset the nav bar to ensure there's enough scroll space */
 }
 
 .browser-tab-bar {
-    padding-left: 5px; 
-    padding-top: 5px; 
+    padding-left: 5px;
+    padding-top: 5px;
     background-color: #E6E6E6;
 }
 
@@ -38,7 +38,7 @@
 }
 
 .browser-tab-content {
-    width: 100%; 
+    width: 100%;
     height: 100%;
 }
 
@@ -49,3 +49,16 @@
 .aciTree .aciTreeLi div.aciTreeLine {
   display: table !important;
 }
+
+
+code,
+kbd,
+pre,
+samp,
+.CodeMirror pre {
+  font-family: 'Source Code Pro';
+}
+
+.sql-editor-grid-container {
+  font-family: 'Open Sans' !important;
+}
diff --git a/web/pgadmin/misc/bgprocess/static/css/bgprocess.css b/web/pgadmin/misc/bgprocess/static/css/bgprocess.css
index 0838f0a7..4fd1bd93 100644
--- a/web/pgadmin/misc/bgprocess/static/css/bgprocess.css
+++ b/web/pgadmin/misc/bgprocess/static/css/bgprocess.css
@@ -28,7 +28,7 @@
 }
 
 .ajs-bg-bgprocess > .pg-bg-bgprocess > .pg-bg-notify-body {
-  font-family: monospace;
+  font-family: "Source Code Pro";
   white-space: nowrap;
 }
 
diff --git a/web/pgadmin/misc/file_manager/static/css/file_manager.css b/web/pgadmin/misc/file_manager/static/css/file_manager.css
index 4c5f4f60..d21675a9 100755
--- a/web/pgadmin/misc/file_manager/static/css/file_manager.css
+++ b/web/pgadmin/misc/file_manager/static/css/file_manager.css
@@ -76,7 +76,7 @@
 }
 
 .fileinfo table#contents tr td p {
-  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-family: "Open Sans";
 }
 
 .fileinfo > h1 {
diff --git a/web/pgadmin/static/css/aci_tree.overrides.css b/web/pgadmin/static/css/aci_tree.overrides.css
index 6d93ed2d..913957b5 100644
--- a/web/pgadmin/static/css/aci_tree.overrides.css
+++ b/web/pgadmin/static/css/aci_tree.overrides.css
@@ -1,5 +1,5 @@
 .aciTree .aciTreeText {
-    font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+    font-family: 'Open Sans';
     font-size: 12px;
 }
 
@@ -18,4 +18,4 @@
 .aciTree .aciTreeSelected > .aciTreeLine .aciTreeItem {
     background-color: #e7f2ff;
     border-color: #84acdd;
-}
\ No newline at end of file
+}
diff --git a/web/pgadmin/static/css/bootstrap.overrides.css b/web/pgadmin/static/css/bootstrap.overrides.css
index b6d50eb2..94fb4490 100755
--- a/web/pgadmin/static/css/bootstrap.overrides.css
+++ b/web/pgadmin/static/css/bootstrap.overrides.css
@@ -2,6 +2,7 @@
 
 /* Ensure simple forms don't hit the top of the screen */
 body {
+    font-family: 'Open Sans';
     padding-top: 50px;
     padding-bottom: 20px;
 }
@@ -1005,7 +1006,7 @@ ul.nav.nav-tabs {
 }
 
 span.button-label {
-  font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
+  font-family: 'Open Sans';
   font-size: initial;
 }
 
@@ -1015,7 +1016,7 @@ span.button-label {
   border-radius: 3px;
   color: #333;
   display: block;
-  font-family: Menlo,Monaco,Consolas,"Courier New",monospace;
+  font-family: 'Source Code Pro';
   font-size: 12px;
   line-height: 1.42857;
   margin: 0 0 10px;
diff --git a/web/pgadmin/static/css/codemirror.overrides.css b/web/pgadmin/static/css/codemirror.overrides.css
index 8bc081b6..217cdda3 100644
--- a/web/pgadmin/static/css/codemirror.overrides.css
+++ b/web/pgadmin/static/css/codemirror.overrides.css
@@ -48,7 +48,7 @@
 
 /* Codemirror buttons */
 .CodeMirror-dialog button {
-    font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+    font-family: 'Open Sans';
     color: white;
     font-size: 70%;
     background-image: -webkit-linear-gradient(top, #337ab7 0%, #265a88 100%);
@@ -72,4 +72,4 @@
 
 .CodeMirror-gutters {
   z-index: 2;
-}
\ No newline at end of file
+}
diff --git a/web/pgadmin/static/css/pgadmin.css b/web/pgadmin/static/css/pgadmin.css
index 0f1521f7..7f7b1187 100644
--- a/web/pgadmin/static/css/pgadmin.css
+++ b/web/pgadmin/static/css/pgadmin.css
@@ -812,4 +812,19 @@ lgg-el-container[el=md] .pg-el-lg-8,
 
 .Resizer.disabled:hover {
   border-color: transparent;
-}
\ No newline at end of file
+}
+
+@font-face {
+  font-family: 'Open Sans';
+  src: url('../fonts/OpenSans-Regular.ttf');
+  font-weight: normal;
+  font-style: normal;
+}
+
+@font-face {
+  font-family: 'Source Code Pro';
+  src: url('../fonts/SourceCodePro-Regular.ttf');
+  font-weight: normal;
+  font-style: normal;
+}
+
diff --git a/web/pgadmin/static/css/pgadmin.style.css b/web/pgadmin/static/css/pgadmin.style.css
index a983e249..581d860f 100644
--- a/web/pgadmin/static/css/pgadmin.style.css
+++ b/web/pgadmin/static/css/pgadmin.style.css
@@ -57,19 +57,19 @@
   font-weight: bold; }
 
 .text-14 {
-  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-family: 'Open Sans';
   font-size: 14px; }
 
 .text-13 {
-  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-family: 'Open Sans';
   font-size: 13px; }
 
 .text-12 {
-  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-family: 'Open Sans';
   font-size: 12px; }
 
 .text-11 {
-  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-family: 'Open Sans';
   font-size: 11px; }
 
 .bg-primary-blue {
@@ -103,4 +103,4 @@
   color: #FFFFFF; }
 
 .opacity-5 {
-  opacity: 0.5;  }
\ No newline at end of file
+  opacity: 0.5;  }
diff --git a/web/pgadmin/static/css/webcabin.overrides.css b/web/pgadmin/static/css/webcabin.overrides.css
index 0fbbdb98..48347815 100644
--- a/web/pgadmin/static/css/webcabin.overrides.css
+++ b/web/pgadmin/static/css/webcabin.overrides.css
@@ -285,7 +285,7 @@
   right: 5px;
 }
 .context-menu-list {
-font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+font-family: 'Open Sans';;
 font-size: 13px;
 }
 
@@ -300,7 +300,7 @@ font-size: 13px;
 
 .context-menu-item {
   display:block;
-  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-family: 'Open Sans';
   font-size: 13px;
   font-weight: normal;
 }
@@ -387,4 +387,4 @@ i.wcTabIcon {
 
 .wcFrameTitleBar.wcTabTop .wcFrameButtonBar {
   right: 30px !important;
-}
\ No newline at end of file
+}
diff --git a/web/pgadmin/static/fonts/OpenSans-Bold.ttf b/web/pgadmin/static/fonts/OpenSans-Bold.ttf
new file mode 100755
index 0000000000000000000000000000000000000000..7b529456032abf9132194ddaac62d2d163247c38
GIT binary patch
diff --git a/web/pgadmin/static/fonts/OpenSans-Italic.ttf b/web/pgadmin/static/fonts/OpenSans-Italic.ttf
new file mode 100755
index 0000000000000000000000000000000000000000..e6c541417348e930324056bb998a4ec4da37650c
GIT binary patch
diff --git a/web/pgadmin/static/fonts/OpenSans-Regular.ttf b/web/pgadmin/static/fonts/OpenSans-Regular.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..2e31d02424ed50b9e05c19b5d82500699a6edbb0
GIT binary patch
diff --git a/web/pgadmin/static/fonts/OpenSans-SemiBold.ttf b/web/pgadmin/static/fonts/OpenSans-SemiBold.ttf
new file mode 100755
index 0000000000000000000000000000000000000000..99db86aa0282e425450c86508d42da77a9f4102b
GIT binary patch
diff --git a/web/pgadmin/static/fonts/SourceCodePro-Bold.ttf b/web/pgadmin/static/fonts/SourceCodePro-Bold.ttf
new file mode 100755
index 0000000000000000000000000000000000000000..a56f1fa5ddf408b863fec053dbdf0a96e52a5fc9
GIT binary patch
diff --git a/web/pgadmin/static/fonts/SourceCodePro-Regular.ttf b/web/pgadmin/static/fonts/SourceCodePro-Regular.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..b2cff928e42a31496c603d02b4605978eba66e59
GIT binary patch
diff --git a/web/pgadmin/static/scss/_alert.scss b/web/pgadmin/static/scss/_alert.scss
index 9b97ebca..3f860b87 100644
--- a/web/pgadmin/static/scss/_alert.scss
+++ b/web/pgadmin/static/scss/_alert.scss
@@ -42,7 +42,7 @@
   padding: 0 12px 0 10px;
   align-self: center;
   // To make sure IE picks up the correct font
-  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-family: 'Open Sans';
 }
 
 .alert-info {
diff --git a/web/pgadmin/static/scss/_alertify.overrides.scss b/web/pgadmin/static/scss/_alertify.overrides.scss
index 2c1e1d49..95cd909a 100644
--- a/web/pgadmin/static/scss/_alertify.overrides.scss
+++ b/web/pgadmin/static/scss/_alertify.overrides.scss
@@ -143,7 +143,7 @@
 }
 
 button.pg-alertify-button {
-  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-family: 'Open Sans';
   font-size: 14px;
   -webkit-font-smoothing: auto;
 }
diff --git a/web/pgadmin/static/scss/_typography.scss b/web/pgadmin/static/scss/_typography.scss
index 1b01abcc..e68cff17 100644
--- a/web/pgadmin/static/scss/_typography.scss
+++ b/web/pgadmin/static/scss/_typography.scss
@@ -1,4 +1,4 @@
-$font-family-1: "Helvetica Neue", Arial, sans-serif;
+$font-family-1: "Open Sans";
 
 .text-bold {
   font-weight: bold;
diff --git a/web/pgadmin/static/scss/sqleditor/_history.scss b/web/pgadmin/static/scss/sqleditor/_history.scss
index 518eba2a..086c194e 100644
--- a/web/pgadmin/static/scss/sqleditor/_history.scss
+++ b/web/pgadmin/static/scss/sqleditor/_history.scss
@@ -7,7 +7,7 @@
   .entry {
     @extend .text-14;
     @extend .bg-white-1;
-    font-family: monospace;
+    font-family: 'Source Code Pro';
     border: 2px solid transparent;
     margin-left: 1px;
     padding: 0 8px 0 5px;
@@ -15,7 +15,7 @@
     .other-info {
       @extend .text-13;
       @extend .font-gray-4;
-      font-family: monospace;
+      font-family: 'Source Code Pro';
       display: flex;
       flex-direction: row;
       justify-content: space-between;
@@ -34,7 +34,7 @@
   }
 
   .date-label {
-    font-family: monospace;
+    font-family: 'Source Code Pro';
     background: #e8e8e8;
     padding: 2px 9px;
     font-size: 11px;
@@ -183,7 +183,7 @@
         .content-value {
           @extend .bg-white-1;
           @extend .text-13;
-          font-family: Menlo, Monaco, Consolas, "Courier New", monospace;
+          font-family: 'Source Code Pro';
           border: 0;
           padding-left: 0;
           position: absolute;
diff --git a/web/pgadmin/tools/debugger/static/css/debugger.css b/web/pgadmin/tools/debugger/static/css/debugger.css
index 5245ffae..54a5a842 100644
--- a/web/pgadmin/tools/debugger/static/css/debugger.css
+++ b/web/pgadmin/tools/debugger/static/css/debugger.css
@@ -42,7 +42,7 @@
 .CodeMirror-foldmarker {
   color: blue;
   text-shadow: #b9f 1px 1px 2px, #b9f -1px -1px 2px, #b9f 1px -1px 2px, #b9f -1px 1px 2px;
-  font-family: arial;
+  font-family: "Open Sans";
   line-height: .3;
   cursor: pointer;
 }
@@ -71,7 +71,7 @@
 /* To make font same as Query tool in messages tab */
 .messages {
     white-space: pre-wrap;
-    font-family: monospace;
+    font-family: "Source Code Pro";
     padding-top: 5px;
     padding-left: 10px;
     overflow: auto;
@@ -81,4 +81,4 @@
     -moz-user-select: text;
     -ms-user-select: text;
     user-select: text;
-}
\ No newline at end of file
+}
diff --git a/web/pgadmin/tools/sqleditor/static/css/sqleditor.css b/web/pgadmin/tools/sqleditor/static/css/sqleditor.css
index 7b7e5615..320cb67d 100644
--- a/web/pgadmin/tools/sqleditor/static/css/sqleditor.css
+++ b/web/pgadmin/tools/sqleditor/static/css/sqleditor.css
@@ -99,7 +99,7 @@
 
 .sql-editor-message {
   white-space:pre-wrap;
-  font-family: monospace;
+  font-family: "Source Code Pro";
   padding-top: 5px;
   padding-left: 10px;
   overflow: auto;
@@ -151,7 +151,7 @@
 .CodeMirror-foldmarker {
   color: blue;
   text-shadow: #b9f 1px 1px 2px, #b9f -1px -1px 2px, #b9f 1px -1px 2px, #b9f -1px 1px 2px;
-  font-family: arial;
+  font-family: "Open Sans";
   line-height: .3;
   cursor: pointer;
 }
@@ -206,7 +206,7 @@
 
   background: white;
   font-size: 90%;
-  font-family: monospace;
+  font-family: "Source Code Pro";
 
   max-height: 20em;
   overflow-y: auto;
@@ -522,4 +522,4 @@ input.editor-checkbox:focus {
 }
 .pg_buttons {
   text-align:right;
-}
\ No newline at end of file
+}
