diff --git a/src/noosfero-spb/noosfero-spb-theme/css/edition-pages.css b/src/noosfero-spb/noosfero-spb-theme/css/edition-pages.css
index 49322c8..58c1ea8 100644
--- a/src/noosfero-spb/noosfero-spb-theme/css/edition-pages.css
+++ b/src/noosfero-spb/noosfero-spb-theme/css/edition-pages.css
@@ -275,15 +275,17 @@
   color: #585858;
 }
 
+.action-software_communities_plugin_myprofile-new_software #content .main-block form textarea{
+  border-radius: 4px;
+  font-size: 15px;
+  font-family: arial, helvetica;
+  padding: 10px;
+}
+
 .action-software_communities_plugin_myprofile-new_software #content .formfield input{
   background: none #FFFFFF;
-  border: 1px solid #DDDDDD;
-  color: #585858;
-  font-size: 16px;
-  width: 76%;
-  word-wrap: break-word;
-  border-radius: 4px;
 }
+
 .action-software_communities_plugin_myprofile-new_software #content .main-content form label.formlabel.mandatory{
   font-size: 14px;
   margin-bottom: 5px;
@@ -317,20 +319,15 @@
 }
 
 .action-software_communities_plugin_myprofile-new_software #software-name-field span #community-identifier{
-  width: auto;
+  width: 500px;
 }
 
 .action-software_communities_plugin_myprofile-new_software #content #software-hostname {
-  line-height: 22px;
-  padding: 0px;
-  color: #4A4A4A;
-  font-size: 20px;
-  text-transform: lowercase;
-  border-spacing: 20px;
+  position: absolute;
+  font-size: 15px;
 }
 
 .action-software_communities_plugin_myprofile-new_software #content .main-block form #profile_change_picture {
-  padding: 0 15px 15px 15px;
   border: 1px dotted #ddd;
   margin-top: 10px;
 }
@@ -464,7 +461,6 @@ font-size: 10px;
   font-weight: 500;
 }
 
-
 .action-contact-new .formfield textarea{
   background: none #FFFFFF;
   border: 1px solid #DDDDDD;
@@ -503,7 +499,6 @@ font-size: 10px;
   display: none;
 }
 
-
 .action-tasks-index select{
   background: none;
   border: 1px solid #D3D6DE;
@@ -512,6 +507,7 @@ font-size: 10px;
   margin: 0px 0px 0px 10px;
   font-size: 14px;
 }
+
 .action-tasks-index #content .main-block form input[type="text"] {
   display: block;
   height: 19px;
@@ -544,7 +540,18 @@ font-size: 10px;
   line-height: 20px;
   position: absolute;
 }
+
 .action-tasks-index .task_decisions label{
   margin: 2px 0px 2px 30px;
   line-height: 22px;
 }
+
+#content .new-software-form .button-bar .button.with-text.icon-save.submit{
+  background: #3E67B1;
+  color: #FFF;
+}
+
+#content .new-software-form .button-bar .button.with-text.icon-save.submit:hover{
+  background: #FFF;
+  color: #3E67B1;
+}
diff --git a/src/noosfero-spb/noosfero-spb-theme/css/software-pages.css b/src/noosfero-spb/noosfero-spb-theme/css/software-pages.css
index 31608a7..12276ec 100644
--- a/src/noosfero-spb/noosfero-spb-theme/css/software-pages.css
+++ b/src/noosfero-spb/noosfero-spb-theme/css/software-pages.css
@@ -751,3 +751,125 @@
   font-weight: 800;
   padding-top: 30px;
 }
