diff --git a/airflow/www_rbac/app.py b/airflow/www_rbac/app.py
index b720d89f1332e..2fc5dccb1b1d0 100644
--- a/airflow/www_rbac/app.py
+++ b/airflow/www_rbac/app.py
@@ -99,7 +99,7 @@ def create_app(config=None, session=None, testing=False, app_name="Airflow"):
             app,
             db.session if not session else session,
             security_manager_class=security_manager_class,
-            base_template='appbuilder/baselayout.html')
+            base_template='airflow/master.html')
 
         def init_views(appbuilder):
             from airflow.www_rbac import views
diff --git a/airflow/www_rbac/templates/airflow/dags.html b/airflow/www_rbac/templates/airflow/dags.html
index a08baee0ec8bc..050183d5eea78 100644
--- a/airflow/www_rbac/templates/airflow/dags.html
+++ b/airflow/www_rbac/templates/airflow/dags.html
@@ -15,7 +15,7 @@
   limitations under the License.
 
 #}
-{% extends "airflow/master.html" %}
+{% extends base_template %}
 
 {% block title %}Airflow - DAGs{% endblock %}
 
diff --git a/airflow/www_rbac/templates/airflow/master.html b/airflow/www_rbac/templates/airflow/master.html
index 92a4b9ad7835d..44471412c3ddc 100644
--- a/airflow/www_rbac/templates/airflow/master.html
+++ b/airflow/www_rbac/templates/airflow/master.html
@@ -15,4 +15,51 @@
   limitations under the License.
 
 #}
-{% extends "appbuilder/baselayout.html" %}
+
+{% extends 'appbuilder/baselayout.html' %}
+
+{% block head_css %}
+  {{ super() }}
+
+  {% if not appbuilder.app_theme %}
+    {# airflowDefaultTheme.css file contains the styles from local bootstrap-theme.css #}
+    <link href="{{ url_for_asset('airflowDefaultTheme.css') }}" rel="stylesheet">
+  {% endif %}
+  <link href="{{ url_for_asset('main.css') }}" rel="stylesheet">
+
+  <link rel="icon" type="image/png" href="{{ url_for('static', filename='pin_32.png') }}">
+{% endblock %}
+
+
+{% block messages %}
+  {% include 'appbuilder/flash.html' %}
+  {% if scheduler_job is defined and (not scheduler_job or not scheduler_job.is_alive()) %}
+    <div class="alert alert-warning">
+      <p>The scheduler does not appear to be running.
+      {% if scheduler_job %}
+      Last heartbeat was received <time title="{{ scheduler_job.latest_heartbeat.isoformat() }}" datetime="{{ scheduler_job.latest_heartbeat.isoformat() }}">{{ macros.datetime_diff_for_humans(scheduler_job.latest_heartbeat) }}</time>.
+      {% endif %}
+      </p>
+      <p>The DAGs list may not update, and new tasks will not be scheduled.</p>
+    </div>
+  {% endif %}
+{% endblock %}
+
+{% block tail_js %}
+  {{ super() }}
+
+  <script type="text/javascript">
+    // below variables are used in base.js
+    var hostName = '{{ hostname }}';
+    var csrfToken = '{{ csrf_token() }}';
+    $("time[title]").tooltip()
+  </script>
+  <!--[if IE ]>
+  <script src="{{ url_for_asset('ie.js') }}" type="text/javascript"></script>
+  <![endif]-->
+  <script src="{{ url_for_asset('base.js') }}" type="text/javascript"></script>
+
+  {% if analytics_tool is defined and analytics_tool %}
+    {% include "analytics/" + analytics_tool + ".html" %}
+  {% endif %}
+{% endblock %}
diff --git a/airflow/www_rbac/templates/appbuilder/baselayout.html b/airflow/www_rbac/templates/appbuilder/baselayout.html
deleted file mode 100644
index eae7a1fa06a5e..0000000000000
--- a/airflow/www_rbac/templates/appbuilder/baselayout.html
+++ /dev/null
@@ -1,96 +0,0 @@
-{#
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
-#}
-
-{% extends 'appbuilder/init.html' %}
-{% import 'appbuilder/baselib.html' as baselib %}
-
-{% block head_css %}
-  {{ super() }}
-
-
-  {% if not appbuilder.app_theme %}
-    {# airflowDefaultTheme.css file contains the styles from local bootstrap-theme.css #}
-    <link href="{{ url_for_asset('airflowDefaultTheme.css') }}" rel="stylesheet">
-  {% endif %}
-  <link href="{{ url_for_asset('main.css') }}" rel="stylesheet">
-
-  <link rel="icon" type="image/png" href="{{ url_for('static', filename='pin_32.png') }}">
-{% endblock %}
-
-
-{% block body %}
-    {% include 'appbuilder/general/confirm.html' %}
-    {% include 'appbuilder/general/alert.html' %}
-    {% block navbar %}
-        <header class="top" role="header">
-        {% include 'appbuilder/navbar.html' %}
-        </header>
-    {% endblock %}
-
-
-    <div class="container">
-      <div class="row">
-          {% block messages %}
-            {% include 'appbuilder/flash.html' %}
-            {% if scheduler_job is defined and (not scheduler_job or not scheduler_job.is_alive()) %}
-              <div class="alert alert-warning">
-                <p>The scheduler does not appear to be running.
-                {% if scheduler_job %}
-                Last heartbeat was received <time title="{{ scheduler_job.latest_heartbeat.isoformat() }}" datetime="{{ scheduler_job.latest_heartbeat.isoformat() }}">{{ macros.datetime_diff_for_humans(scheduler_job.latest_heartbeat) }}</time>.
-                {% endif %}
-                </p>
-                <p>The DAGs list may not update, and new tasks will not be scheduled.</p>
-              </div>
-            {% endif %}
-          {% endblock %}
-          {% block content %}
-          {% endblock %}
-      </div>
-    </div>
-
-    {% block footer %}
-        <footer>
-        <div class="img-rounded nav-fixed-bottom">
-            <div class="container">
-                {% include 'appbuilder/footer.html' %}
-            </div>
-        </div>
-        </footer>
-    {% endblock %}
-{% endblock %}
-
-
-{% block tail_js %}
-  {{ super() }}
-
-  <script type="text/javascript">
-    // below variables are used in base.js
-    var hostName = '{{ hostname }}';
-    var csrfToken = '{{ csrf_token() }}';
-    $("time[title]").tooltip()
-  </script>
-  <!--[if IE ]>
-  <script src="{{ url_for_asset('ie.js') }}" type="text/javascript"></script>
-  <![endif]-->
-  <script src="{{ url_for_asset('base.js') }}" type="text/javascript"></script>
-
-  {% if analytics_tool is defined and analytics_tool %}
-    {% include "analytics/" + analytics_tool + ".html" %}
-  {% endif %}
-{% endblock %}