diff --git a/src/js/controller/app/action-bar.js b/src/js/controller/app/action-bar.js
index 1104921..dfaa147 100644
--- a/src/js/controller/app/action-bar.js
+++ b/src/js/controller/app/action-bar.js
@@ -169,7 +169,7 @@ var ActionBarCtrl = function($scope, email, dialog, statusDisplay) {
             return;
         }
 
-        statusDisplay.update(flagged ? 'Adding flag to message...' : 'Removing flag from message');
+        statusDisplay.update(flagged ? 'Adding star to message...' : 'Removing star from message');
 
         var originalState = message.flagged;
         message.flagged = flagged;
@@ -180,7 +180,7 @@ var ActionBarCtrl = function($scope, email, dialog, statusDisplay) {
             if (err && err.code === 42) {
                 // offline, restore
                 message.unread = originalState;
-                statusDisplay.update('Unable to ' + (flagged ? 'add flag to message' : 'remove flag from message') + ' in offline mode!');
+                statusDisplay.update('Unable to ' + (flagged ? 'add star to' : 'remove star from') + ' message in offline mode!');
                 return;
             }
 
diff --git a/src/tpl/action-bar.html b/src/tpl/action-bar.html
index cc4d92c..9091a2e 100644
--- a/src/tpl/action-bar.html
+++ b/src/tpl/action-bar.html
@@ -37,7 +37,7 @@
   <ul id="dropdown-more" class="dropdown">
     <li><button wo-touch="state.read.open ? markMessage(state.mailList.selected, false) : markCheckedMessages(false)">Mark as read</button></li>
     <li><button wo-touch="state.read.open ? markMessage(state.mailList.selected, true) : markCheckedMessages(true)">Mark as unread</button></li>
-    <li><button wo-touch="state.read.open ? flagMessage(state.mailList.selected, true) : flagCheckedMessages(true)">Add flag</button></li>
-    <li><button wo-touch="state.read.open ? flagMessage(state.mailList.selected, false) : flagCheckedMessages(false)">Remove flag</button></li>
+    <li><button wo-touch="state.read.open ? flagMessage(state.mailList.selected, true) : flagCheckedMessages(true)">Add star</button></li>
+    <li><button wo-touch="state.read.open ? flagMessage(state.mailList.selected, false) : flagCheckedMessages(false)">Remove star</button></li>
   </ul><!--/dropdown-->
 </div>
diff --git a/src/tpl/mail-list.html b/src/tpl/mail-list.html
index 9823965..64016e1 100644
--- a/src/tpl/mail-list.html
+++ b/src/tpl/mail-list.html
@@ -38,8 +38,8 @@
             </label>
           </li>
           <li class="mail-list-entry__flags-flagged" wo-touch="flag(email, !email.flagged); $event.stopPropagation()">
-            <svg ng-show="email.flagged"><use xlink:href="#icon-star_filled" /><title>Flagged</title></svg>
-            <svg ng-show="!email.flagged"><use xlink:href="#icon-star" /><title>Not Flagged</title></svg>
+            <svg ng-show="email.flagged"><use xlink:href="#icon-star_filled" /><title>Starred</title></svg>
+            <svg ng-show="!email.flagged"><use xlink:href="#icon-star" /><title>Not Starred</title></svg>
           </li>
           <li class="mail-list-entry__flags-encrypted">
             <svg ng-show="email.encrypted"><use xlink:href="#icon-encrypted" /><title>Encrypted</title></svg>
diff --git a/src/tpl/nav.html b/src/tpl/nav.html
index f6d720a..8976453 100644
--- a/src/tpl/nav.html
+++ b/src/tpl/nav.html
@@ -16,7 +16,7 @@
           <use ng-if="folder.type === 'Trash'" xlink:href="#icon-delete" />
           <use ng-if="folder.type === 'Flagged'" xlink:href="#icon-star" />
         </svg>
-        {{folder.type}}
+        {{folder.type === 'Flagged' ? 'Starred' : folder.type}}
         <span ng-show="folder.count > 0" class="nav__counter">{{folder.count}}</span>
       </a>
       <!--<button class="btn-icon-very-light">
diff --git a/src/tpl/read.html b/src/tpl/read.html
index b5c6976..2b84c20 100644
--- a/src/tpl/read.html
+++ b/src/tpl/read.html
@@ -16,9 +16,9 @@
   <header class="read__header">
     <div class="read__controls">
       <span class="u-hidden-lg" ng-controller="ActionBarCtrl">
-        <button wo-touch="flagMessage(state.mailList.selected, !state.mailList.selected.flagged)" class="btn-icon-light" title="{{state.mailList.selected.flagged ? 'Remove Flag' : 'Add Flag'}}">
-          <svg ng-show="state.mailList.selected.flagged"><use xlink:href="#icon-star_filled" /><title>Flagged</title></svg>
-          <svg ng-show="!state.mailList.selected.flagged"><use xlink:href="#icon-star" /><title>Not Flagged</title></svg>
+        <button wo-touch="flagMessage(state.mailList.selected, !state.mailList.selected.flagged)" class="btn-icon-light" title="{{state.mailList.selected.flagged ? 'Remove Star' : 'Add Star'}}">
+          <svg ng-show="state.mailList.selected.flagged"><use xlink:href="#icon-star_filled" /><title>Starred</title></svg>
+          <svg ng-show="!state.mailList.selected.flagged"><use xlink:href="#icon-star" /><title>Not Starred</title></svg>
         </button>
         <button class="btn-icon-light" title="Move mail" wo-dropdown="#read-dropdown-folder" wo-dropdown-position="center">
           <svg><use xlink:href="#icon-folder" /><title>Move mail</title></svg>
@@ -128,9 +128,9 @@
     <div class="toolbar">
       <ul class="toolbar__actions">
         <li>
-          <button wo-touch="flagMessage(state.mailList.selected, !state.mailList.selected.flagged)" class="btn-icon-light" title="{{state.mailList.selected.flagged ? 'Remove Flag' : 'Add Flag'}}">
-            <svg ng-show="state.mailList.selected.flagged"><use xlink:href="#icon-star_filled" /><title>Flagged</title></svg>
-            <svg ng-show="!state.mailList.selected.flagged"><use xlink:href="#icon-star" /><title>Not Flagged</title></svg>
+          <button wo-touch="flagMessage(state.mailList.selected, !state.mailList.selected.flagged)" class="btn-icon-light" title="{{state.mailList.selected.flagged ? 'Remove Star' : 'Add Star'}}">
+            <svg ng-show="state.mailList.selected.flagged"><use xlink:href="#icon-star_filled" /><title>Starred</title></svg>
+            <svg ng-show="!state.mailList.selected.flagged"><use xlink:href="#icon-star" /><title>Not Starred</title></svg>
           </button>
         </li>
         <li>