+
+/* software_communites new software page refactor */
+.new-software-form .optional-box{
+  margin-bottom: 20px;
+}
+
+.new-software-form div#errorExplanation{
+  margin-left: 0px;
+  color: #FF0366;
+}
+
+.new-software-form div#errorExplanation ul li{
+  list-style-type: disc;
+  list-style-position: inside;
+  margin-bottom: 5px;
+  font-size: 13px;
+}
+
+.new-software-form div#errorExplanation h2{
+  color: #000;
+  padding: 0px;
+  font-size: 16px;
+  background: none;
+  text-align: left;
+}
+
+.new-software-form .step-explanation span{
+  font-size: 14px;
+}
+
+.action-software_communities_plugin_myprofile-new_software #content .main-block form .highlight-error[type="text"],
+.action-software_communities_plugin_myprofile-new_software #content .main-block form .highlight-error{
+  border: 1px solid #FF0366;
+  box-shadow: none;
+}
+
+.action-software_communities_plugin_myprofile-new_software #content .main-block form #software_info_finality{
+  width: 490px;
+}
+
+.action-software_communities_plugin_myprofile-new_software #content .main-block form .obrigatory-field .highlight-error[type="text"],
+.action-software_communities_plugin_myprofile-new_software #content .main-block form .optional-field input[type="text"],
+.action-software_communities_plugin_myprofile-new_software #content .main-block form .obrigatory-field input[type="text"]{
+  width: 500px;
+}
+
+.action-software_communities_plugin_myprofile-new_software .new-software-form #software-name-field #community-identifier{
+  width: 291px;
+  padding-left: 215px;
+}
+
+.new-software-form .optional-field label.formlabel,
+.new-software-form .optional-box label {
+  font-family: "open_sansregular", Arial, Helvetica, sans-serif;
+  font-size: 14px;
+  color: #231f20;
+}
+
+.new-software-form #content .main-block form .optional-box #profile_change_picture.software-label-box{
+  width: 470px;
+  border-radius: 4px;
+}
+
+.action-software_communities_plugin_myprofile-new_software #content .main-block form #profile_change_picture{
+  border: none;
+}
+
+.new-software-form .formfieldline{
+  padding: 0px;
+}
+
+.new-software-form #community_image_builder_uploaded_data{
+  border: none;
+}
+
+.new-software-form #community_image_builder_label{
+  display: none !important;
+}
+
+.new-software-form .formfield input{
+  text-indent: 0px;
+  padding: 0px;
+  font-size: 14px;
+}
+
+/* end of software_communites new software page refactor */
+
+/* software_steps */
+.software-step-info{
+  padding-bottom: 30px;
+  display: block;
+}
+
+.software-step-info ul li{
+  float: left;
+  margin-right: 30px;
+  border-right: 1px solid #eee;
+  padding-right: 30px;
+  font-size: 14px;
+}
+
+.software-step-info ul li:last-child{
+  border: none;
+}
+
+.software-step-info ul li .current-step{
+  background: #FF0366;
+}
+
+.software-step-info ul li span{
+  display: inline-block;
+  height: 24px;
+  width: 24px;
+  border-radius: 50%;
+  color: #fff;
+  text-align: center;
+  margin-right: 6px;
+  background: #333;
+  padding: 1px 0 0 0;
+  font-weight: 700;
+}
+/* end of software_steps */
diff --git a/src/noosfero-spb/software_communities/public/style.css b/src/noosfero-spb/software_communities/public/style.css
index 0ba3d8a..bea2345 100644
--- a/src/noosfero-spb/software_communities/public/style.css
+++ b/src/noosfero-spb/software_communities/public/style.css
@@ -82,11 +82,8 @@
   background: url(../../../designs/themes/base/imgs/arrow-right-p.png) 100% 50% no-repeat;
 }
 
-/*FIX-ME: necessary while there is
-* not a defined theme style for the
-* forms */
-.improve_input_size {
-  width: 315px !important;
+#software-info-repository-link{
+  width: 315px;
 }
 
 .software-block {
@@ -141,3 +138,13 @@
 }
 
 /* end of profile_design download block */
+
+/* new_software page */
+.new-software-form .obrigatory-field {
+  margin-bottom: 20px;
+}
+
+.new-software-form .optional-field {
+  margin-bottom: 20px;
+}
+/* end of new_software page */
diff --git a/src/noosfero-spb/software_communities/views/comments_extra_fields.html.erb b/src/noosfero-spb/software_communities/views/comments_extra_fields.html.erb
index 5c7f4cc..507caa0 100644
--- a/src/noosfero-spb/software_communities/views/comments_extra_fields.html.erb
+++ b/src/noosfero-spb/software_communities/views/comments_extra_fields.html.erb
@@ -1,4 +1,4 @@
-<div class="comments-display-fields">                                                                                                  
+<div class="comments-display-fields">
   <span id="comments-additional-information">
     <%= _("Additional informations") %>
   </span>
diff --git a/src/noosfero-spb/software_communities/views/profile_editor/_first_edit_software_community_extras.html.erb b/src/noosfero-spb/software_communities/views/profile_editor/_first_edit_software_community_extras.html.erb
index 86ed273..b328590 100644
--- a/src/noosfero-spb/software_communities/views/profile_editor/_first_edit_software_community_extras.html.erb
+++ b/src/noosfero-spb/software_communities/views/profile_editor/_first_edit_software_community_extras.html.erb
@@ -1,9 +1,6 @@
 <div class="software-step-info">
