diff --git a/.gitignore b/.gitignore
index 4b11432..2d5b433 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 .sass-cache
 .DS_Store
+Thumbs.db
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e7ed662..2780ede 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# v1.4.2
+## 09/30/2015
+
+1. [](#new)
+    * Option to use icons in top-level navigation
+
 # v1.4.1
 ## 09/16/2015
 
diff --git a/blueprints.yaml b/blueprints.yaml
index 7ef9dad..f9c0bf5 100644
--- a/blueprints.yaml
+++ b/blueprints.yaml
@@ -1,5 +1,5 @@
 name: Bootstrap
-version: 1.4.1
+version: 1.4.2
 description: "Bootstrap is built using the popular **Bootstrap** Framework"
 icon: bold
 author:
@@ -18,6 +18,11 @@ dependencies:
 form:
   validation: strict
   fields:
+    menu.section:
+          type: section
+          title: Menu settings
+          underline: false
+
     dropdown.enabled:
         type: toggle
         label: Dropdown in navbar
@@ -28,3 +33,13 @@ form:
           0: Disabled
         validate:
           type: bool
+
+    menu.icons:
+      type: select
+      label: Use icons in top-level navigation
+      default: 0
+      options:
+        0: No, only text
+        1: Yes, before text
+        2: Yes, after text
+        3: Yes, instead text
diff --git a/bootstrap.yaml b/bootstrap.yaml
index 17c9ed6..7cc5889 100644
--- a/bootstrap.yaml
+++ b/bootstrap.yaml
@@ -1,2 +1,4 @@
 dropdown:
   enabled: false
+menu:
+  icons: 0
diff --git a/templates/partials/base.html.twig b/templates/partials/base.html.twig
index de89268..390c97b 100644
--- a/templates/partials/base.html.twig
+++ b/templates/partials/base.html.twig
@@ -2,7 +2,6 @@
 <html lang="en">
     <head>
         {% block head %}
-        <meta charset="utf-8" />
         <meta http-equiv="X-UA-Compatible" content="IE=edge" />
         <meta name="viewport" content="width=device-width, initial-scale=1" />
         {% include 'partials/metadata.html.twig' %}
diff --git a/templates/partials/metadata.html.twig b/templates/partials/metadata.html.twig
index e98963f..e07bcc2 100644
--- a/templates/partials/metadata.html.twig
+++ b/templates/partials/metadata.html.twig
@@ -1,3 +1,8 @@
+{% if meta.charset %}
+    <meta charset="{{ meta.charset }}" />
+{% else %}
+    <meta charset="utf-8" />
+{% endif %}
 {% for meta in page.metadata %}
-    <meta {% if meta.name %}name="{{ meta.name }}" {% endif %}{% if meta.http_equiv %}http-equiv="{{ meta.http_equiv }}" {% endif %}{% if meta.charset %}charset="{{ meta.charset }}" {% endif %}{% if meta.property %}property="{{ meta.property }}" {% endif %}{% if meta.content %}content="{{ meta.content }}" {% endif %}/>
+    <meta {% if meta.name %}name="{{ meta.name }}" {% endif %}{% if meta.http_equiv %}http-equiv="{{ meta.http_equiv }}" {% endif %}{% if meta.property %}property="{{ meta.property }}" {% endif %}{% if meta.content %}content="{{ meta.content }}" {% endif %}/>
 {% endfor %}
diff --git a/templates/partials/navigation.html.twig b/templates/partials/navigation.html.twig
index 98b9df8..3a7eadf 100644
--- a/templates/partials/navigation.html.twig
+++ b/templates/partials/navigation.html.twig
@@ -7,7 +7,7 @@
                 <span class="icon-bar"></span>
                 <span class="icon-bar"></span>
             </button>
-            <a class="navbar-brand" href="{{ base_url == '' ? '/' : base_url }}">Grav</a>
+            <a class="navbar-brand" href="{{ base_url == '' ? '/' : base_url }}">{{ config.site.title }}</a>
         </div>
         <div class="navbar-collapse collapse">
             <ul class="nav navbar-nav navbar-right">
@@ -15,7 +15,15 @@
                     {% set current_page = (page.active or page.activeChild) ? 'active' : '' %}
                     {% if config.themes.bootstrap.dropdown.enabled and page.children.visible.count > 0 %}
                         <li class="dropdown {{ current_page }}">
-                            <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">{{ page.menu }} <span class="caret"></span></a>
+                            {% if config.themes.bootstrap.menu.icons == '1' and page.header.icon %}
+                                <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false"><i class="fa fa-{{ page.header.icon }}"></i> {{ page.menu }} <span class="caret"></span></a>
+                            {% elseif config.themes.bootstrap.menu.icons == '2' and page.header.icon %}
+                                <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">{{ page.menu }} <i class="fa fa-{{ page.header.icon }}"></i> <span class="caret"></span></a>
+                            {% elseif config.themes.bootstrap.menu.icons == '3' and page.header.icon %}
+                                <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false"> <i class="fa fa-{{ page.header.icon }}"></i> <span class="caret"></span></a>
+                            {% else %}
+                                <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">{{ page.menu }} <span class="caret"></span></a>
+                            {% endif %}
                             <ul class="dropdown-menu" role="menu">
                                 {% set current_parent = page.active ? 'active' : '' %}
                                 <li class="{{ current_parent }}"><a href="{{ page.url }}">{{ page.menu }}</a></li>
@@ -27,12 +35,28 @@
                             </ul>
                         </li>
                     {% else %}
-                        <li class="{{ current_page }}"><a href="{{ page.url }}">{{ page.menu }}</a></li>
+                        {% if config.themes.bootstrap.menu.icons == '1' and page.header.icon %}
+                            <li class="{{ current_page }}"><a href="{{ page.url }}"><i class="fa fa-{{ page.header.icon }}"></i> {{ page.menu }}</a></li>
+                        {% elseif config.themes.bootstrap.menu.icons == '2' and page.header.icon %}
+                            <li class="{{ current_page }}"><a href="{{ page.url }}">{{ page.menu }} <i class="fa fa-{{ page.header.icon }}"></i></a></li>
+                        {% elseif config.themes.bootstrap.menu.icons == '3' and page.header.icon %}
+                            <li class="{{ current_page }}"><a href="{{ page.url }}"><i class="fa fa-{{ page.header.icon }}"></i></a></li>
+                        {% else %}
+                            <li class="{{ current_page }}"><a href="{{ page.url }}">{{ page.menu }}</a></li>
+                        {% endif %}
                     {% endif %}
                 {% endfor %}
                 {% for mitem in site.menu %}
                     <li>
-                        <a href="{{ mitem.url }}">{{ mitem.text }}</a>
+                        {% if config.themes.bootstrap.menu.icons == '1' and mitem.icon %}
+                            <a href="{{ mitem.url }}"><i class="fa fa-{{ mitem.icon }}"></i> {{ mitem.text }}</a>
+                        {% elseif config.themes.bootstrap.menu.icons == '2' and mitem.icon %}
+                            <a href="{{ mitem.url }}">{{ mitem.text }} <i class="fa fa-{{ mitem.icon }}"></i></a>
+                        {% elseif config.themes.bootstrap.menu.icons == '3' and mitem.icon %}
+                            <a href="{{ mitem.url }}"><i class="fa fa-{{ mitem.icon }}"></i></a>
+                        {% else %}
+                            <a href="{{ mitem.url }}">{{ mitem.text }}</a>
+                        {% endif %}
                     </li>
                 {% endfor %}
 
