diff --git a/modules/backend/reportwidgets/welcome/assets/css/welcome.css b/modules/backend/reportwidgets/welcome/assets/css/welcome.css
index 457b9ee47..fde7854fe 100644
--- a/modules/backend/reportwidgets/welcome/assets/css/welcome.css
+++ b/modules/backend/reportwidgets/welcome/assets/css/welcome.css
@@ -22,3 +22,12 @@
 .widget-welcome .welcome-logo .oc-logo {
     height: 80px;
 }
+
+@media (max-width: 468px) {
+    .widget-welcome .welcome-logo {
+        float: none;
+    }
+    .widget-welcome .welcome-message {
+        margin-left: 0;
+    }
+}
diff --git a/tests/fixtures/plugins/database/tester/models/Author.php b/tests/fixtures/plugins/database/tester/models/Author.php
index ec084f3c6..05e9a039f 100644
--- a/tests/fixtures/plugins/database/tester/models/Author.php
+++ b/tests/fixtures/plugins/database/tester/models/Author.php
@@ -32,7 +32,15 @@ class Author extends Model
     ];
 
     public $belongsToMany = [
-        'roles' => ['Database\Tester\Models\Role', 'table' => 'database_tester_authors_roles']
+        'roles' => [
+            'Database\Tester\Models\Role',
+            'table' => 'database_tester_authors_roles'
+        ],
+        'executive_authors' => [
+            'Database\Tester\Models\Role',
+            'table' => 'database_tester_authors_roles',
+            'conditions' => 'is_executive = 1'
+        ],
     ];
 
     public $morphMany = [
diff --git a/tests/fixtures/plugins/database/tester/models/Role.php b/tests/fixtures/plugins/database/tester/models/Role.php
index 74e1f4b03..6a2fdd44b 100644
--- a/tests/fixtures/plugins/database/tester/models/Role.php
+++ b/tests/fixtures/plugins/database/tester/models/Role.php
@@ -27,7 +27,10 @@ class Role extends Model
      * @var array Relations
      */
     public $belongsToMany = [
-        'authors' => ['Database\Tester\Models\User', 'table' => 'database_tester_authors_roles']
+        'authors' => [
+            'Database\Tester\Models\User',
+            'table' => 'database_tester_authors_roles'
+        ],
     ];
 
 }
diff --git a/tests/unit/plugins/database/BelongsToManyModelTest.php b/tests/unit/plugins/database/BelongsToManyModelTest.php
index 970a952fe..5aef63778 100644
--- a/tests/unit/plugins/database/BelongsToManyModelTest.php
+++ b/tests/unit/plugins/database/BelongsToManyModelTest.php
@@ -147,4 +147,20 @@ class BelongsToManyModelTest extends PluginTestCase
         $author->delete();
         $this->assertEquals(0, Db::table('database_tester_authors_roles')->where('author_id', $author->id)->count());
     }
+
+    public function testConditionsWithPivotAttributes()
+    {
+        Model::unguard();
+        $author = Author::create(['name' => 'Stevie', 'email' => 'stevie@email.tld']);
+        $role1 = Role::create(['name' => "Designer", 'description' => "Quality"]);
+        $role2 = Role::create(['name' => "Programmer", 'description' => "Speed"]);
+        $role3 = Role::create(['name' => "Manager", 'description' => "Budget"]);
+        Model::reguard();
+
+        $author->roles()->add($role1, null, ['is_executive' => 1]);
+        $author->roles()->add($role2, null, ['is_executive' => 1]);
+        $author->roles()->add($role3, null, ['is_executive' => 0]);
+
+        $this->assertEquals([1, 2], $author->executive_authors->lists('id'));
+    }
 }