diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/templates/domain_constraints/css/domain_constraints.css b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/templates/domain_constraints/css/domain_constraints.css
index b862cbdc5..cc73f18f2 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/templates/domain_constraints/css/domain_constraints.css
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/domain_constraints/templates/domain_constraints/css/domain_constraints.css
@@ -1,5 +1,5 @@
 .icon-coll-domain_constraints {
-  background-image: url('{{ url_for('NODE-%s.static' % node_type, filename='img/coll-domain_constraints.png' )}}') !important;
+  background-image: url('{{ url_for('NODE-%s.static' % node_type, filename='img/coll-domain_constraints.svg' )}}') !important;
   background-repeat: no-repeat;
   align-content: center;
   vertical-align: middle;
@@ -15,9 +15,9 @@
 }
 
 .icon-check, .icon-domain_constraints {
-  background-image: url('{{ url_for('NODE-%s.static' % node_type, filename='img/domain_constraints.png' )}}') !important;
+  background-image: url('{{ url_for('NODE-%s.static' % node_type, filename='img/domain_constraints.svg' )}}') !important;
   background-repeat: no-repeat;
   align-content: center;
   vertical-align: middle;
   height: 1.3em;
-}
\ No newline at end of file
+}
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/templates/check_constraint/css/check_constraint.css b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/templates/check_constraint/css/check_constraint.css
index 0691868a7..b8b4a2fd8 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/templates/check_constraint/css/check_constraint.css
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/templates/check_constraint/css/check_constraint.css
@@ -1,5 +1,5 @@
 .icon-check_bad, .icon-check_constraints_bad {
-  background-image: url('{{ url_for('NODE-%s.static' % node_type, filename='img/check-constraints-bad.png' )}}') !important;
+  background-image: url('{{ url_for('NODE-%s.static' % node_type, filename='img/check-constraints-bad.svg' )}}') !important;
   background-repeat: no-repeat;
   align-content: center;
   vertical-align: middle;
@@ -7,9 +7,9 @@
 }
 
 .icon-check, .icon-check_constraints {
-  background-image: url('{{ url_for('NODE-%s.static' % node_type, filename='img/check-constraints.png' )}}') !important;
+  background-image: url('{{ url_for('NODE-%s.static' % node_type, filename='img/check-constraints.svg' )}}') !important;
   background-repeat: no-repeat;
   align-content: center;
   vertical-align: middle;
   height: 1.3em;
-}
\ No newline at end of file
+}
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/templates/foreign_key/css/foreign_key.css b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/templates/foreign_key/css/foreign_key.css
index aeaff11c1..48f2e2c04 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/templates/foreign_key/css/foreign_key.css
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/templates/foreign_key/css/foreign_key.css
@@ -1,5 +1,5 @@
 .icon-foreign_key {
-  background-image: url('{{ url_for('NODE-foreign_key.static', filename='img/foreign_key.png') }}') !important;
+  background-image: url('{{ url_for('NODE-foreign_key.static', filename='img/foreign_key.svg') }}') !important;
   background-repeat: no-repeat;
   align-content: center;
   vertical-align: middle;
@@ -7,6 +7,6 @@
 }
 
 .icon-foreign_key_no_validate {
-  background-image: url('{{ url_for('NODE-foreign_key.static', filename='img/foreign_key_no_validate.png') }}') !important;
+  background-image: url('{{ url_for('NODE-foreign_key.static', filename='img/foreign_key_no_validate.svg') }}') !important;
   border-radius: 10px
-}
\ No newline at end of file
+}
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/templates/rules/css/rule.css b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/templates/rules/css/rule.css
index 3d21bcfec..dee2550ad 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/templates/rules/css/rule.css
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/templates/rules/css/rule.css
@@ -1,5 +1,5 @@
 .icon-rule{
-  background-image: url('{{ url_for('NODE-rule.static', filename='img/rule.png') }}') !important;
+  background-image: url('{{ url_for('NODE-rule.static', filename='img/rule.svg') }}') !important;
   border-radius: 10px;
   background-repeat: no-repeat;
   align-content: center;
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/templates/trigger/css/trigger.css b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/templates/trigger/css/trigger.css
index 811c8381d..10f107772 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/templates/trigger/css/trigger.css
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/templates/trigger/css/trigger.css
@@ -1,5 +1,5 @@
 .icon-coll-trigger {
-  background-image: url('{{ url_for('NODE-trigger.static', filename='img/coll-trigger.png' )}}') !important;
+  background-image: url('{{ url_for('NODE-trigger.static', filename='img/coll-trigger.svg' )}}') !important;
   background-repeat: no-repeat;
   align-content: center;
   vertical-align: middle;
@@ -7,7 +7,7 @@
 }
 
 .icon-trigger {
-  background-image: url('{{ url_for('NODE-trigger.static', filename='img/trigger.png') }}') !important;
+  background-image: url('{{ url_for('NODE-trigger.static', filename='img/trigger.svg') }}') !important;
   background-repeat: no-repeat;
   align-content: center;
   vertical-align: middle;
@@ -15,6 +15,6 @@
 }
 
 .icon-trigger-bad {
-  background-image: url('{{ url_for('NODE-trigger.static', filename='img/trigger-bad.png') }}') !important;
+  background-image: url('{{ url_for('NODE-trigger.static', filename='img/trigger-bad.svg') }}') !important;
   border-radius: 10px
 }
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mview/css/mview.css b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mview/css/mview.css
index 4782530e5..bdd374766 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mview/css/mview.css
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/mview/css/mview.css
@@ -1,5 +1,5 @@
 .icon-mview{
-  background-image: url('{{ url_for('NODE-mview.static', filename='img/mview.png') }}') !important;
+  background-image: url('{{ url_for('NODE-mview.static', filename='img/mview.svg') }}') !important;
   border-radius: 10px;
   background-repeat: no-repeat;
   align-content: center;
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/css/view.css b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/css/view.css
index 89eae4ee0..4e436a114 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/css/view.css
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/templates/view/css/view.css
@@ -1,5 +1,5 @@
 .icon-view{
-  background-image: url('{{ url_for('NODE-view.static', filename='img/view.png') }}') !important;
+  background-image: url('{{ url_for('NODE-view.static', filename='img/view.svg') }}') !important;
   border-radius: 10px;
   background-repeat: no-repeat;
   align-content: center;
diff --git a/web/pgadmin/browser/server_groups/servers/databases/templates/databases/css/database.css b/web/pgadmin/browser/server_groups/servers/databases/templates/databases/css/database.css
index f59bc8e69..d21f3735f 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/templates/databases/css/database.css
+++ b/web/pgadmin/browser/server_groups/servers/databases/templates/databases/css/database.css
@@ -1,5 +1,5 @@
 .pg-icon-database {
-  background-image: url('{{ url_for('NODE-database.static', filename='img/database.png') }}') !important;
+  background-image: url('{{ url_for('NODE-database.static', filename='img/database.svg') }}') !important;
   background-repeat: no-repeat;
   align-content: center;
   vertical-align: middle;
@@ -7,6 +7,6 @@
 }
 
 .icon-database-not-connected {
-  background-image: url('{{ url_for('NODE-database.static', filename='img/databasebad.png') }}') !important;
+  background-image: url('{{ url_for('NODE-database.static', filename='img/databasebad.svg') }}') !important;
   border-radius: 10px
 }
diff --git a/web/pgadmin/browser/server_groups/servers/pgagent/schedules/templates/pga_schedule/css/pga_schedule.css b/web/pgadmin/browser/server_groups/servers/pgagent/schedules/templates/pga_schedule/css/pga_schedule.css
index c62b058ed..fba84e324 100644
--- a/web/pgadmin/browser/server_groups/servers/pgagent/schedules/templates/pga_schedule/css/pga_schedule.css
+++ b/web/pgadmin/browser/server_groups/servers/pgagent/schedules/templates/pga_schedule/css/pga_schedule.css
@@ -1,5 +1,5 @@
 .icon-pga_schedule {
-  background-image: url('{{ url_for('NODE-pga_schedule.static', filename='img/pga_schedule.png') }}') !important;
+  background-image: url('{{ url_for('NODE-pga_schedule.static', filename='img/pga_schedule.svg') }}') !important;
   background-repeat: no-repeat;
   align-content: center;
   vertical-align: middle;
diff --git a/web/pgadmin/browser/server_groups/servers/pgagent/steps/templates/pga_jobstep/css/pga_step.css b/web/pgadmin/browser/server_groups/servers/pgagent/steps/templates/pga_jobstep/css/pga_step.css
index c396604e9..c620d7270 100644
--- a/web/pgadmin/browser/server_groups/servers/pgagent/steps/templates/pga_jobstep/css/pga_step.css
+++ b/web/pgadmin/browser/server_groups/servers/pgagent/steps/templates/pga_jobstep/css/pga_step.css
@@ -5,3 +5,11 @@
   vertical-align: middle;
   height: 1.3em;
 }
+
+.icon-coll-pga_jobstep {
+  background-image: url('{{ url_for('NODE-pga_jobstep.static', filename='img/coll-pga_jobstep.png') }}') !important;
+  background-repeat: no-repeat;
+  align-content: center;
+  vertical-align: middle;
+  height: 1.3em;
+}
diff --git a/web/pgadmin/browser/server_groups/servers/pgagent/templates/pga_job/css/pga_job.css b/web/pgadmin/browser/server_groups/servers/pgagent/templates/pga_job/css/pga_job.css
index 3456b40c8..413d39a8a 100644
--- a/web/pgadmin/browser/server_groups/servers/pgagent/templates/pga_job/css/pga_job.css
+++ b/web/pgadmin/browser/server_groups/servers/pgagent/templates/pga_job/css/pga_job.css
@@ -1,5 +1,5 @@
 .icon-pga_job {
-  background-image: url('{{ url_for('NODE-pga_job.static', filename='img/pga_job.png') }}') !important;
+  background-image: url('{{ url_for('NODE-pga_job.static', filename='img/pga_job.svg') }}') !important;
   background-repeat: no-repeat;
   align-content: center;
   vertical-align: middle;
@@ -7,7 +7,7 @@
 }
 
 .icon-pga_job-disabled {
-  background-image: url('{{ url_for('NODE-pga_job.static', filename='img/pga_job-disabled.png') }}') !important;
+  background-image: url('{{ url_for('NODE-pga_job.static', filename='img/pga_job-disabled.svg') }}') !important;
   background-repeat: no-repeat;
   align-content: center;
   vertical-align: middle;
diff --git a/web/pgadmin/browser/server_groups/servers/roles/templates/role/css/role.css b/web/pgadmin/browser/server_groups/servers/roles/templates/role/css/role.css
index 7145fecff..78f32e189 100644
--- a/web/pgadmin/browser/server_groups/servers/roles/templates/role/css/role.css
+++ b/web/pgadmin/browser/server_groups/servers/roles/templates/role/css/role.css
@@ -1,5 +1,5 @@
 .icon-role {
-  background-image: url('{{ url_for('NODE-role.static', filename='img/role.png')}}') !important;
+  background-image: url('{{ url_for('NODE-role.static', filename='img/role.svg')}}') !important;
   background-repeat: no-repeat;
   align-content: center;
   vertical-align: middle;
@@ -7,7 +7,7 @@
 }
 
 .icon-group {
-  background-image: url('{{ url_for('NODE-role.static', filename='img/group.png')}}') !important;
+  background-image: url('{{ url_for('NODE-role.static', filename='img/group.svg')}}') !important;
   background-repeat: no-repeat;
   align-content: center;
   vertical-align: middle;
@@ -15,13 +15,13 @@
 }
 
 .pgadmin-node-select option[node="role"] {
-  background-image: url('{{ url_for('NODE-role.static', filename='img/role.png')}}') !important;
+  background-image: url('{{ url_for('NODE-role.static', filename='img/role.svg')}}') !important;
   background-repeat: no-repeat;
   background-position: center left;
 }
 
 .pgadmin-node-select option[node="group"] {
-  background-image: url('{{ url_for('NODE-role.static', filename='img/group.png')}}') !important;
+  background-image: url('{{ url_for('NODE-role.static', filename='img/group.svg')}}') !important;
   background-repeat: no-repeat;
   background-position: center left;
 }
diff --git a/web/pgadmin/browser/server_groups/servers/templates/css/server_type.css b/web/pgadmin/browser/server_groups/servers/templates/css/server_type.css
index 799271f06..096e20887 100644
--- a/web/pgadmin/browser/server_groups/servers/templates/css/server_type.css
+++ b/web/pgadmin/browser/server_groups/servers/templates/css/server_type.css
@@ -1,5 +1,5 @@
 .icon-{{ server_type }} {
-  background-image: url('{{ url_for('NODE-server.static', filename='img/%s.png' % server_type)}}') !important;
+  background-image: url('{{ url_for('NODE-server.static', filename='img/%s' % (icon)) }}') !important;
   background-repeat: no-repeat;
   align-content: center;
   vertical-align: middle;
diff --git a/web/pgadmin/browser/server_groups/servers/templates/css/servers.css b/web/pgadmin/browser/server_groups/servers/templates/css/servers.css
index 3dfccc636..a3d617ae5 100644
--- a/web/pgadmin/browser/server_groups/servers/templates/css/servers.css
+++ b/web/pgadmin/browser/server_groups/servers/templates/css/servers.css
@@ -7,8 +7,11 @@
 }
 
 .icon-server-not-connected {
-  background-image: url('{{ url_for('NODE-server.static', filename='img/serverbad.png') }}') !important;
-  border-radius: 10px
+  background-image: url('{{ url_for('NODE-server.static', filename='img/serverbad.svg') }}') !important;
+  background-repeat: no-repeat;
+  align-content: center;
+  vertical-align: middle;
+  height: 1.3em;
 }
 
 .icon-server-connecting {
diff --git a/web/pgadmin/browser/templates/browser/css/collection.css b/web/pgadmin/browser/templates/browser/css/collection.css
index 84325a153..b5ed58451 100644
--- a/web/pgadmin/browser/templates/browser/css/collection.css
+++ b/web/pgadmin/browser/templates/browser/css/collection.css
@@ -1,7 +1,7 @@
 .icon-coll-{{node_type}} {
-  background-image: url('{{ url_for('NODE-%s.static' % node_type, filename='img/coll-%s.png' % node_type )}}') !important;
+  background-image: url('{{ url_for('NODE-%s.static' % node_type, filename='img/coll-%s.svg' % node_type )}}') !important;
   background-repeat: no-repeat;
   align-content: center;
   vertical-align: middle;
   height: 1.3em;
-}
\ No newline at end of file
+}
diff --git a/web/pgadmin/browser/templates/browser/css/node.css b/web/pgadmin/browser/templates/browser/css/node.css
index 98895e5af..60c9eb22f 100644
--- a/web/pgadmin/browser/templates/browser/css/node.css
+++ b/web/pgadmin/browser/templates/browser/css/node.css
@@ -1,5 +1,5 @@
 .icon-{{node_type}} {
-  background-image: url('{{ url_for('NODE-%s.static' % node_type, filename='img/%s.png' % node_type )}}') !important;
+  background-image: url('{{ url_for('NODE-%s.static' % node_type, filename='img/%s.svg' % node_type )}}') !important;
   background-repeat: no-repeat;
   align-content: center;
   vertical-align: middle;
@@ -7,7 +7,7 @@
 }
 
 .pgadmin-node-select option[node="{{node_type}}"] {
-  background-image: url('{{ url_for('NODE-%s.static' % node_type, filename='img/%s.png' % node_type )}}') !important;
+  background-image: url('{{ url_for('NODE-%s.static' % node_type, filename='img/%s.svg' % node_type )}}') !important;
   background-repeat: no-repeat;
   background-position: center left;
 }