diff --git a/lib/components/ApiInfo/api-info.html b/lib/components/ApiInfo/api-info.html
index c853aacaec..35d94f30d7 100644
--- a/lib/components/ApiInfo/api-info.html
+++ b/lib/components/ApiInfo/api-info.html
@@ -1,4 +1,5 @@
 <div class="api-info-wrapper">
+  <a *ngIf="info.contact.url" href="{{info.contact.url}}" class="go-back-link">Return to website</a>
   <h1>{{info.title}} <span class="api-info-version">({{info.version}})</span></h1>
   <p class="download-openapi" *ngIf="specUrl">
     Download OpenAPI specification:
diff --git a/lib/components/ApiInfo/api-info.scss b/lib/components/ApiInfo/api-info.scss
index 6e0d08a501..3b3326092b 100644
--- a/lib/components/ApiInfo/api-info.scss
+++ b/lib/components/ApiInfo/api-info.scss
@@ -5,10 +5,24 @@
   padding: $section-spacing;
   width: 60%;
 
+  .go-back-link {
+    float: right;
+    margin-top: -25px;
+
+    @media (max-width: $side-menu-mobile-breakpoint) {
+      margin-top: 0;
+      float: none;
+      display: block;
+      text-align: center;
+    }
+  }
 
   @media (max-width: $right-panel-squash-breakpoint) {
     width: 100%;
   }
+  @media (max-width: $side-menu-mobile-breakpoint) {
+    padding-top: $section-spacing + 20px;
+  }
 }
 
 .openapi-button {
diff --git a/lib/components/ApiLogo/api-logo.html b/lib/components/ApiLogo/api-logo.html
index 897e358375..e152677bb9 100644
--- a/lib/components/ApiLogo/api-logo.html
+++ b/lib/components/ApiLogo/api-logo.html
@@ -1 +1,4 @@
-<img *ngIf="logo.imgUrl" [attr.src]="logo.imgUrl" [ngStyle]="{'background-color': logo.bgColor}">
+<a *ngIf="logo.url" href="{{logo.url}}">
+    <img *ngIf="logo.imgUrl" [attr.src]="logo.imgUrl" [ngStyle]="{'background-color': logo.bgColor}">
+</a>
+<img *ngIf="logo.imgUrl && !logo.url" [attr.src]="logo.imgUrl" [ngStyle]="{'background-color': logo.bgColor}">
diff --git a/lib/components/ApiLogo/api-logo.ts b/lib/components/ApiLogo/api-logo.ts
index e253d85283..ff75ae12f9 100644
--- a/lib/components/ApiLogo/api-logo.ts
+++ b/lib/components/ApiLogo/api-logo.ts
@@ -17,6 +17,9 @@ export class ApiLogo extends BaseComponent implements OnInit {
 
   init() {
     let logoInfo = this.componentSchema.info['x-logo'];
+    if ('url' in this.componentSchema.info['contact']) {
+      this.logo.url = this.componentSchema.info['contact']['url'];
+    }
     if (!logoInfo) return;
     this.logo.imgUrl = logoInfo.url;
     this.logo.bgColor = logoInfo.backgroundColor || 'transparent';