diff --git a/src/filemanager.html b/src/filemanager.html
index ecde438b0..357251819 100644
--- a/src/filemanager.html
+++ b/src/filemanager.html
@@ -338,10 +338,9 @@
               <tr>
                 <th style="width: 40px;">&nbsp;</th>
                 <th style="">{{ 'filemanager.list.name' | tr }}</th>
-                <th style="width: 80px">{{ 'filemanager.list.mtime' | tr }}</th>
+                <th style="width:100px">{{ 'filemanager.list.mtime' | tr }}</th>
                 <th style="width: 80px">{{ 'filemanager.list.size' | tr }}</th>
                 <th style="width:100px">{{ 'filemanager.list.owner' | tr }}</th>
-                <th style="width: 40px">&nbsp;</th>
               </tr>
             </thead>
           </table>
@@ -355,15 +354,12 @@
               </tr>
               <tr ng-repeat="entry in entries | orderBy:sortProperty:sortAsc | orderBy:'isDirectory':true" draggable="true" ng-dragstart="dragStart($event, entry)" ng-drop="drop($event, entry)" context-menu="menuOptions" model="entry" ng-dragleave="dragExit($event, entry)" ng-dragover="dragEnter($event, entry)" ng-class="{ 'entry-hovered': entry.hovered, 'entry-selected': selected.indexOf(entry) !== -1 }">
                 <td style="width: 40px" ng-mousedown="select($event, entry)" ng-dblclick="open(entry)" class="text-center">
-                  <i class="fas fa-lg {{ entry.icon }}" ng-class="{ 'text-primary': entry.isDirectory }"></i>
+                  <i class="fas fa-lg {{ entry.icon }}" ng-class="{ 'text-primary': entry.isDirectory && selected.indexOf(entry) === -1 }"></i>
                 </td>
                 <td class="elide-table-cell" ng-mousedown="select($event, entry)" ng-dblclick="open(entry)">{{ entry.fileName }}<span ng-show="entry.isSymbolicLink" class="text-muted" style="margin-left: 20px;">{{ 'filemanager.list.symlink' | tr:{ target: entry.target } }}</span></td>
-                <td style="width: 80px" class="elide-table-cell" ng-mousedown="select($event, entry)" ng-dblclick="open(entry)" uib-tooltip="{{ entry.mtime | prettyLongDate }}" tooltip-append-to-body="true">{{ entry.mtime | prettyDate }}</td>
+                <td style="width:100px" class="elide-table-cell" ng-mousedown="select($event, entry)" ng-dblclick="open(entry)" uib-tooltip="{{ entry.mtime | prettyLongDate }}" tooltip-append-to-body="true">{{ entry.mtime | prettyDate }}</td>
                 <td style="width: 80px" class="elide-table-cell" ng-mousedown="select($event, entry)" ng-dblclick="open(entry)">{{ entry.size | prettyByteSize }}</td>
                 <td style="width:100px" class="elide-table-cell" ng-mousedown="select($event, entry)" ng-dblclick="open(entry)">{{ entry.uid | prettyOwner }}</td>
-                <td style="width: 40px" class="text-right no-wrap" style="vertical-align: bottom">
-                  <button class="btn btn-xs btn-link" context-menu="menuOptions" model="entry" context-menu-on="click"><i class="fas fa-bars"></i></button>
-                </td>
               </tr>
             </tbody>
           </table>
diff --git a/src/theme.scss b/src/theme.scss
index 8dd37d015..fa167b70f 100644
--- a/src/theme.scss
+++ b/src/theme.scss
@@ -1826,7 +1826,7 @@ tag-input {
     }
 
     .entry-selected {
-        background-color: lighten($brand-primary, 15) !important;
+        background-color: $brand-primary !important;
         color: white !important;
     }