diff --git a/Changelog.md b/Changelog.md
index 8ae2b7d..d74a940 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,8 +1,6 @@
-# Version 1.3.27
-- updated icons
-
 # Version 1.3.26
 - support Turnouts/Points
+- updated icons
 
 # Version 1.3.25
 - sort Routes/Automation
diff --git a/index.html b/index.html
index edbc88b..52a2380 100644
--- a/index.html
+++ b/index.html
@@ -120,6 +120,7 @@
                                 <div class="loco-list-container row">
                                     <div class="column-4 loco-list-ctrl">
                                         <label for="ex-locoid" class="formbuilder-text-label">
+                                            <!-- <span class="toolbar-button-throttle" style="display:inline-block;"></span>  -->
                                             Loco ID<span class="formbuilder-required">*</span>
                                         </label>
                                         <input id="ex-locoid" type="text" loco-cv="0" name="Locomotives" placeholder="Loco ID / DCC Address" title="To Acquire a loco: Type an Address and press [Enter] or Select from the Locos/Roster list. To release: Press [Enter] or click [X]"/>
@@ -270,6 +271,7 @@
                 <section id="cv-programmer-window" class="section" hidden="true">
                     <div class="row settings-heading">
                         <div class="column-7 pl0 hdng">
+                            <span class="toolbar-button-cv-programmer" style="display:inline-block;"></span> 
                             CV Programmer <small><small>(PROG track only)</small></small>
                         </div>
                     </div>
@@ -411,7 +413,8 @@
                 
                 <section id="routes-window" class="section" hidden="true">
                     <div class="row settings-heading">
-                        <div class="column-7 pl0 hdng">
+                        <div class="column-10 pl0 hdng">
+                            <span class="toolbar-button-routes" style="display:inline-block;"></span> 
                             Routes / Automation <small><small>(On the EX-CommandStation)</small></small>
                         </div>
                         <div class="column-3 pr0">
@@ -433,7 +436,8 @@
 
                 <section id="turnouts-window" class="section" hidden="true">
                     <div class="row settings-heading">
-                        <div class="column-7 pl0 hdng">
+                        <div class="column-10 pl0 hdng">
+                            <span class="toolbar-button-turnouts" style="display:inline-block;"></span> 
                             Turnouts / Points <small><small>(On the EX-CommandStation)</small></small>
                         </div>
                         <div class="column-3 pr0">
@@ -455,10 +459,11 @@
 
                 <section id="loco-window" class="section" hidden="true">
                     <div class="row settings-heading">
-                        <div class="column-7 pl0 hdng">
-                            Locomotives <small><small><i>(Stored on this computer only)</i></small></small>
+                        <div class="column-6 pl0 hdng">
+                            <span class="toolbar-button-locos" style="display:inline-block;"></span> 
+                            Locomotives <small><small><small><i>(Stored on this computer only)</i></small></small></small>
                         </div>
-                        <div class="column-3 pr0">
+                        <div class="column-4 pr0">
                             <div class="option-btns formbuilder-button row">
                                 <div class="column-2">&nbsp;</div> 
                                 <div class="column-4">
@@ -536,10 +541,11 @@ <h4 class="fn-heading add-loco-head">Add Locomotive</h4>
 
                 <section id="fn-map-window" class="section" hidden="true">
                     <div class="row settings-heading">
-                        <div class="column-7 pl0 hdng">
-                            Function Mappings <small><small><i>(Stored on this computer only)</i></small></small>
+                        <div class="column-6 pl0 hdng">
+                            <span class="toolbar-button-functions" style="display:inline-block;"></span> 
+                            Function Mappings <small><small><small><i>(Stored on this computer only)</i></small></small></small>
                         </div>
-                        <div class="column-3 pr0">
+                        <div class="column-4 pr0">
                             <div class="option-btns formbuilder-button row">
                                 <div class="column-2">&nbsp;</div> 
                                 <div class="column-4">