-  <div class= <%= class_step_one %> >
-    <h3><%= _("Step 1 - Software Creation")%></h3>
-  </div>
-
-  <div class= <%= class_step_two %> >
-    <h3><%= _("Step 2 - Community Settings")%></h3>
-  </div>
+  <ul>
+    <li><span class= <%= class_step_one %> >1</span><%= _("Software Creation") %></li>
+    <li><span class= <%= class_step_two %> >2</span><%= _("Community Settings") %></li>
+  </ul>
 </div>
diff --git a/src/noosfero-spb/software_communities/views/profile_editor/edit_software_community.html.erb b/src/noosfero-spb/software_communities/views/profile_editor/edit_software_community.html.erb
index 323f3e1..046b7fc 100644
--- a/src/noosfero-spb/software_communities/views/profile_editor/edit_software_community.html.erb
+++ b/src/noosfero-spb/software_communities/views/profile_editor/edit_software_community.html.erb
@@ -1,5 +1,5 @@
 
-<%= render :partial => 'first_edit_software_community_extras', :locals => {:class_step_one => "another-step", :class_step_two => "current-step"} if @first_edit %>
+<%= render :partial => 'profile_editor/first_edit_software_community_extras', :locals => {:class_step_one => "another-step", :class_step_two => "current-step"} if @first_edit %>
 
 <h1><%= _('Configure Software Community') %></h1>
 
diff --git a/src/noosfero-spb/software_communities/views/software_communities_plugin_myprofile/_license_info_fields.html.erb b/src/noosfero-spb/software_communities/views/software_communities_plugin_myprofile/_license_info_fields.html.erb
index d706b46..0cf1a67 100644
--- a/src/noosfero-spb/software_communities/views/software_communities_plugin_myprofile/_license_info_fields.html.erb
+++ b/src/noosfero-spb/software_communities/views/software_communities_plugin_myprofile/_license_info_fields.html.erb
@@ -1,4 +1,4 @@
-<%= text_field_tag "license_info[version]", license_version, :id=>"license_info_version", :class=>"license_info_version", :placeholder=>_('Autocomplete field, type some license') %>
+<%= text_field_tag "license_info[version]", license_version, :id=>"license_info_version", :class=>"license_info_version #{@error_software_license}",  :placeholder=>_('Autocomplete field, type some license') %>
 <%= hidden_field_tag "license[license_infos_id]", license_id, :id=>"license_info_id", :class=>"license_info_id", :data => {:label=>license_version} %>
 
 <a id = "version_link" href="#" target="_BLANK" class="hide-field"><%= _("Read license") %></a>
diff --git a/src/noosfero-spb/software_communities/views/software_communities_plugin_myprofile/new_software.html.erb b/src/noosfero-spb/software_communities/views/software_communities_plugin_myprofile/new_software.html.erb
index 2eeeaca..24e5cd1 100644
--- a/src/noosfero-spb/software_communities/views/software_communities_plugin_myprofile/new_software.html.erb
+++ b/src/noosfero-spb/software_communities/views/software_communities_plugin_myprofile/new_software.html.erb
@@ -5,10 +5,10 @@
 <h1><%= _('Creating new software') %></h1>
 
 <div class='step-explanation'>
