diff --git a/client/src/app/+my-account/my-account-video-channels/my-account-video-channel-edit.component.scss b/client/src/app/+my-account/my-account-video-channels/my-account-video-channel-edit.component.scss
index 833fda45057a70bc57f5ff0d5cc1c72f876db6c8..bfecbaba0b5ba22230d616464473b99db58d32bd 100644
--- a/client/src/app/+my-account/my-account-video-channels/my-account-video-channel-edit.component.scss
+++ b/client/src/app/+my-account/my-account-video-channels/my-account-video-channel-edit.component.scss
@@ -14,6 +14,10 @@ my-actor-avatar-info {
   @include peertube-input-group(340px);
 }
 
+.input-group-append {
+  height: 30px;
+}
+
 input[type=text] {
   @include peertube-input-text(340px);
 
diff --git a/client/src/app/app.component.html b/client/src/app/app.component.html
index 87de874bb9b8ba13ec1aa9195e664141dec95073..958c131f75d67ae65266c6e746152efac5fa1911 100644
--- a/client/src/app/app.component.html
+++ b/client/src/app/app.component.html
@@ -29,7 +29,7 @@
       </div>
 
       <footer class="row">
-        <a href="https://joinpeertube.org" title="PeerTube website" target="_blank" rel="noopener noreferrer">PeerTube v{{ serverVersion }}</a> -
+        <a href="https://joinpeertube.org" title="PeerTube website" target="_blank" rel="noopener noreferrer">PeerTube v{{ serverVersion }}</a>&nbsp;-&nbsp;
         <a href="https://github.com/Chocobozzz/PeerTube/blob/develop/LICENSE" title="PeerTube license" target="_blank" rel="noopener noreferrer">CopyLeft 2015-2018</a>
       </footer>
     </div>
diff --git a/client/src/app/search/search.component.html b/client/src/app/search/search.component.html
index 216905cf0a6320305f568d25d53fd166e267e40b..61a05895e56cecba78a0a99bb7442fa99e5ab009 100644
--- a/client/src/app/search/search.component.html
+++ b/client/src/app/search/search.component.html
@@ -9,7 +9,7 @@
       </div>
 
       <div
-        class="results-filter-button" (click)="isSearchFilterCollapsed = !isSearchFilterCollapsed" role="button"
+        class="results-filter-button ml-auto" (click)="isSearchFilterCollapsed = !isSearchFilterCollapsed" role="button"
         [attr.aria-expanded]="!isSearchFilterCollapsed" aria-controls="collapseBasic"
       >
         <span class="icon icon-filter"></span>
diff --git a/client/src/app/videos/+video-watch/comment/video-comments.component.html b/client/src/app/videos/+video-watch/comment/video-comments.component.html
index 9919ac615ef4ec5d57b4fe17d2913d6fc320bda8..5aebd7f24459bf552ca727abfc710203569fe064 100644
--- a/client/src/app/videos/+video-watch/comment/video-comments.component.html
+++ b/client/src/app/videos/+video-watch/comment/video-comments.component.html
@@ -5,7 +5,7 @@
     </div>
     <my-help
       *ngIf="video.commentsEnabled === true" helpType="custom" i18n-customHtml
-      customHtml="You can either comment on the page of your instance where this video is federated with your PeerTube account, or via any ActivityPub-capable fediverse instance. For instance with Mastodon or Pleroma you can type in the search box <strong>@{{video.account.name}}@{{video.account.host}}</strong> and find back the video. Direct commenting capabilities are being worked on in <a href='https://github.com/Chocobozzz/PeerTube/issues/224'>#224</a>."></my-help>
+      customHtml="You can either comment on the page of your instance where this video is federated with your PeerTube account, or via any ActivityPub-capable fediverse instance. For instance with Mastodon or Pleroma you can type in the search box <strong>@{{video.account.name}}@{{video.account.host}}</strong> and find back the video."></my-help>
   </div>
 
   <ng-template [ngIf]="video.commentsEnabled === true">
diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss
index e2271d7d90089ea70a8af5ba98e1df768303ba8b..2356f98371a4ad64c88cdb68f58ed2fe46106a25 100644
--- a/client/src/sass/application.scss
+++ b/client/src/sass/application.scss
@@ -244,7 +244,6 @@ label {
   }
 
   .inputs {
-    margin-top: 40px;
     margin-bottom: 0;
     text-align: right;