diff --git a/models/Poll.php b/models/Poll.php
index a276999..2ad2321 100644
--- a/models/Poll.php
+++ b/models/Poll.php
@@ -125,7 +125,7 @@ public function attributeLabels()
 
     public function getIcon()
     {
-        return 'fa-question-circle';
+        return 'fa-bar-chart';
     }
     
     public function isResetAllowed()
@@ -340,7 +340,7 @@ public function resetAnswer($userId = "")
      */
     public function getContentName()
     {
-        return Yii::t('PollsModule.models_Poll', 'Question');
+        return Yii::t('PollsModule.models_Poll', 'Poll');
     }
 
     /**
diff --git a/tests/codeception/acceptance/PollCest.php b/tests/codeception/acceptance/PollCest.php
index a15862a..dd18e31 100644
--- a/tests/codeception/acceptance/PollCest.php
+++ b/tests/codeception/acceptance/PollCest.php
@@ -19,7 +19,7 @@ public function testCreatePoll(AcceptanceTester $I)
 
         $I->click('#contentFormBody');
         $I->waitForElementVisible('#contentFormMenu');
-        $I->click('Question');
+        $I->click('Poll');
         $I->waitForElement('#poll-question');
         $I->click('#poll-question');
         $I->expect('to see the poll form');
@@ -32,7 +32,7 @@ public function testCreatePoll(AcceptanceTester $I)
         $I->fillField(Locator::elementAt('.poll_answer_new_input', 3), 'Answer 3');
 
         $I->click('#post_submit_button');
-        $I->waitForElementVisible('.wall-entry');
+        $I->waitForElementVisible('.wall-entry .wall_humhubmodulespollsmodelsPoll_1');
         $I->see('My Poll Question');
         $I->see('Answer 1');
         $I->see('Answer 2');