diff --git a/.gitignore b/.gitignore
index 3472da9f4f..73238c68e2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@
 
 **/spec/*_dummy_app
 /public/uploads/*
+.DS_Store
diff --git a/engines/decidim-debates/app/assets/images/decidim/debates/icon.svg b/engines/decidim-debates/app/assets/images/decidim/debates/icon.svg
index 31df638dc4..bf5a093979 100644
--- a/engines/decidim-debates/app/assets/images/decidim/debates/icon.svg
+++ b/engines/decidim-debates/app/assets/images/decidim/debates/icon.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36.02 36.02"><path d="M693.07,543.84a18,18,0,1,1,18-18A18,18,0,0,1,693.07,543.84Zm0-34a16,16,0,1,0,16,16A16,16,0,0,0,693.07,509.83Z" transform="translate(-675.07 -507.83)"/><path d="M693.07,526.93a4.1,4.1,0,1,1,4.1-4.1A4.1,4.1,0,0,1,693.07,526.93Zm0-6.19a2.1,2.1,0,1,0,2.1,2.1A2.1,2.1,0,0,0,693.07,520.74Z" transform="translate(-675.07 -507.83)"/><path d="M693.07,536.65a1,1,0,0,1-.67-0.26c-0.29-.26-7.11-6.5-7.11-14a7.78,7.78,0,0,1,15.57,0c0,7.46-6.82,13.71-7.11,14A1,1,0,0,1,693.07,536.65Zm0-20a5.79,5.79,0,0,0-5.78,5.78c0,5.29,4.13,10.11,5.78,11.82,1.65-1.72,5.78-6.54,5.78-11.82A5.79,5.79,0,0,0,693.07,516.64Z" transform="translate(-675.07 -507.83)"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 35 35"><path d="M17.5 35A17.5 17.5 0 1 1 35 17.5 17.52 17.52 0 0 1 17.5 35zm0-33.06A15.56 15.56 0 1 0 33.06 17.5 15.57 15.57 0 0 0 17.5 1.94zm6.44 24.29a1 1 0 0 1-.34-.06l-3.78-1.42a10.75 10.75 0 0 1-2.32.25c-4.95 0-9-3.36-9-7.5s4-7.5 9-7.5 9 3.36 9 7.5a6.75 6.75 0 0 1-1.88 4.6l.32 3.06a1 1 0 0 1-1 1.07zm-4.06-3.47a1 1 0 0 1 .34.06l2.59 1-.2-2a1 1 0 0 1 .3-.8 4.91 4.91 0 0 0 1.62-3.54c0-3.06-3.15-5.55-7-5.55s-7 2.49-7 5.55 3.15 5.55 7 5.55a8.74 8.74 0 0 0 2.14-.26 1 1 0 0 1 .21-.01z"/></svg>
\ No newline at end of file
diff --git a/engines/decidim-debates/app/models/decidim/debates/debate.rb b/engines/decidim-debates/app/models/decidim/debates/debate.rb
index b894e1a35d..c84b40037e 100644
--- a/engines/decidim-debates/app/models/decidim/debates/debate.rb
+++ b/engines/decidim-debates/app/models/decidim/debates/debate.rb
@@ -9,7 +9,7 @@ class Debate < Debates::ApplicationRecord
       belongs_to :scope, foreign_key: "decidim_scope_id", class_name: Decidim::Scope
       belongs_to :category, foreign_key: "decidim_category_id", class_name: Decidim::Category
       has_one :organization, through: :feature
-      has_many :comments, as: :commentable
+      has_many :comments, as: :decidim_commentable, class_name: Decidim::Comments::Comment
 
       validate :category_belongs_to_organization
       validates :title, presence: true
diff --git a/engines/decidim-debates/app/views/decidim/debates/debates/index.html.erb b/engines/decidim-debates/app/views/decidim/debates/debates/index.html.erb
index 7f430fe03d..e7bde2c4fe 100644
--- a/engines/decidim-debates/app/views/decidim/debates/debates/index.html.erb
+++ b/engines/decidim-debates/app/views/decidim/debates/debates/index.html.erb
@@ -11,9 +11,9 @@
         <article class="card card--debate">
           <div class="card__content">
             <div class="card__header">
-              <a href="/debate-view-AMA" class="card__link">
+              <%= link_to decidim_debates.debate_path(debate), class: "card__link" do %>
                 <h5 class="card__title"><%= translated_attribute debate.title %></h5>
-              </a>
+              <% end %>
             </div>
             <div class="card__datetime">
               <div class="card__datetime__date">
diff --git a/engines/decidim-debates/app/views/decidim/debates/debates/show.html.erb b/engines/decidim-debates/app/views/decidim/debates/debates/show.html.erb
index 809ab3b60d..02a8ca6235 100644
--- a/engines/decidim-debates/app/views/decidim/debates/debates/show.html.erb
+++ b/engines/decidim-debates/app/views/decidim/debates/debates/show.html.erb
@@ -1,5 +1,5 @@
-<% content_for :meta_description, debate.description %>
-<% content_for :meta_title, debate.title %>
+<% content_for :meta_description, translated_attribute(debate.description) %>
+<% content_for :meta_title, translated_attribute(debate.title) %>
 <% content_for :meta_url, debate_url(debate.id) %>
 <% content_for :twitter_handler, current_organization.twitter_handler %>
 
@@ -9,13 +9,9 @@
       <%== translated_attribute debate.title %>
     </h2>
     <% if feature_settings.comments_always_enabled || current_settings.comments_enabled %>
-      <div class="author-data">
-        <div class="author-data__extra">
-          <a href="#comments" title="<%= t('.comments') %>">
-            <%= icon "comment-square", aria_label: t('.comments'), role: "img" %> <%= debate.comments.count %>
-          </a>
-        </div>
-      </div>
+      <a href="#comments" title="<%= t('.comments') %>">
+        <%= icon "comment-square", aria_label: t('.comments'), role: "img" %> <%= debate.comments.count %>
+      </a>
     <% end %>
   </div>
   <div class="row">
@@ -49,7 +45,7 @@
 
 <% if feature_settings.comments_always_enabled || current_settings.comments_enabled %>
   <%= content_for :expanded do %>
-    <%= comments_for debate, arguable: true, votable: true %>
+    <%= comments_for debate, arguable: false, votable: true %>
   <% end %>
 <% end %>
 
diff --git a/engines/decidim-debates/decidim-debates.gemspec b/engines/decidim-debates/decidim-debates.gemspec
index d713305d28..e2088b0800 100644
--- a/engines/decidim-debates/decidim-debates.gemspec
+++ b/engines/decidim-debates/decidim-debates.gemspec
@@ -6,11 +6,14 @@ Gem::Specification.new do |s|
   s.name        = "decidim-debates"
   s.summary     = "A debates component for decidim's participatory processes."
   s.description = s.summary
+  s.version     = "0.0.1"
+  s.authors     = ["Josep Jaume Rey Peroy", "Marc Riera Casals", "Oriol Gual Oliva", "Genís Matutes Pujol"]
+  s.email       = ["josepjaume@gmail.com", "mrc2407@gmail.com", "oriolgual@gmail.com", "genis.matutes@gmail.com"]
 
   s.files = Dir["{app,config,db,lib}/**/*", "Rakefile", "README.md"]
 
-  s.add_dependency "decidim-core", Decidim.version
-  s.add_dependency "decidim-comments", Decidim.version
+  s.add_dependency "decidim-core"
+  s.add_dependency "decidim-comments"
   s.add_dependency "rectify", "~> 0.8"
   s.add_dependency "date_validator", "~> 0.9"
   s.add_dependency "searchlight", "~> 4.1.0"