diff --git a/mockup/js/ui/views/anchor.js b/mockup/js/ui/views/anchor.js
index 3d373ee2b6..d1fa18bac7 100644
--- a/mockup/js/ui/views/anchor.js
+++ b/mockup/js/ui/views/anchor.js
@@ -33,12 +33,12 @@ define([
         this.$el.attr('aria-label', this.options.title || this.options.tooltip || '');
         _.each(this.extraClasses, function(klass) {
           this.$el.addClass(klass);
-        });
+        }.bind(this));
       }, this);
     },
     handleClick: function(e) {
       e.preventDefault();
-      if (!this.$el.prop('disabled')) {
+      if (!this.$el.is('.disabled')) {
         this.uiEventTrigger('click', this, e);
       }
     },
@@ -46,10 +46,10 @@ define([
       return _.extend({'icon': '', 'title': '', 'shortcut': ''}, this.options);
     },
     disable: function() {
-      this.$el.prop('disabled', true);
+      this.$el.addClass('disabled');
     },
     enable: function() {
-      this.$el.prop('disabled', false);
+      this.$el.removeClass('disabled');
     }
   });
 
diff --git a/mockup/js/ui/views/button.js b/mockup/js/ui/views/button.js
index 28bde67f49..6cf7d61d6a 100644
--- a/mockup/js/ui/views/button.js
+++ b/mockup/js/ui/views/button.js
@@ -53,7 +53,7 @@ define([
     },
     handleClick: function(e) {
       e.preventDefault();
-      if (!this.$el.prop('disabled')) {
+      if (!this.$el.is('.disabled')) {
         this.uiEventTrigger('click', this, e);
       }
     },
@@ -61,10 +61,10 @@ define([
       return _.extend({'icon': '', 'title': ''}, this.options);
     },
     disable: function() {
-      this.$el.prop('disabled', true);
+      this.$el.addClass('disabled');
     },
     enable: function() {
-      this.$el.prop('disabled', false);
+      this.$el.removeClass('disabled');
     }
   });
 
diff --git a/mockup/patterns/filemanager/pattern.filemanager.less b/mockup/patterns/filemanager/pattern.filemanager.less
index ed7c07a34d..946c01c70f 100644
--- a/mockup/patterns/filemanager/pattern.filemanager.less
+++ b/mockup/patterns/filemanager/pattern.filemanager.less
@@ -57,6 +57,10 @@
             min-width: 250px;
         }
     }
+    .alink.disabled {
+        cursor: @cursor-disabled;
+        .opacity(.65);
+    }
     .input-group:extend(.input-group all){}
     .input-group-addon:extend(.input-group-addon all){}
     .input-group-btn:extend(.input-group-btn all){}
diff --git a/mockup/patterns/querystring/pattern.js b/mockup/patterns/querystring/pattern.js
index ca6b2bd9d1..dd04019cdf 100644
--- a/mockup/patterns/querystring/pattern.js
+++ b/mockup/patterns/querystring/pattern.js
@@ -828,7 +828,7 @@ define([
           $('[id$="sort_on"]', existingSortOn).val($(this).val());
         });
 
