diff --git a/docs/en_US/images/file_menu.png b/docs/en_US/images/file_menu.png
old mode 100755
new mode 100644
index f6d6f02e7e6b00a2ab6b3548f730c466188d4884..c077b1a4b6d31711e01a1cd12680459eb21425fb
GIT binary patch
diff --git a/docs/en_US/images/help_menu.png b/docs/en_US/images/help_menu.png
old mode 100755
new mode 100644
index 1e39a0a0d8de017b45c9bafe47390397b04331ba..5c117b1541ce3681672c18e0ebd071a2ea963089
GIT binary patch
diff --git a/docs/en_US/images/object_menu.png b/docs/en_US/images/object_menu.png
old mode 100755
new mode 100644
index e932ddd0938805cec3a3cfb3a6e12dacd72a288d..cf7d5188851eb2c98fa4ce9c42ac0abd59224dbe
GIT binary patch
diff --git a/docs/en_US/images/tool_menu.png b/docs/en_US/images/tool_menu.png
old mode 100755
new mode 100644
index eaea5e853ce10accc83794e2e48a7dabceb6ba51..2eed2fd9c77e0d56c85d506210c5442dbb0cc645
GIT binary patch
diff --git a/docs/en_US/images/toolbar.png b/docs/en_US/images/toolbar.png
old mode 100755
new mode 100644
index 8d1990aaddd954b2fffb82be31edf6fb07cb7cb3..e7d54dd06af1f94ccd6110f384668f0b5d03467d
GIT binary patch
diff --git a/docs/en_US/images/welcome.png b/docs/en_US/images/welcome.png
old mode 100755
new mode 100644
index 912e25bb76d0c217cccc9c1f5441034e71d59488..dc4451691ee490d6d18e51bda281c3191971e657
GIT binary patch
diff --git a/web/pgadmin/browser/templates/browser/index.html b/web/pgadmin/browser/templates/browser/index.html
index 965ae5ce..ee4af690 100644
--- a/web/pgadmin/browser/templates/browser/index.html
+++ b/web/pgadmin/browser/templates/browser/index.html
@@ -100,9 +100,7 @@ window.onload = function(e){
     <a class="navbar-brand pgadmin_header_logo" onClick="return false;" href="{{ '#' }}"
        title="{{ config.APP_NAME }} {{ _('logo') }}">
         <i class="app-icon {{ config.APP_ICON }}"></i>
-        <span>&nbsp;{{ config.APP_NAME }}</span>
     </a>
-    <div class="pg-navbar-brand-arrow"></div>
     <button type="button" class="navbar-toggler collapsed" data-toggle="collapse" data-target="#navbar-menu" aria-controls="navbar-menu">
         <span class="sr-only">{{ _('Toggle navigation') }}</span>
         <span class="navbar-toggler-icon"></span>
diff --git a/web/pgadmin/static/favicon.ico b/web/pgadmin/static/favicon.ico
index a1cc036e6f1eb96fa563c7e6e07f75548a7361be..7749e148d29e3f1bfd2b20866ee54cfbd50e059b 100644
GIT binary patch
diff --git a/web/pgadmin/static/scss/_bootstrap.overrides.scss b/web/pgadmin/static/scss/_bootstrap.overrides.scss
index 8136e2e4..ed16ec82 100644
--- a/web/pgadmin/static/scss/_bootstrap.overrides.scss
+++ b/web/pgadmin/static/scss/_bootstrap.overrides.scss
@@ -271,12 +271,9 @@ td.switch-cell > div.toggle {
 }
 
 .navbar-brand {
-	color: $color-brand !important;
-	background: $navbar-brand-bg !important;
 	margin-right: 0rem;
 	padding-left: 0.5rem !important;
 	padding-right: 1rem !important;
-	min-height: $navbar-height;
 	height: $navbar-height;
 	padding: 0rem;
 	display: flex;
diff --git a/web/pgadmin/static/scss/_pgadmin.style.scss b/web/pgadmin/static/scss/_pgadmin.style.scss
index 279c79d9..d7b8fbea 100644
--- a/web/pgadmin/static/scss/_pgadmin.style.scss
+++ b/web/pgadmin/static/scss/_pgadmin.style.scss
@@ -59,16 +59,15 @@
 }
 
 .pg-icon {
-  display: inline-block;
-  width: 25px;
-  height: 25px;
+  width: $navbar-height*3;
+  height: 100%;
   /*
    * Using the SVG postgresql logo, modified to set the background color as #FFF
    * https://wiki.postgresql.org/images/9/90/PostgreSQL_logo.1color_blue.svg
    * background: url("data:image/svg+xml,%3C%3Fxml version='1.0' encoding='utf-8'%3F%3E%3C!-- Generator: Adobe Illustrator 22.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) --%3E%3Csvg 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' viewBox='0 0 42 42' style='enable-background:new 0 0 42 42;' xml:space='preserve'%3E%3Cstyle type='text/css'%3E .st0%7Bstroke:%23000000;stroke-width:3.3022;%7D .st1%7Bfill:%23336791;%7D .st2%7Bfill:none;stroke:%23FFFFFF;stroke-width:1.1007;stroke-linecap:round;stroke-linejoin:round;%7D .st3%7Bfill:none;stroke:%23FFFFFF;stroke-width:1.1007;stroke-linecap:round;stroke-linejoin:bevel;%7D .st4%7Bfill:%23FFFFFF;stroke:%23FFFFFF;stroke-width:0.3669;%7D .st5%7Bfill:%23FFFFFF;stroke:%23FFFFFF;stroke-width:0.1835;%7D .st6%7Bfill:none;stroke:%23FFFFFF;stroke-width:0.2649;stroke-linecap:round;stroke-linejoin:round;%7D%0A%3C/style%3E%3Cg id='orginal'%3E%3C/g%3E%3Cg id='Layer_x0020_3'%3E%3Cpath class='st0' d='M31.3,30c0.3-2.1,0.2-2.4,1.7-2.1l0.4,0c1.2,0.1,2.8-0.2,3.7-0.6c2-0.9,3.1-2.4,1.2-2 c-4.4,0.9-4.7-0.6-4.7-0.6c4.7-7,6.7-15.8,5-18c-4.6-5.9-12.6-3.1-12.7-3l0,0c-0.9-0.2-1.9-0.3-3-0.3c-2,0-3.5,0.5-4.7,1.4 c0,0-14.3-5.9-13.6,7.4c0.1,2.8,4,21.3,8.7,15.7c1.7-2,3.3-3.8,3.3-3.8c0.8,0.5,1.8,0.8,2.8,0.7l0.1-0.1c0,0.3,0,0.5,0,0.8 c-1.2,1.3-0.8,1.6-3.2,2.1c-2.4,0.5-1,1.4-0.1,1.6c1.1,0.3,3.7,0.7,5.5-1.8l-0.1,0.3c0.5,0.4,0.4,2.7,0.5,4.4 c0.1,1.7,0.2,3.2,0.5,4.1c0.3,0.9,0.7,3.3,3.9,2.6C29.1,38.3,31.1,37.5,31.3,30'/%3E%3Cpath class='st1' d='M38.3,25.3c-4.4,0.9-4.7-0.6-4.7-0.6c4.7-7,6.7-15.8,5-18c-4.6-5.9-12.6-3.1-12.7-3l0,0 c-0.9-0.2-1.9-0.3-3-0.3c-2,0-3.5,0.5-4.7,1.4c0,0-14.3-5.9-13.6,7.4c0.1,2.8,4,21.3,8.7,15.7c1.7-2,3.3-3.8,3.3-3.8 c0.8,0.5,1.8,0.8,2.8,0.7l0.1-0.1c0,0.3,0,0.5,0,0.8c-1.2,1.3-0.8,1.6-3.2,2.1c-2.4,0.5-1,1.4-0.1,1.6c1.1,0.3,3.7,0.7,5.5-1.8 l-0.1,0.3c0.5,0.4,0.8,2.4,0.7,4.3c-0.1,1.9-0.1,3.2,0.3,4.2c0.4,1,0.7,3.3,3.9,2.6c2.6-0.6,4-2,4.2-4.5c0.1-1.7,0.4-1.5,0.5-3 l0.2-0.7c0.3-2.3,0-3.1,1.7-2.8l0.4,0c1.2,0.1,2.8-0.2,3.7-0.6C39,26.4,40.2,24.9,38.3,25.3L38.3,25.3z'/%3E%3Cpath class='st2' d='M21.8,26.6c-0.1,4.4,0,8.8,0.5,9.8c0.4,1.1,1.3,3.2,4.5,2.5c2.6-0.6,3.6-1.7,4-4.1c0.3-1.8,0.9-6.7,1-7.7'/%3E%3Cpath class='st2' d='M18,4.7c0,0-14.3-5.8-13.6,7.4c0.1,2.8,4,21.3,8.7,15.7c1.7-2,3.2-3.7,3.2-3.7'/%3E%3Cpath class='st2' d='M25.7,3.6c-0.5,0.2,7.9-3.1,12.7,3c1.7,2.2-0.3,11-5,18'/%3E%3Cpath class='st3' d='M33.5,24.6c0,0,0.3,1.5,4.7,0.6c1.9-0.4,0.8,1.1-1.2,2c-1.6,0.8-5.3,0.9-5.3-0.1 C31.6,24.5,33.6,25.3,33.5,24.6c-0.1-0.6-1.1-1.2-1.7-2.7c-0.5-1.3-7.3-11.2,1.9-9.7c0.3-0.1-2.4-8.7-11-8.9 c-8.6-0.1-8.3,10.6-8.3,10.6'/%3E%3Cpath class='st2' d='M19.4,25.6c-1.2,1.3-0.8,1.6-3.2,2.1c-2.4,0.5-1,1.4-0.1,1.6c1.1,0.3,3.7,0.7,5.5-1.8c0.5-0.8,0-2-0.7-2.3 C20.5,25.1,20,24.9,19.4,25.6L19.4,25.6z'/%3E%3Cpath class='st2' d='M19.3,25.5c-0.1-0.8,0.3-1.7,0.7-2.8c0.6-1.6,2-3.3,0.9-8.5c-0.8-3.9-6.5-0.8-6.5-0.3c0,0.5,0.3,2.7-0.1,5.2 c-0.5,3.3,2.1,6,5,5.7'/%3E%3Cpath class='st4' d='M18,13.8c0,0.2,0.3,0.7,0.8,0.7c0.5,0.1,0.9-0.3,0.9-0.5c0-0.2-0.3-0.4-0.8-0.4C18.4,13.6,18,13.7,18,13.8 L18,13.8z'/%3E%3Cpath class='st5' d='M32,13.5c0,0.2-0.3,0.7-0.8,0.7c-0.5,0.1-0.9-0.3-0.9-0.5c0-0.2,0.3-0.4,0.8-0.4C31.6,13.2,32,13.3,32,13.5 L32,13.5z'/%3E%3Cpath class='st2' d='M33.7,12.2c0.1,1.4-0.3,2.4-0.4,3.9c-0.1,2.2,1,4.7-0.6,7.2'/%3E%3Cpath class='st6' d='M2.7,6.6'/%3E%3C/g%3E%3C/svg%3E%0A")  0 0 no-repeat;
    */
-  background: url(data:image/svg+xml;base64,<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
   xmlns:dc="http://purl.org/dc/elements/1.1/"
   xmlns:cc="http://creativecommons.org/ns#"
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
   xmlns:svg="http://www.w3.org/2000/svg"
   xmlns="http://www.w3.org/2000/svg"
   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
   width="432.071pt"
   height="445.383pt"
   viewBox="0 0 432.071 445.383"
   xml:space="preserve"
   id="svg2458"
   sodipodi:version="0.32"
   inkscape:version="0.46"
   sodipodi:docname="Postgresql_elephant.bleu_royal.svg"
   inkscape:output_extension="org.inkscape.output.svg.inkscape"><metadata
   id="metadata2489"><rdf:RDF><cc:Work
       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
   id="defs2487"><inkscape:perspective
   sodipodi:type="inkscape:persp3d"
   inkscape:vp_x="0 : 278.36438 : 1"
   inkscape:vp_y="0 : 1000 : 0"
   inkscape:vp_z="540.08875 : 278.36438 : 1"
   inkscape:persp3d-origin="270.04437 : 185.57625 : 1"
   id="perspective2491" />
</defs><sodipodi:namedview
   inkscape:window-height="717"
   inkscape:window-width="939"
   inkscape:pageshadow="2"
   inkscape:pageopacity="0"
   guidetolerance="10.0"
   gridtolerance="10.0"
   objecttolerance="10.0"
   borderopacity="1.0"
   bordercolor="#666666"
   pagecolor="#ff0000"
   id="base"
   showgrid="false"
   inkscape:zoom="0.88373376"
   inkscape:cx="250.24203"
   inkscape:cy="275.64885"
   inkscape:window-x="0"
   inkscape:window-y="120"
   inkscape:current-layer="svg2458" />
<g
   id="orginal"
   style="fill-rule: nonzero; clip-rule: nonzero; stroke: rgb(0, 0, 0); stroke-miterlimit: 4;">
	</g>
<g
   id="g3275"><path
     style="fill:none;fill-rule:nonzero;stroke:#FFFFFF;stroke-width:12.46510029000000053;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;fill-opacity:0;stroke-opacity:1"
     d="M 402.395,271.23 C 352.093,281.606 348.635,264.575 348.635,264.575 C 401.746,185.767 423.948,85.732 404.788,61.249 C 352.518,-5.536 262.036,26.049 260.526,26.869 L 260.04,26.956 C 250.102,24.893 238.98,23.664 226.48,23.46 C 203.719,23.087 186.454,29.427 173.353,39.362 C 173.353,39.362 11.942,-27.133 19.449,122.992 C 21.046,154.93 65.225,364.649 117.92,301.304 C 137.18,278.141 155.789,258.556 155.789,258.556 C 165.032,264.696 176.097,267.828 187.697,266.703 L 188.598,265.938 C 188.318,268.814 188.446,271.627 188.959,274.957 C 175.384,290.124 179.373,292.787 152.236,298.373 C 124.777,304.032 140.908,314.107 151.44,316.74 C 164.208,319.933 193.747,324.456 213.706,296.516 L 212.91,299.704 C 218.229,303.964 221.964,327.415 221.338,348.673 C 220.712,369.932 220.294,384.527 224.485,395.927 C 228.676,407.327 232.853,432.977 268.527,425.333 C 298.336,418.945 313.783,402.391 315.932,374.778 C 317.457,355.147 320.908,358.049 321.126,340.498 L 323.894,332.189 C 327.086,305.578 324.401,296.993 342.766,300.986 L 347.229,301.378 C 360.746,301.993 378.437,299.204 388.82,294.378 C 411.178,284.002 424.438,266.678 402.393,271.23 L 402.395,271.23 z"
     id="path2464" /><path
     d="M 215.866,286.484 C 214.481,336 216.214,385.861 221.059,397.979 C 225.907,410.097 236.282,433.667 271.959,426.024 C 301.765,419.634 312.61,407.268 317.316,379.973 C 320.782,359.891 327.464,304.119 328.321,292.692"
     id="path2466"
     style="fill-rule:nonzero;stroke:#FFFFFF;stroke-width:12.46510029000000053;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;fill:none" /><path
     d="M 173.104,38.256 C 173.104,38.256 11.583,-27.76 19.092,122.365 C 20.689,154.303 64.871,364.029 117.565,300.681 C 136.821,277.515 154.236,259.346 154.236,259.346"
     id="path2468"
     style="fill-rule:nonzero;stroke:#FFFFFF;stroke-width:12.46510029000000053;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;fill:none" /><path
     d="M 260.349,26.207 C 254.758,27.96 350.197,-8.682 404.436,60.624 C 423.595,85.108 401.393,185.143 348.283,263.953"
     id="path2470"
     style="fill-rule:nonzero;stroke:#FFFFFF;stroke-width:12.46510029000000053;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;fill:none" /><path
     style="fill-rule:nonzero;stroke:#FFFFFF;stroke-width:12.46510029000000053;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;fill:none"
     d="M 348.282,263.953 C 348.282,263.953 351.743,280.989 402.046,270.606 C 424.086,266.054 410.822,283.38 388.469,293.761 C 370.124,302.275 328.995,304.457 328.323,292.692 C 326.594,262.337 349.97,271.559 348.283,263.953 C 346.758,257.103 336.304,250.38 329.389,233.615 C 323.352,218.982 246.593,106.766 350.676,123.432 C 354.489,122.643 323.53,24.43 226.123,22.833 C 128.738,21.236 131.933,142.595 131.933,142.595"
     id="path2472" /><path
     d="M 188.604,274.334 C 175.027,289.5 179.02,292.163 151.881,297.751 C 124.422,303.411 140.555,313.484 151.084,316.116 C 163.852,319.311 193.391,323.834 213.35,295.887 C 219.428,287.378 213.314,273.801 204.965,270.34 C 200.931,268.669 195.537,266.575 188.604,274.334 L 188.604,274.334 z"
     id="path2474"
     style="fill-rule:nonzero;stroke:#FFFFFF;stroke-width:12.46510029000000053;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;fill:none" /><path
     d="M 187.715,274.069 C 186.347,265.152 190.645,254.541 195.251,242.127 C 202.173,223.501 218.144,204.872 205.368,145.788 C 195.845,101.759 131.972,136.625 131.932,142.595 C 131.893,148.563 134.821,172.855 130.865,201.143 C 125.703,238.056 154.353,269.275 187.344,266.081"
     id="path2476"
     style="fill-rule:nonzero;stroke:#FFFFFF;stroke-width:12.46510029000000053;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;fill:none" /><path
     style="fill:#FFFFFF;fill-rule:nonzero;stroke:#FFFFFF;stroke-width:4.15500020999999986;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;fill-opacity:1"
     d="M 172.517,141.7 C 172.229,143.739 176.25,149.18 181.493,149.907 C 186.727,150.637 191.207,146.385 191.491,144.348 C 191.775,142.309 187.759,140.063 182.514,139.333 C 177.277,138.602 172.795,139.666 172.518,141.7 L 172.517,141.7 z"
     id="path2478" /><path
     style="fill:#FFFFFF;fill-rule:nonzero;stroke:#FFFFFF;stroke-width:2.07750009999999996;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;fill-opacity:1"
     d="M 331.941,137.543 C 332.225,139.582 328.209,145.023 322.965,145.75 C 317.727,146.48 313.247,142.228 312.96,140.191 C 312.683,138.152 316.7,135.906 321.939,135.176 C 327.178,134.446 331.657,135.509 331.941,137.544 L 331.941,137.543 z"
     id="path2480" /><path
     d="M 350.676,123.432 C 351.539,139.426 347.231,150.32 346.688,167.346 C 345.884,192.094 358.487,220.42 339.497,248.781"
     id="path2482"
     style="fill-rule:nonzero;stroke:#FFFFFF;stroke-width:12.46510029000000053;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;fill:none" /></g><path
   id="path2484"
   style="fill-rule:nonzero;stroke:#ffffff;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4"
   d="" />
</svg>)  0 0 no-repeat;
-  background-size: 25px 25px;
+  background: url(data:image/svg+xml;base64,PHN2ZyBpZD0iTGF5ZXJfMSIgZGF0YS1uYW1lPSJMYXllciAxIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyMDUgNTAiPjxkZWZzPjxzdHlsZT4uY2xzLTF7ZmlsbDojZmZmO30uY2xzLTJ7ZmlsbDojMzI2ODkzO308L3N0eWxlPjwvZGVmcz48dGl0bGU+cGdBZG1pbjwvdGl0bGU+PHBhdGggY2xhc3M9ImNscy0xIiBkPSJNNTguOTQsNDEuNGEyLjQ4LDIuNDgsMCwwLDEtMi4yNy0zLjQ5TDY0LDIxLjI5VjZhNiw2LDAsMCwwLTYtNkg2QTYsNiwwLDAsMCwwLDZWNDRhNiw2LDAsMCwwLDYsNkg1OGE2LDYsMCwwLDAsNi02VjQxLjRaIi8+PHBhdGggY2xhc3M9ImNscy0yIiBkPSJNMjkuMjUsMzAuMTdhMTMuMTMsMTMuMTMsMCwwLDEtMS44Mi02LjkzLDEzLDEzLDAsMCwxLDEuODItNi44OCwxMi41LDEyLjUsMCwwLDEsMS40OC0xLjk1LDEwLjQ0LDEwLjQ0LDAsMCwwLTMuMjUtMi44OSwxMS4xNiwxMS4xNiwwLDAsMC01LjY1LTEuNDVxLTQuNDgsMC02LjcyLDIuNjRWMTAuNDRINy41MVY0MC4zNmExLDEsMCwwLDAsMSwxaDZhMSwxLDAsMCwwLDEtMVYzMS4xOWE4LjQ3LDguNDcsMCwwLDAsNi4zNCwyLjQsMTEuMjYsMTEuMjYsMCwwLDAsNS42NS0xLjQ1LDEwLjUzLDEwLjUzLDAsMCwwLDIuMDYtMS41NkMyOS40NCwzMC40NCwyOS4zNCwzMC4zMSwyOS4yNSwzMC4xN1pNMjMuNiwyNS44YTQuNTIsNC41MiwwLDAsMS0zLjQ1LDEuNDQsNC40OCw0LjQ4LDAsMCwxLTMuNDQtMS40NCw1LjYsNS42LDAsMCwxLTEuMzUtNCw1LjU5LDUuNTksMCwwLDEsMS4zNS00LDQuNDYsNC40NiwwLDAsMSwzLjQ0LTEuNDUsNC40OSw0LjQ5LDAsMCwxLDMuNDUsMS40NSw1LjYzLDUuNjMsMCwwLDEsMS4zNCw0QTUuNjQsNS42NCwwLDAsMSwyMy42LDI1LjhaIi8+PHBhdGggY2xhc3M9ImNscy0yIiBkPSJNNTYuNDksMTIuNjNWMzEuMjRxMCw2LjM1LTMuNDQsOS41MXQtOS45MiwzLjE3YTI1LjQyLDI1LjQyLDAsMCwxLTYuMy0uNzUsMTUsMTUsMCwwLDEtNS0yLjIzbDIuODktNS41OWExMC4xNywxMC4xNywwLDAsMCwzLjUxLDEuNzksMTQuMzcsMTQuMzcsMCwwLDAsNC4xOC42NUE2LjUzLDYuNTMsMCwwLDAsNDcsMzYuNGE1LjM3LDUuMzcsMCwwLDAsMS40Ny00LjExdi0uNzZjLTEuNTQsMS44LTMuNzksMi42OS02Ljc2LDIuNjlhMTEuNywxMS43LDAsMCwxLTUuNTktMS4zNkExMC4zNywxMC4zNywwLDAsMSwzMi4wOSwyOWExMC44OSwxMC44OSwwLDAsMS0xLjUxLTUuNzcsMTAuODYsMTAuODYsMCwwLDEsMS41MS01Ljc0LDEwLjQyLDEwLjQyLDAsMCwxLDQuMDctMy44NiwxMS43MSwxMS43MSwwLDAsMSw1LjU5LTEuMzdjMy4yNSwwLDUuNjMsMS4wNiw3LjE0LDMuMTVWMTIuNjNabS05LjMsMTMuOTVhNC40LDQuNCwwLDAsMCwxLjQtMy4zNiw0LjM0LDQuMzQsMCwwLDAtMS4zOC0zLjM0LDUuNjUsNS42NSwwLDAsMC03LjE2LDAsNC4zLDQuMywwLDAsMC0xLjQxLDMuMzQsNC4zNSw0LjM1LDAsMCwwLDEuNDMsMy4zNiw1LjA4LDUuMDgsMCwwLDAsMy41NywxLjNBNSw1LDAsMCwwLDQ3LjE5LDI2LjU4WiIvPjxwYXRoIGNsYXNzPSJjbHMtMSIgZD0iTTgzLjQzLDMyLjg5SDcxbC0yLDUuMDlhMSwxLDAsMCwxLS45My42Mkg2MS43M2ExLDEsMCwwLDEtLjkxLTEuNEw3Mi45MSw5LjhhMSwxLDAsMCwxLC45Mi0uNmg2Ljg5YTEsMSwwLDAsMSwuOTEuNkw5My43NywzNy4yYTEsMSwwLDAsMS0uOTIsMS40SDg2LjQxYTEsMSwwLDAsMS0uOTMtLjYyWk04MSwyNi43NmwtMy43OC05LjQxLTMuNzgsOS40MVoiLz48cGF0aCBjbGFzcz0iY2xzLTEiIGQ9Ik0xMjAuNDQsOC40NFYzNy42YTEsMSwwLDAsMS0xLDFoLTUuNmExLDEsMCwwLDEtMS0xVjM2LjMzUTExMC42MiwzOSwxMDYuMTYsMzlhMTEuMjksMTEuMjksMCwwLDEtNS42Ny0xLjQ1LDEwLjU0LDEwLjU0LDAsMCwxLTQtNC4xNEExMi42MiwxMi42MiwwLDAsMSw5NSwyNy4xOCwxMi41MywxMi41MywwLDAsMSw5Ni40NCwyMWExMC4zNSwxMC4zNSwwLDAsMSw0LTQuMDksMTEuNDgsMTEuNDgsMCwwLDEsNS42Ny0xLjQzLDguMjQsOC4yNCwwLDAsMSw2LjMsMi4zNVY4LjQ0YTEsMSwwLDAsMSwxLTFoNkExLDEsMCwwLDEsMTIwLjQ0LDguNDRabS05LjE5LDIyLjc1YTUuNzEsNS43MSwwLDAsMCwxLjM0LTQsNS42LDUuNiwwLDAsMC0xLjMyLTMuOTUsNC40Nyw0LjQ3LDAsMCwwLTMuNDMtMS40Myw0LjUzLDQuNTMsMCwwLDAtMy40NCwxLjQzLDUuNTEsNS41MSwwLDAsMC0xLjM0LDMuOTUsNS42Nyw1LjY3LDAsMCwwLDEuMzQsNCw0Ljc3LDQuNzcsMCwwLDAsNi44NSwwWiIvPjxwYXRoIGNsYXNzPSJjbHMtMSIgZD0iTTE2MSwxOGMxLjY2LDEuNjgsMi41LDQuMjEsMi41LDcuNnYxMmExLDEsMCwwLDEtMSwxaC02YTEsMSwwLDAsMS0xLTFWMjYuODhhNS42Nyw1LjY3LDAsMCwwLS45LTMuNTMsMy4wOSwzLjA5LDAsMCwwLTIuNTUtMS4xMywzLjYyLDMuNjIsMCwwLDAtMi44OSwxLjI2LDUuNzEsNS43MSwwLDAsMC0xLjEsMy44MlYzNy42YTEsMSwwLDAsMS0xLDFoLTZhMSwxLDAsMCwxLTEtMVYyNi44OGMwLTMuMTEtMS4xNC00LjY2LTMuNDQtNC42NmEzLjcsMy43LDAsMCwwLTIuOTQsMS4yNiw1LjcxLDUuNzEsMCwwLDAtMS4wOSwzLjgyVjM3LjZhMSwxLDAsMCwxLTEsMWgtNmExLDEsMCwwLDEtMS0xVjE2Ljg0YTEsMSwwLDAsMSwxLTFoNS42YTEsMSwwLDAsMSwxLDF2MS4zOWE4LDgsMCwwLDEsMy0yLjA4LDEwLjIzLDEwLjIzLDAsMCwxLDMuOC0uNjksMTAsMTAsMCwwLDEsNC4yOS44OEE3LjI4LDcuMjgsMCwwLDEsMTQ2LjQyLDE5YTguODUsOC44NSwwLDAsMSwzLjQxLTIuNjUsMTAuOTMsMTAuOTMsMCwwLDEsNC40OS0uOTJBOSw5LDAsMCwxLDE2MSwxOFoiLz48cGF0aCBjbGFzcz0iY2xzLTEiIGQ9Ik0xNjguMTIsMTIuMWEzLjkxLDMuOTEsMCwwLDEtMS4zNC0yLjc5QTQuMTYsNC4xNiwwLDAsMSwxNjgsNi4xOWE1LDUsMCwwLDEsMy42Ny0xLjM2QTUuMjUsNS4yNSwwLDAsMSwxNzUuMTgsNmEzLjc1LDMuNzUsMCwwLDEsMS4zNCwzLDQuMSw0LjEsMCwwLDEtMS4zNCwzLjEzLDUuNjgsNS42OCwwLDAsMS03LjA2LDBabS41NCwzLjc0aDZhMSwxLDAsMCwxLDEsMVYzNy42YTEsMSwwLDAsMS0xLDFoLTZhMSwxLDAsMCwxLTEtMVYxNi44NEExLDEsMCwwLDEsMTY4LjY2LDE1Ljg0WiIvPjxwYXRoIGNsYXNzPSJjbHMtMSIgZD0iTTIwMS41NSwxOHEyLjU5LDIuNTIsMi41OSw3LjZ2MTJhMSwxLDAsMCwxLTEsMWgtNmExLDEsMCwwLDEtMS0xVjI2Ljg4cTAtNC42Ni0zLjc0LTQuNjZhNC4zLDQuMywwLDAsMC0zLjMsMS4zNCw1LjgzLDUuODMsMCwwLDAtMS4yNCw0djEwYTEsMSwwLDAsMS0xLDFoLTZhMSwxLDAsMCwxLTEtMVYxNi44NGExLDEsMCwwLDEsMS0xaDUuNjFhMSwxLDAsMCwxLDEsMXYxLjQ3YTkuMDUsOS4wNSwwLDAsMSwzLjE5LTIuMTIsMTAuNzgsMTAuNzgsMCwwLDEsNC0uNzNBOS4zNCw5LjM0LDAsMCwxLDIwMS41NSwxOFoiLz48L3N2Zz4=)  0 0 no-repeat;
+  background-position-y: center;
 }
 
 .dashboard-pg-doc {
@@ -142,17 +141,6 @@
   min-height: $footer-height-calc*1.5;
 }
 
-
-@media (min-width: 768px) {
-  .pg-navbar {
-    height: $navbar-height;
-  }
-
-  .pg-docker {
-    top: $navbar-height !important;
-  }
-}
-
 .pg-navbar {
   font-size: $navbar-font-size;
   background-color: $navbar-color-bg;
@@ -176,8 +164,8 @@
   position:absolute;
   left:0px;
   right:0px;
-  top:$title-height;
   bottom:0px;
+  top: $navbar-height !important;
 }
 
 .pg-panel-content {
diff --git a/web/pgadmin/static/scss/resources/_default.variables.scss b/web/pgadmin/static/scss/resources/_default.variables.scss
index 3a77c568..09aaf8ae 100644
--- a/web/pgadmin/static/scss/resources/_default.variables.scss
+++ b/web/pgadmin/static/scss/resources/_default.variables.scss
@@ -102,7 +102,13 @@ $card-cap-bg: $color-bg-theme;
 $card-bg: $color-bg-theme;
 
 
+$navbar-padding-y: 0rem;
+$navbar-padding-x: 0rem;
 $navbar-brand-padding-y: 0rem;
+$navbar-toggler-padding-y: 0rem;
+$navbar-toggler-padding-x: 0rem;
+$navbar-toggler-font-size: $font-size-base;
+$navbar-dark-toggler-border-color: tranparent;
 
 $nav-tabs-border-color: $border-color;
 $nav-tabs-border-width: 1px;
@@ -166,8 +172,8 @@ $navbar-color-bg: $color-primary;
 $navbar-font-size: 0.925rem;
 $navbar-user-font-size: 0.875rem;
 
-$navbar-height: 40px;
-$navbar-dropdown-top: 110%;
+$navbar-height: 32px;
+$navbar-dropdown-top: 100%;
 $dropdown-submenu-top: -$dropdown-spacer;
 
 $table-bg: $color-bg-theme;
