diff --git a/app/views/dashboard/dashboard.html.erb b/app/views/dashboard/dashboard.html.erb
index 81c417f362..9348b571c6 100644
--- a/app/views/dashboard/dashboard.html.erb
+++ b/app/views/dashboard/dashboard.html.erb
@@ -10,11 +10,11 @@
     To get started at Public Lab, try:
     <br><br>
     <p>
-      <a class="btn btn-sm btn-outline-secondary" href="/questions" target="_blank">
+      <a class="btn btn-sm btn-light" href="/questions" target="_blank">
         Asking a question
       </a>
 
-      <a class="btn btn-sm btn-default" href="https://publiclab.org/methods" target="_blank">
+      <a class="btn btn-sm btn-light" href="https://publiclab.org/methods" target="_blank">
         Exploring projects
       </a>
     </p>
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index 69f579e909..9b5a7f38c5 100644
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -93,7 +93,7 @@
                   <% if current_user.profile_image == "https://www.gravatar.com/avatar/eb721d116a28f4a4da4ea67340c8ce75" %>
                     <i class="fa fa-user-circle fa-lg" style="color:white;"></i>
                   <% else %>
-                    <img class="img-circle" id="profile-photo" style="width:20px; height:20px; margin-right:8px;" src="<%= current_user.profile_image %>" />
+                    <img class="rounded-circle" id="profile-photo" style="width:20px; height:20px; margin-right:8px;" src="<%= current_user.profile_image %>" />
                   <% end %>
                 </div>
               </a>
diff --git a/app/views/notes/_comment.html.erb b/app/views/notes/_comment.html.erb
index 1fde668517..b8a42a70d7 100644
--- a/app/views/notes/_comment.html.erb
+++ b/app/views/notes/_comment.html.erb
@@ -75,11 +75,11 @@
         </a>
       <% end %>
       <% if current_user %>
-            <button style="border: 1px solid;padding: 4px 6px;" class="btn btn-outline-secondary dropdown-toggle" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+            <button style="border: 1px solid;padding: 4px 6px;" class="btn btn-outline-secondary dropdown" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
               <i class='icon fa fa-smile-o'></i>
               <sup style="font-size: 12px;">+</sup>
             </button>
-            <div id="emoji-dropdown" style="background: #f8f8f8" class="dropdown-menu" aria-labelledby="dropdownMenuButton">
+            <div id="emoji-dropdown" style="background: #f8f8f8;" class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenuButton">
               <% emoji_names, emoji_image_map = emoji_info %>
               <% emoji_names.each do |e| %>
               <% capitalized_emoji_name = e.split("-").map(&:capitalize).join %>
diff --git a/app/views/tag/_topicCard.html.erb b/app/views/tag/_topicCard.html.erb
index 8be7cb9472..392ae18a42 100644
--- a/app/views/tag/_topicCard.html.erb
+++ b/app/views/tag/_topicCard.html.erb
@@ -11,9 +11,9 @@
           <% Tag.find_nodes_by_type(tag.name, type = 'note', limit = 3).each do |node|  %>
             <div>
               <% if node.main_image %>
-                <img class="img-circle" id="profile-photo" style="width:20px; height:20px; margin-right:8px; display: inline-block;" src="<%= node.main_image.path(:default) %>" />
+                <img class="rounded-circle" id="profile-photo" style="width:20px; height:20px; margin-right:8px; display: inline-block;" src="<%= node.main_image.path(:default) %>" />
               <% elsif node.scraped_image %>
-                <img class="img-circle" id="profile-photo" style="width:20px; height:20px; margin-right:8px; display: inline-block;" src="<%= node.scraped_image %>" />
+                <img class="rounded-circle" id="profile-photo" style="width:20px; height:20px; margin-right:8px; display: inline-block;" src="<%= node.scraped_image %>" />
               <% end %>
               <p style="display: inline-block;"><a style="color: inherit;" <% if @widget %>target="_blank"<% end %> href="<%= node.path %>"><%= (node.type == 'note') ? node.title : node.latest.title %></a></p>
               <p style="display: inline-block; margin-left: 10px;color: #808080;">by <a style="color: #808080;" <% if @widget %>target="_blank"<% end %> href="/profile/<%= node.author.name %>">@<%= node.author.name %></a></p>