diff --git a/mod/lti/templates/tool_card.mustache b/mod/lti/templates/tool_card.mustache
index 3d7d27756ed..dba58633cdb 100644
--- a/mod/lti/templates/tool_card.mustache
+++ b/mod/lti/templates/tool_card.mustache
@@ -54,14 +54,14 @@
     <div class="tool-card-content">
         <div class="tool-card-header">
             <div class="tool-card-subheader">
-                <div class="label
-                            {{#state.pending}}label-info{{/state.pending}}
-                            {{#state.configured}}label-success{{/state.configured}}
-                            {{#state.rejected}}label-important{{/state.rejected}}
-                            {{#state.unknown}}label-warning{{/state.unknown}}">
+                <div class="tag
+                            {{#state.pending}}tag-info{{/state.pending}}
+                            {{#state.configured}}tag-success{{/state.configured}}
+                            {{#state.rejected}}tag-important{{/state.rejected}}
+                            {{#state.unknown}}tag-warning{{/state.unknown}}">
                     {{state.text}}
                 </div>
-                <div class="tool-card-actions pull-right">
+                <div class="tool-card-actions pull-xs-right">
                     {{#courseid}}
                         <a href="{{{urls.course}}}" title="{{#str}} courselink, mod_lti {{/str}}">{{#pix}} i/course, core, {{#str}} courselink, mod_lti {{/str}}{{/pix}}</a>
                     {{/courseid}}
diff --git a/mod/lti/templates/tool_configure.mustache b/mod/lti/templates/tool_configure.mustache
index 53c14b5bbac..4060152b8b7 100644
--- a/mod/lti/templates/tool_configure.mustache
+++ b/mod/lti/templates/tool_configure.mustache
@@ -31,44 +31,42 @@
 
 }}
 <h2>{{#str}} manage_external_tools, mod_lti {{/str}}</h2>
-<div class="container-fluid">
-    <div id="main-content-container">
-        <div id="registration-form-container" aria-live="polite">
-            <div id="registration-feedback-container" aria-live="polite"></div>
-            <div id="registration-choice-container" class="centered-menu">
-                <div class="well">
-                    <p class="lead">{{#str}} autoaddtype, mod_lti {{/str}}</p>
-                    <form class="form-horizontal" id="add-tool-form">
-                        <div class="control-group">
-                            <input name="url"
-                                class="input-large"
-                                type="url"
-                                id="tool-url"
-                                placeholder="{{#str}} toolurlplaceholder, mod_lti {{/str}}"
-                                required>
-                            <button id="tool-create-button" type="submit" class="btn btn-success">
-                                <span class="btn-text">{{#str}} add {{/str}}</span>
-                                <div class="btn-loader">
-                                    {{> mod_lti/loader }}
-                                </div>
-                            </button>
-                        </div>
-                    </form>
-                    <p>{{#str}} manuallyaddtype, mod_lti, {{{configuremanualurl}}} {{/str}}</p>
-                    <p><a href="{{{ managetoolsurl }}}">{{#str}} manage_tools, mod_lti {{/str}}</a><br/><a href="{{{ managetoolproxiesurl}}}">{{#str}} manage_tool_proxies, mod_lti {{/str}}</a></p>
-                </div>
-            </div>
-            <div id="cartridge-registration-container" aria-live="polite" class="hidden">
-                {{> mod_lti/cartridge_registration_form }}
-            </div>
-            <div id="external-registration-container" aria-live="polite" class="hidden">
-                {{> mod_lti/external_registration }}
+<div id="main-content-container">
+    <div id="registration-form-container" aria-live="polite">
+        <div id="registration-feedback-container" aria-live="polite"></div>
+        <div id="registration-choice-container" class="centered-menu">
+            <div class="card card-block">
+                <p class="lead">{{#str}} autoaddtype, mod_lti {{/str}}</p>
+                <form class="form-inline" id="add-tool-form">
+                    <div class="control-group">
+                        <input name="url"
+                            class="form-control"
+                            type="url"
+                            id="tool-url"
+                            placeholder="{{#str}} toolurlplaceholder, mod_lti {{/str}}"
+                            required>
+                        <button id="tool-create-button" type="submit" class="btn btn-success">
+                            <span class="btn-text">{{#str}} add {{/str}}</span>
+                            <div class="btn-loader">
+                                {{> mod_lti/loader }}
+                            </div>
+                        </button>
+                    </div>
+                </form>
+                <p>{{#str}} manuallyaddtype, mod_lti, {{{configuremanualurl}}} {{/str}}</p>
+                <p><a href="{{{ managetoolsurl }}}">{{#str}} manage_tools, mod_lti {{/str}}</a><br/><a href="{{{ managetoolproxiesurl}}}">{{#str}} manage_tool_proxies, mod_lti {{/str}}</a></p>
             </div>
         </div>
+        <div id="cartridge-registration-container" aria-live="polite" class="hidden">
+            {{> mod_lti/cartridge_registration_form }}
+        </div>
+        <div id="external-registration-container" aria-live="polite" class="hidden">
+            {{> mod_lti/external_registration }}
+        </div>
+    </div>
 
-        <div id="tool-list-container" class="loading">
-            {{> mod_lti/tool_list }}
-        </div>
+    <div id="tool-list-container" class="loading">
+        {{> mod_lti/tool_list }}
     </div>
 </div>
 {{#js}}
diff --git a/mod/lti/templates/tool_list.mustache b/mod/lti/templates/tool_list.mustache
index b23338fb72b..fbd1e22ec8b 100644
--- a/mod/lti/templates/tool_list.mustache
+++ b/mod/lti/templates/tool_list.mustache
@@ -38,9 +38,9 @@
     {{> mod_lti/loader }}
 </div>
 {{^proxies}}{{^tools}}
-<div id="tool-notools-text" class="container-fluid">{{#str}} no_lti_tools, mod_lti {{/str}}</div>
+<div id="tool-notools-text">{{#str}} no_lti_tools, mod_lti {{/str}}</div>
 {{/tools}}{{/proxies}}
-<div id="tool-card-container" class="container-fluid">
+<div id="tool-card-container">
     {{#proxies}}
         {{> mod_lti/tool_proxy_card }}
     {{/proxies}}
diff --git a/mod/lti/templates/tool_proxy_card.mustache b/mod/lti/templates/tool_proxy_card.mustache
index 7c1507019b8..8c59b9807f1 100644
--- a/mod/lti/templates/tool_proxy_card.mustache
+++ b/mod/lti/templates/tool_proxy_card.mustache
@@ -54,14 +54,14 @@
     <div class="tool-card-content">
         <div class="tool-card-header">
             <div class="tool-card-subheader">
-                <div class="label
-                            {{#state.pending}}label-info{{/state.pending}}
-                            {{#state.configured}}label-success{{/state.configured}}
-                            {{#state.rejected}}label-important{{/state.rejected}}
-                            {{#state.unknown}}label-warning{{/state.unknown}}">
+                <div class="tag
+                            {{#state.pending}}tag-info{{/state.pending}}
+                            {{#state.configured}}tag-success{{/state.configured}}
+                            {{#state.rejected}}tag-important{{/state.rejected}}
+                            {{#state.unknown}}tag-warning{{/state.unknown}}">
                     {{state.text}}
                 </div>
-                <div class="tool-card-actions pull-right">
+                <div class="tool-card-actions pull-xs-right">
                     {{#courseid}}
                         <a href="{{{urls.course}}}" title="{{#str}} courselink, mod_lti {{/str}}">{{#pix}} i/course, core, {{#str}} courselink, mod_lti {{/str}}{{/pix}}</a>
                     {{/courseid}}
diff --git a/theme/boost/scss/moodle/core.scss b/theme/boost/scss/moodle/core.scss
index 0fd7f9aeb50..8b2dbabed61 100644
--- a/theme/boost/scss/moodle/core.scss
+++ b/theme/boost/scss/moodle/core.scss
@@ -297,7 +297,8 @@ form.popupform div {
 }
 
 span.hide,
-div.hide {
+div.hide,
+.hidden {
     display: none;
 }
 // Accessibility: Skip block link, for keyboard-only users.
diff --git a/theme/boost/scss/moodle/modules.scss b/theme/boost/scss/moodle/modules.scss
index bc59ec39f4e..1b9b2313f6d 100644
--- a/theme/boost/scss/moodle/modules.scss
+++ b/theme/boost/scss/moodle/modules.scss
@@ -541,3 +541,13 @@ div#dock {
     padding: 0;
 }
 
+
+/**
+ * Mod LTI.
+ */
+.path-admin-mod-lti {
+    .btn .loader img,
+    #tool-list-loader-container .loader img {
+        height: auto;
+    }
+}