diff --git a/app/views/proposals/_categories.html.erb b/app/views/proposals/_categories.html.erb
index 038934da4..ec87fd734 100644
--- a/app/views/proposals/_categories.html.erb
+++ b/app/views/proposals/_categories.html.erb
@@ -2,8 +2,8 @@
 <h2 class="sidebar-title"><%= t("shared.tags_cloud.categories") %></h2>
 <br>
 
-<div id="categories" class="categories">
+<ul id="categories" class="no-bullet categories">
   <% @categories.each do |category| %>
-    <%= link_to category.name, proposals_path(search: category.name) %>
+    <li class="inline-block"><%= link_to category.name, proposals_path(search: category.name) %></li>
   <% end %>
-</div>
\ No newline at end of file
+</ul>
diff --git a/app/views/shared/_tag_cloud.html.erb b/app/views/shared/_tag_cloud.html.erb
index 64a37172d..baa966a77 100644
--- a/app/views/shared/_tag_cloud.html.erb
+++ b/app/views/shared/_tag_cloud.html.erb
@@ -1,12 +1,14 @@
-<div id="tag-cloud" class="tag-cloud">
+<div id="tag-cloud">
   <div class="sidebar-divider"></div>
   <h2 class="sidebar-title"><%= t("shared.tags_cloud.tags") %></h2>
   <br>
-
-  <% @tag_cloud.tags.each do |tag| %>
-    <%= link_to taggable_path(taggable, tag.name) do %>
-      <span class="tag"><%= tag.name %></span>
+  <ul class="no-bullet tag-cloud">
+    <% @tag_cloud.tags.each do |tag| %>
+      <li class="inline-block">
+        <%= link_to taggable_path(taggable, tag.name) do %>
+          <span class="tag"><%= tag.name %></span>
+        <% end %>
+      </li>
     <% end %>
-  <% end %>
+  </ul>
 </div>
-
diff --git a/app/views/shared/_tags.html.erb b/app/views/shared/_tags.html.erb
index 55f4f2dc6..b3fa48bdd 100644
--- a/app/views/shared/_tags.html.erb
+++ b/app/views/shared/_tags.html.erb
@@ -1,14 +1,16 @@
 <%- limit ||= nil %>
 
 <% if taggable.tags.any? %>
-  <span id="tags" class='tags'>
+  <ul id="tags" class="no-bullet tags">
     <% taggable.tag_list_with_limit(limit).each do |tag| %>
-      <%= link_to sanitize(tag.name), send("#{taggable.class.name.underscore.pluralize}_path", search: tag.name) %>
+      <li class="inline-block"><%= link_to sanitize(tag.name), send("#{taggable.class.name.underscore.pluralize}_path", search: tag.name) %></li>
     <% end %>
 
     <% if taggable.tags_count_out_of_limit(limit) > 0 %>
-      <%= link_to "#{taggable.tags_count_out_of_limit(limit)}+",
-                  send("#{taggable.class.name.underscore}_path", taggable) %>
+      <li class="inline-block">
+        <%= link_to "#{taggable.tags_count_out_of_limit(limit)}+",
+                    send("#{taggable.class.name.underscore}_path", taggable) %>
+      </li>
     <% end %>
-  </span>
+  </ul>
 <% end %>