-      self.$sortOn.append($('<option value="">No sorting</option>')); // default no sorting
+      self.$sortOn.append($('<option value="">' + _t('No sorting') + '</option>')); // default no sorting
       for (var key in self.options['sortable_indexes']) { // jshint ignore:line
         self.$sortOn.append(
           $('<option/>')
diff --git a/mockup/patterns/resourceregistry/pattern.resourceregistry.less b/mockup/patterns/resourceregistry/pattern.resourceregistry.less
index d9c864dce0..cb57672dcd 100644
--- a/mockup/patterns/resourceregistry/pattern.resourceregistry.less
+++ b/mockup/patterns/resourceregistry/pattern.resourceregistry.less
@@ -90,18 +90,13 @@
     }
 
     .lessvariables,
-    .patternoptionsuse {
+    .patternoptions {
         .form{
             padding-top: 15px;
             clear: both;
         }
     }
 
-    .pat-resourceregistry .lessvariables .form {
-        padding-top: 10px;
-        clear: both;
-    }
-
     .patternoptions {
         .form-control-feedback {
             top: 0;
diff --git a/mockup/patterns/structure/js/actionmenu.js b/mockup/patterns/structure/js/actionmenu.js
index 01e0aaf5cb..0717f5c8ec 100644
--- a/mockup/patterns/structure/js/actionmenu.js
+++ b/mockup/patterns/structure/js/actionmenu.js
@@ -1,10 +1,10 @@
-define(['underscore'], function(_) {
+define(['underscore', 'translate'], function(_, _t) {
   'use strict';
 
   var menuOptions = {
     'openItem': {
       'url':      '#',
-      'title':    'Open',
+      'title':    _t('Open'),
       'category': 'button',
       'iconCSS':  'glyphicon glyphicon-eye-open',
       'css': '',
@@ -12,7 +12,7 @@ define(['underscore'], function(_) {
     },
     'editItem': {
       'url':      '#',
-      'title':    'Edit',
+      'title':    _t('Edit'),
       'category': 'button',
       'iconCSS':  'glyphicon glyphicon-pencil',
       'css': '',
@@ -22,7 +22,7 @@ define(['underscore'], function(_) {
       'library':  'mockup-patterns-structure-url/js/actions',
       'method':   'cutClicked',
       'url':      '#',
-      'title':    'Cut',
+      'title':    _t('Cut'),
       'category': 'dropdown',
       'iconCSS':  'glyphicon glyphicon-scissors',
       'css': '',
@@ -32,7 +32,7 @@ define(['underscore'], function(_) {
       'library':  'mockup-patterns-structure-url/js/actions',
       'method':   'copyClicked',
       'url':      '#',
-      'title':    'Copy',
+      'title':    _t('Copy'),
       'category': 'dropdown',
       'iconCSS':  'glyphicon glyphicon-duplicate',
       'css': '',
@@ -42,7 +42,7 @@ define(['underscore'], function(_) {
       'library':  'mockup-patterns-structure-url/js/actions',
       'method':   'pasteClicked',
       'url':      '#',
-      'title':    'Paste',
+      'title':    _t('Paste'),
       'category': 'dropdown',
       'iconCSS':  'glyphicon glyphicon-open-file',
       'css': '',
@@ -52,7 +52,7 @@ define(['underscore'], function(_) {
       'library':  'mockup-patterns-structure-url/js/actions',
       'method':   'moveTopClicked',
       'url':      '#',
-      'title':    'Move to top of folder',
+      'title':    _t('Move to top of folder'),
       'category': 'dropdown',
       'iconCSS':  'glyphicon glyphicon-step-backward rright',
       'css': '',
@@ -62,7 +62,7 @@ define(['underscore'], function(_) {
       'library':  'mockup-patterns-structure-url/js/actions',
       'method':   'moveBottomClicked',
       'url':      '#',
-      'title':    'Move to bottom of folder',
+      'title':    _t('Move to bottom of folder'),
       'category': 'dropdown',
       'iconCSS':  'glyphicon glyphicon-step-backward rleft',
       'css': '',
@@ -72,7 +72,7 @@ define(['underscore'], function(_) {
       'library':  'mockup-patterns-structure-url/js/actions',
       'method':   'setDefaultPageClicked',
       'url':      '#',
-      'title':    'Set as default page',
+      'title':    _t('Set as default page'),
       'category': 'dropdown',
       'iconCSS':  'glyphicon glyphicon-ok-circle',
       'css': '',
@@ -82,7 +82,7 @@ define(['underscore'], function(_) {
       'library':  'mockup-patterns-structure-url/js/actions',
       'method':   'selectAll',
       'url':      '#',
-      'title':    'Select all contained items',
+      'title':    _t('Select all contained items'),
       'category': 'dropdown',
       'iconCSS':  'glyphicon glyphicon-check',
       'css': '',
diff --git a/mockup/patterns/structure/js/views/selectionwell.js b/mockup/patterns/structure/js/views/selectionwell.js
index cb5020f00a..1fe1373bf5 100644
--- a/mockup/patterns/structure/js/views/selectionwell.js
+++ b/mockup/patterns/structure/js/views/selectionwell.js
@@ -9,7 +9,7 @@ define([
   var WellView = PopoverView.extend({
     className: 'popover selected-items',
     title: _.template(
-      '<input type="text" class="filter" placeholder="Filter" />' +
+      '<input type="text" class="filter" placeholder="<%- _t("Filter") %>" />' +
       '<a href="#" class=" remove-all">' +
       '<span class="glyphicon glyphicon-remove-circle"></span> <%- _t("remove all") %></a>'
     ),
diff --git a/mockup/patterns/structure/templates/actionmenu.xml b/mockup/patterns/structure/templates/actionmenu.xml
index dea7ba18d6..4a8d43d848 100644
--- a/mockup/patterns/structure/templates/actionmenu.xml
+++ b/mockup/patterns/structure/templates/actionmenu.xml
@@ -18,7 +18,7 @@
     aria-haspopup="true"
     aria-expanded="true"
     id="<%- id %>"
-    title="Actions">
+    title='<%- _t("Actions") %>'>
   <span class="glyphicon glyphicon-cog"></span><span class="caret"></span>
 </a>
 <ul class="dropdown-menu pull-right" aria-labelledby="<%- id %>">
diff --git a/mockup/patterns/upload/templates/preview.xml b/mockup/patterns/upload/templates/preview.xml
index ecac9dd7ad..91e91d5f90 100644
--- a/mockup/patterns/upload/templates/preview.xml
+++ b/mockup/patterns/upload/templates/preview.xml
@@ -1,5 +1,5 @@
 <div class="row item form-inline">
-    <div class="col-md-1 action">
+    <div class="col-xs-2 action">
         <button
             type="button"
             class="btn btn-danger btn-xs remove-item"
@@ -8,7 +8,7 @@
             <span class="glyphicon glyphicon-remove"></span>
         </button>
     </div>
-    <div class="col-md-8 title">
+    <div class="col-xs-7 title">
         <div class="dz-preview">
           <div class="dz-details">
             <div class="dz-filename"><span data-dz-name></span></div>
@@ -19,7 +19,7 @@
             <span class="dz-upload" data-dz-uploadprogress></span>
         </div>
     </div>
-    <div class="col-md-3 info">
+    <div class="col-xs-3 info">
         <div class="dz-size" data-dz-size></div>
         <img data-dz-thumbnail />
     </div>
diff --git a/news/1000.bugfix b/news/1000.bugfix
new file mode 100644
index 0000000000..0044695477
--- /dev/null
+++ b/news/1000.bugfix
@@ -0,0 +1,4 @@
+Fix filename overlapping the remove button in the Upload dialog.
+This fixes https://github.com/plone/Products.CMFPlone/issues/2533 and
+https://github.com/plone/plonetheme.barceloneta/issues/204
+[vincentfretin]
diff --git a/news/990.bugfix b/news/990.bugfix
new file mode 100644
index 0000000000..cf53861cf2
--- /dev/null
+++ b/news/990.bugfix
@@ -0,0 +1,3 @@
+Fix CSS issue on "Pattern options" tab in Resource Registries (padding-top of the tab content).
+This fixes https://github.com/plone/Products.CMFPlone/issues/1111
+[vincentfretin]
diff --git a/news/991.bugfix b/news/991.bugfix
new file mode 100644
index 0000000000..e0659b249f
--- /dev/null
+++ b/news/991.bugfix
@@ -0,0 +1,2 @@
+Fix some internationalization issues in structure pattern (folder_contents view): "Open", "Edit" and "Actions" tooltips are translated; all actions under "Actions" are translated; In filter menu the "No sorting" option of the sorting dropdown is translated.
+[erral]
diff --git a/news/996.bugfix b/news/996.bugfix
new file mode 100644
index 0000000000..be6fb9f1c9
--- /dev/null
+++ b/news/996.bugfix
@@ -0,0 +1,4 @@
+Fix regression for the disabled state of action buttons in folder contents
+and the Tools/Build CSS button in thememapper.
+This fixes https://github.com/plone/Products.CMFPlone/issues/2296
+[vincentfretin]
diff --git a/news/997.bugfix b/news/997.bugfix
new file mode 100644
index 0000000000..5817bdaed9
--- /dev/null
+++ b/news/997.bugfix
@@ -0,0 +1,2 @@
+Fix internationalization of "Filter" placeholder in selected items dialog.
+[vincentfretin]