diff --git a/backend/src/api/bisq.ts b/backend/src/api/bisq.ts
index 4bca8f4c6..8ffd599e7 100644
--- a/backend/src/api/bisq.ts
+++ b/backend/src/api/bisq.ts
@@ -107,7 +107,7 @@ class Bisq {
       console.log('Loading Bisq data from dump...');
       const data: BisqBlocks = JSON.parse(cacheData);
       if (data.blocks && data.blocks.length !== this.blocks.length) {
-        this.blocks = data.blocks;
+        this.blocks = data.blocks.filter((block) => block.txs.length > 0);
         this.blocks.reverse();
         const time = new Date().getTime() - start;
         console.log('Bisq dump loaded in ' + time + ' ms');
diff --git a/frontend/src/app/bisq/bisq-address/bisq-address.component.html b/frontend/src/app/bisq/bisq-address/bisq-address.component.html
index b6422e867..ef04202c4 100644
--- a/frontend/src/app/bisq/bisq-address/bisq-address.component.html
+++ b/frontend/src/app/bisq/bisq-address/bisq-address.component.html
@@ -1,5 +1,5 @@
 <div class="container-xl">
-  <h1 style="float: left;">Bisq Address</h1>
+  <h1 style="float: left;">Address</h1>
   <a [routerLink]="['/address/' | relativeUrl, addressString]" style="line-height: 56px; margin-left: 10px;">
     <span class="d-inline d-lg-none">{{ addressString | shortenString : 24 }}</span>
     <span class="d-none d-lg-inline">{{ addressString }}</span>
diff --git a/frontend/src/app/bisq/bisq-block/bisq-block.component.html b/frontend/src/app/bisq/bisq-block/bisq-block.component.html
index 49ad92e2d..f2fd3c7cd 100644
--- a/frontend/src/app/bisq/bisq-block/bisq-block.component.html
+++ b/frontend/src/app/bisq/bisq-block/bisq-block.component.html
@@ -1,7 +1,7 @@
 <div class="container-xl">
 
   <div class="title-block">
-    <h1>Bisq Block <ng-template [ngIf]="blockHeight"><a [routerLink]="['/block/' | relativeUrl, blockHash]">{{ blockHeight }}</a></ng-template></h1>
+    <h1>Block <ng-template [ngIf]="blockHeight"><a [routerLink]="['/block/' | relativeUrl, blockHash]">{{ blockHeight }}</a></ng-template></h1>
   </div>
 
   <div class="clearfix"></div>
diff --git a/frontend/src/app/bisq/bisq-block/bisq-block.component.ts b/frontend/src/app/bisq/bisq-block/bisq-block.component.ts
index 9616c76f2..07f8a086b 100644
--- a/frontend/src/app/bisq/bisq-block/bisq-block.component.ts
+++ b/frontend/src/app/bisq/bisq-block/bisq-block.component.ts
@@ -1,10 +1,12 @@
 import { Component, OnInit, OnDestroy } from '@angular/core';
-import { BisqTransaction, BisqBlock } from 'src/app/bisq/bisq.interfaces';
+import { BisqBlock } from 'src/app/bisq/bisq.interfaces';
+import { Location } from '@angular/common';
 import { BisqApiService } from '../bisq-api.service';
-import { ActivatedRoute, ParamMap } from '@angular/router';
-import { Subscribable, Subscription, of } from 'rxjs';
+import { ActivatedRoute, ParamMap, Router } from '@angular/router';
+import { Subscription, of } from 'rxjs';
 import { switchMap } from 'rxjs/operators';
 import { SeoService } from 'src/app/services/seo.service';
+import { ElectrsApiService } from 'src/app/services/electrs-api.service';
 
 @Component({
   selector: 'app-bisq-block',
@@ -23,13 +25,16 @@ export class BisqBlockComponent implements OnInit, OnDestroy {
     private bisqApiService: BisqApiService,
     private route: ActivatedRoute,
     private seoService: SeoService,
+    private electrsApiService: ElectrsApiService,
+    private router: Router,
+    private location: Location,
   ) { }
 
   ngOnInit(): void {
     this.subscription = this.route.paramMap
       .pipe(
         switchMap((params: ParamMap) => {
-          this.blockHash = params.get('id') || '';
+          const blockHash = params.get('id') || '';
           document.body.scrollTo(0, 0);
           this.isLoading = true;
           if (history.state.data && history.state.data.blockHeight) {
@@ -39,6 +44,27 @@ export class BisqBlockComponent implements OnInit, OnDestroy {
             this.blockHeight = history.state.data.block.height;
             return of(history.state.data.block);
           }
+
+          let isBlockHeight = false;
+          if (/^[0-9]+$/.test(blockHash)) {
+            isBlockHeight = true;
+          } else {
+            this.blockHash = blockHash;
+          }
+
+          if (isBlockHeight) {
+            return this.electrsApiService.getBlockHashFromHeight$(parseInt(blockHash, 10))
+              .pipe(
+                switchMap((hash) => {
+                  this.blockHash = hash;
+                  this.location.replaceState(
+                    this.router.createUrlTree(['/bisq/block/', hash]).toString()
+                  );
+                  return this.bisqApiService.getBlock$(this.blockHash);
+                })
+              );
+          }
+
           return this.bisqApiService.getBlock$(this.blockHash);
         })
       )
diff --git a/frontend/src/app/bisq/bisq-blocks/bisq-blocks.component.html b/frontend/src/app/bisq/bisq-blocks/bisq-blocks.component.html
index 11aa8d0d5..24fdff330 100644
--- a/frontend/src/app/bisq/bisq-blocks/bisq-blocks.component.html
+++ b/frontend/src/app/bisq/bisq-blocks/bisq-blocks.component.html
@@ -1,5 +1,5 @@
 <div class="container-xl">
-  <h2 style="float: left;">Bisq Blocks</h2>
+  <h1 style="float: left;">Blocks</h1>
   <br>
 
   <div class="clearfix"></div>
diff --git a/frontend/src/app/bisq/bisq-transaction/bisq-transaction.component.html b/frontend/src/app/bisq/bisq-transaction/bisq-transaction.component.html
index 24e2a3653..3625fcceb 100644
--- a/frontend/src/app/bisq/bisq-transaction/bisq-transaction.component.html
+++ b/frontend/src/app/bisq/bisq-transaction/bisq-transaction.component.html
@@ -1,6 +1,6 @@
 <div class="container-xl">
 
-  <h1 class="float-left mr-3 mb-md-3">Bisq Transaction</h1>
+  <h1 class="float-left mr-3 mb-md-3">Transaction</h1>
 
   <ng-template [ngIf]="!isLoading" [ngIfElse]="isLoadingTmpl">
 
diff --git a/frontend/src/app/bisq/bisq-transactions/bisq-transactions.component.html b/frontend/src/app/bisq/bisq-transactions/bisq-transactions.component.html
index 9d6629a19..e51c19832 100644
--- a/frontend/src/app/bisq/bisq-transactions/bisq-transactions.component.html
+++ b/frontend/src/app/bisq/bisq-transactions/bisq-transactions.component.html
@@ -1,5 +1,5 @@
 <div class="container-xl">
-  <h2 style="float: left;">Bisq Transactions</h2>
+  <h1 style="float: left;">Transactions</h1>
   <br>
 
   <div class="clearfix"></div>
diff --git a/frontend/src/app/components/master-page/master-page.component.html b/frontend/src/app/components/master-page/master-page.component.html
index 9b37de6c9..2b6d097cd 100644
--- a/frontend/src/app/components/master-page/master-page.component.html
+++ b/frontend/src/app/components/master-page/master-page.component.html
@@ -6,6 +6,8 @@
     <div class="badge badge-warning connection-badge" style="left: 30px;" *ngIf="connectionState === 1">Reconnecting...</div>
   </a>
 
+  <img *ngIf="network !== ''" src="./resources/{{ network }}-logo.png" style="width: 35.5px;" class="mr-3">
+
   <div class="btn-group" style="margin-right: 16px;" *ngIf="env.TESTNET_ENABLED || env.LIQUID_ENABLED || env.BISQ_ENABLED">
     <button type="button" (click)="networkDropdownHidden = !networkDropdownHidden" class="btn btn-secondary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
       <span class="sr-only">Toggle Dropdown</span>
diff --git a/frontend/src/resources/paynym-code.png b/frontend/src/resources/paynym-code.png
deleted file mode 100644
index 28cae4a55..000000000
Binary files a/frontend/src/resources/paynym-code.png and /dev/null differ