-  <spam>
+  <span>
     <%= _('Enter the basic information about the software.<br>
     You can add the details after you create it.') %>
-  </spam>
+  </span>
 </div>
 
 <% if environment.enabled?('admin_must_approve_new_communities') %>
@@ -16,80 +16,81 @@
     <%= _("Note that the creation of communities in this environment is restricted. Your request to create this new community will be sent to %{environment} administrators and will be approved or rejected according to their methods and criteria.") % { :environment => environment.name }%>
   </div>
 <%end %>
+<div class="new-software-form">
 
-<% unless @errors.blank? %>
-<div class="errorExplanation" id="errorExplanation">
-  <h2> <%= _("Can`t create new software: %s errors") % @errors.length %> </h2>
-  <ul>
-  <% @errors.each do |error| %>
-    <li> <%= error %> </li>
-  <% end %>
-  </ul>
-</div>
-<% end %>
-
-<div>
   <%= labelled_form_for :community, :html => { :multipart => true } do |f| %>
 
     <%= required_fields_message %>
 
-    <div class= <%= @error_community_name %> >
+    <% unless @errors.blank? %>
+      <div class="errorExplanation" id="errorExplanation">
+        <h2> <%= _("Can`t create new software: %s errors") % @errors.length %> </h2>
+        <ul>
+          <% @errors.each do |error| %>
+            <li> <%= error %> </li>
+          <% end %>
+        </ul>
+      </div>
+    <% end %>
+
+    <div class="obrigatory-field">
       <%= label("name", _('Name'), {:class => 'formlabel mandatory'}) %>
-      <%= required text_field(:community, :name, :size => 30, :maxlength => 100, :id => 'community_name_id') %>
+      <%= required text_field(:community, :name, :size => 30, :maxlength => 100, :id => 'community_name_id', :class => @error_community_name) %>
     </div>
 
-    <br>
-    <br>
-
-    <div class= <%= @error_software_domain %> >
+    <div class="obrigatory-field">
       <%= label("domain", _('Domain'), {:class => "formlabel mandatory"}) %>
       <div id='software-name-field' class='formfield'>
-
         <span id='software-hostname'><%= environment.default_hostname %>/</span>
-        <%= required text_field(:community, :identifier, :size => 30, :maxlength => 100, :id => 'community-identifier') %>
+        <%= required text_field(:community, :identifier, :size => 30, :maxlength => 100, :class => @error_software_domain, :id => 'community-identifier') %>
       </div>
     </div>
 
-    <div class= <%= @error_software_finality %> >
+    <div class="obrigatory-field">
       <%= fields_for @software_info do |swf| %>
         <div id="finality" class="formfield type-text">
           <%= swf.label("finality" ,_("Finality"), :class=>"formlabel mandatory") %>
-          <%= required swf.text_area(:finality, :placeholder => _("What is the software for?"), :maxlength => 120) %>
+          <%= required swf.text_area(:finality, :placeholder => _("What is the software for?"), :maxlength => 120, :class => @error_software_finality) %>
         </div>
       <% end %>
     </div>
 
-    <div id="profile_change_picture_title" class="formlabel">
-      <label>
-        <%= _('Software Logo') %>
-      </label>
-    </div>
-    <div id="profile_change_picture">
+    <div class="optional-box">
+      <div id="profile_change_picture_title" class="formlabel software-label">
+        <label>
+          <%= _('Software Logo') %>
+        </label>
+      </div>
+      <div id="profile_change_picture" class="software-label-box">
         <%= f.fields_for :image_builder, @community.image do |i| %>
-          <%= file_field_or_thumbnail(_('Image:'), @community.image, i) %><%= _("Max size: %s (.jpg, .gif, .png)")% Image.max_size.to_humanreadable %>
+          <%= file_field_or_thumbnail(_('Image:'), @community.image, i) %>
+          <%= _("Max size: %s (.jpg, .gif, .png)")% Image.max_size.to_humanreadable %>
         <% end %>
+      </div>
     </div>
 
-    <div class= <%= @error_software_license %> >
+    <div class="obrigatory-field">
       <div id="profile_change_picture_title" class="formlabel formfieldline">
         <label class="formlabel mandatory">
           <%= _("License Version: ") %>
         </label>
-          <%= render :partial => "license_info_fields", :locals => {
-            :license_version => "",
-            :license_id => "",
-            :another_version=>"",
-            :another_link=>""
-          } %>
+        <%= render :partial => "license_info_fields", :locals => {
+          :license_version => "",
+          :license_id => "",
+          :another_version=>"",
+          :another_link=>""
+        } %>
       </div>
     </div>
 
-    <%= fields_for @software_info do |swf| %>
-      <div class="formfieldline formfield type-text">
-        <%= swf.label "repository_url", _("Link to Repository: "), :class => "formlabel"%>
-        <%= swf.text_field :repository_link, :class => "improve_input_size", :id => "software-info-repository-link" %>
-      </div>
-    <% end %>
+    <div class="optional-field">
+      <%= fields_for @software_info do |swf| %>
+        <div class="formfieldline formfield type-text">
+          <%= swf.label "repository_url", _("Link to Repository: "), :class => "formlabel" %>
+          <%= swf.text_field :repository_link, :class => "improve_input_size", :id => "software-info-repository-link" %>
+        </div>
+      <% end %>
+    </div>
 
     <%= hidden_field_tag('back_to', @back_to) %>
 
--
libgit2 0.21.2